diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-24 11:40:17 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-24 12:42:11 +0000 |
commit | 5d87695f37678f96492b258bbab36486c59866b4 (patch) | |
tree | be9783bbaf04fb930c4d74ca9c00b5e7954c8bc6 /chromium/ios/chrome/app | |
parent | 6c11fb357ec39bf087b8b632e2b1e375aef1b38b (diff) | |
download | qtwebengine-chromium-5d87695f37678f96492b258bbab36486c59866b4.tar.gz |
BASELINE: Update Chromium to 75.0.3770.56
Change-Id: I86d2007fd27a45d5797eee06f4c9369b8b50ac4f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/ios/chrome/app')
-rw-r--r-- | chromium/ios/chrome/app/BUILD.gn | 26 | ||||
-rw-r--r-- | chromium/ios/chrome/app/application_delegate/BUILD.gn | 11 | ||||
-rw-r--r-- | chromium/ios/chrome/app/startup/BUILD.gn | 5 |
3 files changed, 31 insertions, 11 deletions
diff --git a/chromium/ios/chrome/app/BUILD.gn b/chromium/ios/chrome/app/BUILD.gn index fdc3516aff7..124a9204df7 100644 --- a/chromium/ios/chrome/app/BUILD.gn +++ b/chromium/ios/chrome/app/BUILD.gn @@ -114,7 +114,6 @@ compile_entitlements("entitlements") { source_set("app_internal") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ - "application_mode.h", "chrome_overlay_window.h", "chrome_overlay_window.mm", "firebase_utils.h", @@ -134,6 +133,7 @@ source_set("app_internal") { deps = [ ":app", ":firebase_buildflags", + ":mode", ":tests_hook", "//base", "//components/bookmarks/browser", @@ -160,6 +160,8 @@ source_set("app_internal") { "//components/proxy_config", "//components/suggestions", "//components/sync", + "//components/ukm/ios:features", + "//components/unified_consent", "//components/url_formatter", "//components/web_resource", "//ios/chrome/app/application_delegate", @@ -178,6 +180,7 @@ source_set("app_internal") { "//ios/chrome/browser/crash_report", "//ios/chrome/browser/crash_report:crash_report_internal", "//ios/chrome/browser/download", + "//ios/chrome/browser/external_files", "//ios/chrome/browser/favicon", "//ios/chrome/browser/feature_engagement", "//ios/chrome/browser/first_run", @@ -189,6 +192,7 @@ source_set("app_internal") { "//ios/chrome/browser/metrics", "//ios/chrome/browser/metrics:metrics_internal", "//ios/chrome/browser/net", + "//ios/chrome/browser/ntp:features", "//ios/chrome/browser/ntp_snippets", "//ios/chrome/browser/omaha", "//ios/chrome/browser/passwords", @@ -205,8 +209,8 @@ source_set("app_internal") { "//ios/chrome/browser/tabs", "//ios/chrome/browser/ui", "//ios/chrome/browser/ui:feature_flags", - "//ios/chrome/browser/ui:ui_internal", "//ios/chrome/browser/ui/authentication", + "//ios/chrome/browser/ui/browser_view", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/download", "//ios/chrome/browser/ui/first_run", @@ -241,6 +245,7 @@ source_set("app_internal") { "//ios/public/provider/chrome/browser/distribution", "//ios/public/provider/chrome/browser/mailto", "//ios/public/provider/chrome/browser/signin", + "//ios/public/provider/chrome/browser/user", "//ios/public/provider/chrome/browser/user_feedback", "//ios/testing/perf:startup", "//ios/third_party/material_roboto_font_loader_ios", @@ -263,6 +268,17 @@ source_set("app_internal") { [ "//ios/chrome/app/application_delegate:application_delegate_internal" ] } +source_set("mode") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "application_mode.h", + ] + + deps = [ + "//base", + ] +} + source_set("main") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ @@ -353,7 +369,7 @@ if (current_toolchain == default_toolchain) { "$root_out_dir/content_widget_extension.appex", ] outputs = [ - "{{bundle_plugins_dir}}/{{source_file_part}}", + "{{bundle_contents_dir}}/PlugIns/{{source_file_part}}", ] } } @@ -367,7 +383,7 @@ if (current_toolchain == default_toolchain) { "$root_out_dir/search_widget_extension.appex", ] outputs = [ - "{{bundle_plugins_dir}}/{{source_file_part}}", + "{{bundle_contents_dir}}/PlugIns/{{source_file_part}}", ] } } @@ -381,7 +397,7 @@ if (current_toolchain == default_toolchain) { "$root_out_dir/share_extension.appex", ] outputs = [ - "{{bundle_plugins_dir}}/{{source_file_part}}", + "{{bundle_contents_dir}}/PlugIns/{{source_file_part}}", ] } } diff --git a/chromium/ios/chrome/app/application_delegate/BUILD.gn b/chromium/ios/chrome/app/application_delegate/BUILD.gn index d4ab56740a1..e99d1fb7abb 100644 --- a/chromium/ios/chrome/app/application_delegate/BUILD.gn +++ b/chromium/ios/chrome/app/application_delegate/BUILD.gn @@ -37,6 +37,7 @@ source_set("unit_tests") { "//components/metrics", "//ios/chrome/app", "//ios/chrome/app:app_internal", + "//ios/chrome/app:mode", "//ios/chrome/app/spotlight", "//ios/chrome/app/startup", "//ios/chrome/browser", @@ -50,13 +51,14 @@ source_set("unit_tests") { "//ios/chrome/browser/signin:test_support", "//ios/chrome/browser/tabs", "//ios/chrome/browser/u2f", - "//ios/chrome/browser/ui:ui_internal", + "//ios/chrome/browser/ui/browser_view", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/main", "//ios/chrome/browser/ui/main/test", "//ios/chrome/browser/ui/safe_mode", "//ios/chrome/browser/ui/settings", "//ios/chrome/browser/ui/settings:settings_root", + "//ios/chrome/browser/url_loading", "//ios/chrome/browser/web:tab_id_tab_helper", "//ios/chrome/browser/web_state_list", "//ios/chrome/browser/web_state_list:test_support", @@ -109,7 +111,9 @@ source_set("application_delegate_internal") { "//components/metrics", "//components/payments/core", "//components/prefs", + "//components/ukm/ios:features", "//ios/chrome/app", + "//ios/chrome/app:mode", "//ios/chrome/app/spotlight", "//ios/chrome/app/startup", "//ios/chrome/browser", @@ -125,11 +129,12 @@ source_set("application_delegate_internal") { "//ios/chrome/browser/tabs", "//ios/chrome/browser/u2f", "//ios/chrome/browser/ui", - "//ios/chrome/browser/ui:ui_internal", "//ios/chrome/browser/ui/authentication", + "//ios/chrome/browser/ui/browser_view", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/main", "//ios/chrome/browser/ui/safe_mode", + "//ios/chrome/browser/url_loading", "//ios/chrome/browser/web:tab_id_tab_helper", "//ios/chrome/browser/web_state_list", "//ios/chrome/common/app_group:main_app", @@ -164,7 +169,9 @@ source_set("test_support") { "//base", "//base/test:test_support", "//ios/chrome/app:app_internal", + "//ios/chrome/app:mode", "//ios/chrome/browser", + "//ios/chrome/browser/url_loading", "//net", "//ui/base", "//url", diff --git a/chromium/ios/chrome/app/startup/BUILD.gn b/chromium/ios/chrome/app/startup/BUILD.gn index e85121beae4..1cc6af396aa 100644 --- a/chromium/ios/chrome/app/startup/BUILD.gn +++ b/chromium/ios/chrome/app/startup/BUILD.gn @@ -24,7 +24,7 @@ source_set("startup_basic") { deps = [ "//base", "//components/crash/core/common", - "//components/task_scheduler_util", + "//components/thread_pool_util", "//ios/chrome/browser:chrome_paths", "//ios/web/public/app", "//skia", @@ -41,8 +41,6 @@ source_set("startup") { "client_registration.mm", "content_suggestions_scheduler_notifications.h", "content_suggestions_scheduler_notifications.mm", - "network_stack_setup.h", - "network_stack_setup.mm", "provider_registration.h", "provider_registration.mm", ] @@ -59,7 +57,6 @@ source_set("startup") { "//ios/chrome/browser/first_run", "//ios/chrome/browser/net:net", "//ios/chrome/browser/ntp_snippets", - "//ios/chrome/browser/web", "//ios/chrome/browser/web:web_internal", "//ios/chrome/common", "//ios/chrome/common/app_group", |