|
2 | 2 |
|
3 | 3 | --- a/chrome/browser/BUILD.gn
|
4 | 4 | +++ b/chrome/browser/BUILD.gn
|
5 |
| -@@ -1724,10 +1724,6 @@ static_library("browser") { |
6 |
| - "//chrome/browser/ui/javascript_dialogs:impl", |
7 |
| - "//chrome/browser/storage_access_api", |
8 |
| - "//chrome/browser/top_level_storage_access_api:permissions", |
| 5 | +@@ -1742,10 +1742,6 @@ static_library("browser") { |
| 6 | + "//chrome/browser/prefs:util_impl", |
| 7 | + "//chrome/browser/profiles:profiles_extra_parts_impl", |
| 8 | + "//chrome/browser/profiles:profile_util_impl", |
9 | 9 | - "//chrome/browser/safe_browsing",
|
10 |
| -- "//chrome/browser/safe_browsing:verdict_cache_manager_factory", |
11 | 10 | - "//chrome/browser/safe_browsing:advanced_protection",
|
12 | 11 | - "//chrome/browser/safe_browsing:metrics_collector",
|
13 |
| - "//chrome/browser/ip_protection", |
14 |
| - |
15 |
| - # TODO(crbug.com/40110173): Eliminate usages of browser.h from Media Router. |
16 |
| -@@ -1887,7 +1883,6 @@ static_library("browser") { |
| 12 | +- "//chrome/browser/safe_browsing:verdict_cache_manager_factory", |
| 13 | + "//chrome/browser/search", |
| 14 | + "//chrome/browser/search_engine_choice:impl", |
| 15 | + "//chrome/browser/signin:impl", |
| 16 | +@@ -1921,7 +1917,6 @@ static_library("browser") { |
17 | 17 | "//chrome/browser/reading_list",
|
18 | 18 | "//chrome/browser/resource_coordinator:tab_manager_features",
|
19 | 19 | "//chrome/browser/resources/accessibility:resources",
|
|
23 | 23 | "//chrome/browser/safe_browsing:verdict_cache_manager_factory",
|
24 | 24 | --- a/chrome/browser/extensions/BUILD.gn
|
25 | 25 | +++ b/chrome/browser/extensions/BUILD.gn
|
26 |
| -@@ -670,9 +670,6 @@ source_set("extensions") { |
| 26 | +@@ -666,9 +666,6 @@ source_set("extensions") { |
27 | 27 | # TODO(crbug.com/346472679): Remove this circular dependency.
|
28 | 28 | "//chrome/browser/web_applications/extensions",
|
29 | 29 |
|
|
33 | 33 | # TODO(crbug.com/343037853): Remove this circular dependency.
|
34 | 34 | "//chrome/browser/themes",
|
35 | 35 |
|
36 |
| -@@ -710,8 +707,6 @@ source_set("extensions") { |
| 36 | +@@ -706,8 +703,6 @@ source_set("extensions") { |
37 | 37 | "//chrome/common",
|
38 | 38 | "//chrome/common/extensions/api",
|
39 | 39 | "//components/omnibox/browser",
|
|
42 | 42 | "//components/safe_browsing/core/common/proto:realtimeapi_proto",
|
43 | 43 | "//components/signin/core/browser",
|
44 | 44 | "//components/translate/content/browser",
|
45 |
| -@@ -785,7 +780,6 @@ source_set("extensions") { |
| 45 | +@@ -782,7 +777,6 @@ source_set("extensions") { |
46 | 46 | "//chrome/browser/profiles",
|
47 | 47 | "//chrome/browser/profiles:profile",
|
48 | 48 | "//chrome/browser/resource_coordinator:mojo_bindings",
|
|
52 | 52 | "//chrome/browser/ui/tabs:tab_enums",
|
53 | 53 | --- a/chrome/browser/ui/BUILD.gn
|
54 | 54 | +++ b/chrome/browser/ui/BUILD.gn
|
55 |
| -@@ -575,17 +575,8 @@ static_library("ui") { |
| 55 | +@@ -570,17 +570,8 @@ static_library("ui") { |
56 | 56 | "//components/reading_list/features:flags",
|
57 | 57 | "//components/renderer_context_menu",
|
58 | 58 | "//components/resources",
|
|
70 | 70 | "//components/schema_org/common:improved_mojom",
|
71 | 71 | "//components/search",
|
72 | 72 | "//components/search_engines",
|
73 |
| -@@ -5634,7 +5625,6 @@ static_library("ui_public_dependencies") |
| 73 | +@@ -5674,7 +5665,6 @@ static_library("ui_public_dependencies") |
74 | 74 | "//components/dom_distiller/core",
|
75 | 75 | "//components/enterprise/buildflags",
|
76 | 76 | "//components/paint_preview/buildflags",
|
|
111 | 111 | ? IDS_PROMPT_UNCOMMON_DOWNLOAD_CONTENT_IN_ADVANCED_PROTECTION
|
112 | 112 | --- a/chrome/browser/ui/webui/downloads/downloads_ui.cc
|
113 | 113 | +++ b/chrome/browser/ui/webui/downloads/downloads_ui.cc
|
114 |
| -@@ -40,6 +40,7 @@ |
| 114 | +@@ -39,6 +39,7 @@ |
115 | 115 | #include "components/history/core/common/pref_names.h"
|
116 | 116 | #include "components/prefs/pref_service.h"
|
117 | 117 | #include "components/profile_metrics/browser_profile_type.h"
|
118 | 118 | +#include "components/safe_browsing/buildflags.h"
|
119 | 119 | #include "components/safe_browsing/core/common/features.h"
|
120 | 120 | #include "components/strings/grit/components_strings.h"
|
121 | 121 | #include "content/public/browser/download_manager.h"
|
122 |
| -@@ -69,10 +70,12 @@ content::WebUIDataSource* CreateAndAddDo |
| 122 | +@@ -68,10 +69,12 @@ content::WebUIDataSource* CreateAndAddDo |
123 | 123 | webui::SetupWebUIDataSource(source, kDownloadsResources,
|
124 | 124 | IDR_DOWNLOADS_DOWNLOADS_HTML);
|
125 | 125 |
|
|
155 | 155 | return l10n_util::GetStringFUTF16(IDS_PROMPT_DOWNLOAD_CHANGES_SETTINGS,
|
156 | 156 | --- a/chrome/browser/ui/views/download/download_item_view.cc
|
157 | 157 | +++ b/chrome/browser/ui/views/download/download_item_view.cc
|
158 |
| -@@ -1034,11 +1034,13 @@ ui::ImageModel DownloadItemView::GetIcon |
| 158 | +@@ -1041,11 +1041,13 @@ ui::ImageModel DownloadItemView::GetIcon |
159 | 159 |
|
160 | 160 | switch (danger_type) {
|
161 | 161 | case download::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT:
|
|
171 | 171 | case download::DOWNLOAD_DANGER_TYPE_DANGEROUS_HOST:
|
172 | 172 | --- a/chrome/test/BUILD.gn
|
173 | 173 | +++ b/chrome/test/BUILD.gn
|
174 |
| -@@ -7012,13 +7012,9 @@ test("unit_tests") { |
| 174 | +@@ -7099,13 +7099,9 @@ test("unit_tests") { |
175 | 175 | "//chrome/browser/renderer_host:history_swiper",
|
176 | 176 | "//chrome/browser/updater:browser_updater_client",
|
177 | 177 | "//chrome/common/notifications",
|
|
200 | 200 | "safe_archive_analyzer.cc",
|
201 | 201 | --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
202 | 202 | +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
203 |
| -@@ -2264,12 +2264,6 @@ const PolicyToPreferenceMapEntry kSimple |
| 203 | +@@ -2286,15 +2286,6 @@ const PolicyToPreferenceMapEntry kSimple |
204 | 204 | base::Value::Type::BOOLEAN },
|
205 | 205 | #endif
|
206 | 206 |
|
207 | 207 | -#if BUILDFLAG(ENTERPRISE_CLIENT_CERTIFICATES)
|
208 | 208 | - { key::kProvisionManagedClientCertificateForUser,
|
209 | 209 | - client_certificates::prefs::kProvisionManagedClientCertificateForUserPrefs,
|
210 | 210 | - base::Value::Type::INTEGER },
|
| 211 | +- { key::kProvisionManagedClientCertificateForBrowser, |
| 212 | +- client_certificates::prefs::kProvisionManagedClientCertificateForBrowserPrefs, |
| 213 | +- base::Value::Type::INTEGER }, |
211 | 214 | -#endif // BUILDFLAG(ENTERPRISE_CLIENT_CERTIFICATES)
|
212 | 215 | -
|
213 | 216 | #if !BUILDFLAG(IS_ANDROID)
|
214 | 217 | { key::kLensOverlaySettings,
|
215 | 218 | lens::prefs::kLensOverlaySettings,
|
216 | 219 | --- a/chrome/browser/chrome_content_browser_client.cc
|
217 | 220 | +++ b/chrome/browser/chrome_content_browser_client.cc
|
218 |
| -@@ -7871,30 +7871,6 @@ bool ChromeContentBrowserClient::SetupEm |
| 221 | +@@ -7889,33 +7889,6 @@ bool ChromeContentBrowserClient::SetupEm |
219 | 222 | CHECK(!soda_language_pack_path.empty());
|
220 |
| - CHECK(compiler->SetParameter(sandbox::policy::kParamSodaLanguagePackPath, |
221 |
| - soda_language_pack_path.value())); |
| 223 | + CHECK(serializer->SetParameter(sandbox::policy::kParamSodaLanguagePackPath, |
| 224 | + soda_language_pack_path.value())); |
222 | 225 | - return true;
|
223 |
| -- } else if (sandbox_type == sandbox::mojom::Sandbox::kScreenAI) { |
| 226 | +- } |
| 227 | +- if (sandbox_type == sandbox::mojom::Sandbox::kScreenAI) { |
224 | 228 | - // ScreenAI service needs read access to ScreenAI component binary path to
|
225 | 229 | - // load it.
|
226 | 230 | - base::FilePath screen_ai_binary_path =
|
|
230 | 234 | - VLOG(1) << "Screen AI component not found.";
|
231 | 235 | - return false;
|
232 | 236 | - }
|
233 |
| -- return compiler->SetParameter(sandbox::policy::kParamScreenAiComponentPath, |
234 |
| -- screen_ai_binary_path.value()); |
235 |
| -- } else if (sandbox_type == sandbox::mojom::Sandbox::kOnDeviceTranslation) { |
| 237 | +- return serializer->SetParameter( |
| 238 | +- sandbox::policy::kParamScreenAiComponentPath, |
| 239 | +- screen_ai_binary_path.value()); |
| 240 | +- } |
| 241 | +- if (sandbox_type == sandbox::mojom::Sandbox::kOnDeviceTranslation) { |
236 | 242 | - auto translatekit_binary_path =
|
237 | 243 | - on_device_translation::ComponentManager::GetInstance()
|
238 | 244 | - .GetTranslateKitComponentPath();
|
239 | 245 | - if (translatekit_binary_path.empty()) {
|
240 | 246 | - VLOG(1) << "TranslationKit component not found.";
|
241 | 247 | - return false;
|
242 | 248 | - }
|
243 |
| -- return compiler->SetParameter( |
| 249 | +- return serializer->SetParameter( |
244 | 250 | - sandbox::policy::kParamTranslatekitComponentPath,
|
245 | 251 | - translatekit_binary_path.value());
|
246 | 252 | }
|
|
0 commit comments