diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-08-30 10:22:43 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-08-30 12:36:28 +0000 |
| commit | 271a6c3487a14599023a9106329505597638d793 (patch) | |
| tree | e040d58ffc86c1480b79ca8528020ca9ec919bf8 /chromium/ios | |
| parent | 7b2ffa587235a47d4094787d72f38102089f402a (diff) | |
| download | qtwebengine-chromium-271a6c3487a14599023a9106329505597638d793.tar.gz | |
BASELINE: Update Chromium to 77.0.3865.59
Change-Id: I1e89a5f3b009a9519a6705102ad65c92fe736f21
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/ios')
161 files changed, 1972 insertions, 682 deletions
diff --git a/chromium/ios/BUILD.gn b/chromium/ios/BUILD.gn index 323b4912dba..20da26e6e92 100644 --- a/chromium/ios/BUILD.gn +++ b/chromium/ios/BUILD.gn @@ -54,6 +54,7 @@ group("all") { "//ios/chrome/test:all_tests", "//ios/chrome/test/earl_grey:all_tests", "//ios/chrome/test/earl_grey2:all_tests", + "//ios/chrome/test/wpt:all_tests", "//ios/components:all_tests", "//ios/net:all_tests", "//ios/showcase:all_tests", diff --git a/chromium/ios/chrome/app/BUILD.gn b/chromium/ios/chrome/app/BUILD.gn index 1d2dc2e6d38..0dae68e6491 100644 --- a/chromium/ios/chrome/app/BUILD.gn +++ b/chromium/ios/chrome/app/BUILD.gn @@ -19,12 +19,18 @@ buildflag_header("firebase_buildflags") { source_set("app") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ + "app_startup_parameters.h", + "app_startup_parameters.mm", "deferred_initialization_runner.h", "deferred_initialization_runner.mm", ] deps = [ "//base", + "//ios/chrome/browser", + "//ios/chrome/browser/payments:constants", + "//net", + "//url", ] libs = [ "Foundation.framework" ] @@ -34,6 +40,7 @@ source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ + "app_startup_parameters_unittest.mm", "chrome_overlay_window_testing.h", "deferred_initialization_runner_unittest.mm", "firebase_utils_unittest.mm", @@ -158,6 +165,7 @@ source_set("app_internal") { "//components/prefs", "//components/prefs/ios", "//components/proxy_config", + "//components/signin/public/identity_manager", "//components/suggestions", "//components/sync", "//components/ukm/ios:features", @@ -208,6 +216,7 @@ source_set("app_internal") { "//ios/chrome/browser/sync", "//ios/chrome/browser/tabs", "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/browser/ui/appearance", "//ios/chrome/browser/ui/authentication", "//ios/chrome/browser/ui/browser_view", "//ios/chrome/browser/ui/commands", @@ -222,6 +231,7 @@ source_set("app_internal") { "//ios/chrome/browser/ui/signin_interaction", "//ios/chrome/browser/ui/tab_grid", "//ios/chrome/browser/ui/tab_grid:tab_grid_ui", + "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/tabs", "//ios/chrome/browser/ui/toolbar:toolbar_ui", "//ios/chrome/browser/ui/toolbar/public", @@ -247,10 +257,10 @@ source_set("app_internal") { "//ios/public/provider/chrome/browser/user_feedback", "//ios/testing/perf:startup", "//ios/third_party/material_roboto_font_loader_ios", + "//ios/web/common:web_view_creation_util", "//ios/web/public/webui", "//mojo/core/embedder", "//net", - "//services/identity/public/cpp:cpp", "//skia", "//ui/base", "//ui/gfx", diff --git a/chromium/ios/chrome/app/application_delegate/BUILD.gn b/chromium/ios/chrome/app/application_delegate/BUILD.gn index 518e2cdd5eb..3944bc9bbe1 100644 --- a/chromium/ios/chrome/app/application_delegate/BUILD.gn +++ b/chromium/ios/chrome/app/application_delegate/BUILD.gn @@ -125,6 +125,7 @@ source_set("application_delegate_internal") { "//ios/chrome/browser/net", "//ios/chrome/browser/payments", "//ios/chrome/browser/search_engines", + "//ios/chrome/browser/signin", "//ios/chrome/browser/tabs", "//ios/chrome/browser/u2f", "//ios/chrome/browser/ui/authentication", @@ -167,6 +168,7 @@ source_set("test_support") { ":application_delegate_internal", "//base", "//base/test:test_support", + "//ios/chrome/app", "//ios/chrome/app:app_internal", "//ios/chrome/app:mode", "//ios/chrome/browser", diff --git a/chromium/ios/chrome/app/spotlight/BUILD.gn b/chromium/ios/chrome/app/spotlight/BUILD.gn index a5a2c55b3c6..f8cd5483e62 100644 --- a/chromium/ios/chrome/app/spotlight/BUILD.gn +++ b/chromium/ios/chrome/app/spotlight/BUILD.gn @@ -26,6 +26,7 @@ source_set("spotlight") { "//components/favicon_base", "//components/history/core/browser", "//components/suggestions", + "//ios/chrome/app", "//ios/chrome/app/strings", "//ios/chrome/browser", "//ios/chrome/browser/bookmarks", diff --git a/chromium/ios/chrome/app/startup/BUILD.gn b/chromium/ios/chrome/app/startup/BUILD.gn index 84b05039165..f4f7b1ec643 100644 --- a/chromium/ios/chrome/app/startup/BUILD.gn +++ b/chromium/ios/chrome/app/startup/BUILD.gn @@ -51,6 +51,7 @@ source_set("startup") { "//base", "//components/ntp_snippets", "//components/search_engines:search_engines", + "//ios/chrome/app", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/first_run", @@ -76,6 +77,7 @@ source_set("unit_tests") { deps = [ ":startup", "//base", + "//ios/chrome/app", "//ios/chrome/browser", "//ios/chrome/common/app_group", "//testing/gtest", diff --git a/chromium/ios/chrome/browser/BUILD.gn b/chromium/ios/chrome/browser/BUILD.gn index d606b433ef7..ca53b741cbe 100644 --- a/chromium/ios/chrome/browser/BUILD.gn +++ b/chromium/ios/chrome/browser/BUILD.gn @@ -2,7 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//build/buildflag_header.gni") import("//build/config/features.gni") import("//build/config/ios/rules.gni") import("//rlz/buildflags/buildflags.gni") @@ -25,10 +24,6 @@ source_set("chrome_paths") { source_set("browser") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ - "about_flags.h", - "about_flags.mm", - "app_startup_parameters.h", - "app_startup_parameters.mm", "application_context.cc", "application_context.h", "arch_util.cc", @@ -57,8 +52,6 @@ source_set("browser") { "installation_notifier.mm", "ios_chrome_field_trials.cc", "ios_chrome_field_trials.h", - "ios_chrome_flag_descriptions.cc", - "ios_chrome_flag_descriptions.h", "ios_chrome_io_thread.h", "ios_chrome_io_thread.mm", "ios_first_run_field_trials.cc", @@ -70,15 +63,12 @@ source_set("browser") { "procedural_block_types.h", "system_flags.h", "system_flags.mm", - "tab_parenting_global_observer.cc", - "tab_parenting_global_observer.h", - "web_data_service_factory.cc", - "web_data_service_factory.h", ] deps = [ ":settings_resources", "//base", + "//build:branding_buildflags", "//components/autofill/core/browser", "//components/autofill/core/common", "//components/autofill/ios/browser", @@ -106,7 +96,6 @@ source_set("browser") { "//components/search_provider_logos", "//components/security_state/core", "//components/send_tab_to_self", - "//components/signin/core/browser", "//components/strings", "//components/sync", "//components/translate/core/browser", @@ -123,6 +112,7 @@ source_set("browser") { "//ios/chrome/browser/app_launcher:feature_flags", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/browsing_data:feature_flags", + "//ios/chrome/browser/complex_tasks", "//ios/chrome/browser/crash_report:flags", "//ios/chrome/browser/download", "//ios/chrome/browser/drag_and_drop", @@ -150,6 +140,7 @@ source_set("browser") { "//ios/public/provider/chrome/browser/voice", "//ios/web", "//ios/web/common", + "//ios/web/common:web_view_creation_util", "//ios/web/public", "//net", "//rlz/buildflags", @@ -205,6 +196,7 @@ source_set("browser_impl") { "//ios/chrome/browser/browser_state:browser_state_impl", "//ios/chrome/browser/component_updater", "//ios/chrome/browser/first_run", + "//ios/chrome/browser/flags", "//ios/chrome/browser/gcm", "//ios/chrome/browser/history", "//ios/chrome/browser/metrics", @@ -247,7 +239,6 @@ source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ - "app_startup_parameters_unittest.mm", "browser_about_rewriter_unittest.cc", "chrome_browser_provider_observer_bridge_unittest.mm", "chrome_url_util_unittest.mm", diff --git a/chromium/ios/chrome/browser/app_launcher/BUILD.gn b/chromium/ios/chrome/browser/app_launcher/BUILD.gn index 3d59ccb8186..02f73a94e27 100644 --- a/chromium/ios/chrome/browser/app_launcher/BUILD.gn +++ b/chromium/ios/chrome/browser/app_launcher/BUILD.gn @@ -23,6 +23,7 @@ source_set("app_launcher") { "//ios/chrome/browser/browser_state", "//ios/chrome/browser/reading_list", "//ios/chrome/browser/u2f", + "//ios/web/common", "//ios/web/public", "//url", ] diff --git a/chromium/ios/chrome/browser/autocomplete/BUILD.gn b/chromium/ios/chrome/browser/autocomplete/BUILD.gn index dc1e9ad0b1f..233583d4dc6 100644 --- a/chromium/ios/chrome/browser/autocomplete/BUILD.gn +++ b/chromium/ios/chrome/browser/autocomplete/BUILD.gn @@ -27,7 +27,7 @@ source_set("autocomplete") { "//components/language/core/browser", "//components/omnibox/browser", "//components/prefs", - "//components/signin/core/browser", + "//components/signin/public/identity_manager", "//components/sync", "//components/unified_consent", "//ios/chrome/browser", @@ -41,7 +41,6 @@ source_set("autocomplete") { "//ios/chrome/browser/web_state_list", "//ios/public/provider/chrome/browser", "//ios/web", - "//services/identity/public/cpp", "//url", ] } diff --git a/chromium/ios/chrome/browser/autofill/BUILD.gn b/chromium/ios/chrome/browser/autofill/BUILD.gn index 4a5844bdeae..24a16bf8f05 100644 --- a/chromium/ios/chrome/browser/autofill/BUILD.gn +++ b/chromium/ios/chrome/browser/autofill/BUILD.gn @@ -69,7 +69,10 @@ source_set("autofill") { "//ios/chrome/browser/ui/autofill/manual_fill:manual_fill_ui", "//ios/chrome/browser/ui/image_util", "//ios/chrome/browser/ui/util", + "//ios/chrome/browser/webdata_services", + "//ios/chrome/common/colors", "//ios/chrome/common/ui_util", + "//ios/web/common", "//ios/web/public/deprecated", "//ios/web/public/js_messaging", "//third_party/leveldatabase", @@ -113,7 +116,6 @@ source_set("autofill_internal") { "//components/infobars/core", "//components/pref_registry", "//components/prefs", - "//components/signin/core/browser", "//ios/chrome/app/strings", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", @@ -163,6 +165,7 @@ source_set("unit_tests") { "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web:test_support", "//ios/chrome/browser/web:web_internal", + "//ios/chrome/browser/webdata_services", "//ios/chrome/test/base", "//ios/web/public/deprecated", "//ios/web/public/js_messaging", @@ -331,6 +334,8 @@ bundle_data("unit_tests_bundle_data") { "//components/test/data/autofill/heuristics/input/153_fmm-en_inm.gob.mx.html", "//components/test/data/autofill/heuristics/input/154_fmm-es_inm.gob.mx.html", "//components/test/data/autofill/heuristics/input/155_fmm-ja_inm.gob.mx.html", + "//components/test/data/autofill/heuristics/input/156_buyAlbum_bandcamp.com_price.html", + "//components/test/data/autofill/heuristics/input/157_bug_971402_opentable_checkout.html", "//components/test/data/autofill/heuristics/output/000_i18n_de.out", "//components/test/data/autofill/heuristics/output/001_i18n_de2.out", "//components/test/data/autofill/heuristics/output/002_i18n_en.out", @@ -486,6 +491,8 @@ bundle_data("unit_tests_bundle_data") { "//components/test/data/autofill/heuristics/output/153_fmm-en_inm.gob.mx.out", "//components/test/data/autofill/heuristics/output/154_fmm-es_inm.gob.mx.out", "//components/test/data/autofill/heuristics/output/155_fmm-ja_inm.gob.mx.out", + "//components/test/data/autofill/heuristics/output/156_buyAlbum_bandcamp.com_price.out", + "//components/test/data/autofill/heuristics/output/157_bug_971402_opentable_checkout.out", ] outputs = [ "{{bundle_resources_dir}}/" + diff --git a/chromium/ios/chrome/browser/autofill/manual_fill/BUILD.gn b/chromium/ios/chrome/browser/autofill/manual_fill/BUILD.gn index a15c0c7bcf1..537d9ddbbd5 100644 --- a/chromium/ios/chrome/browser/autofill/manual_fill/BUILD.gn +++ b/chromium/ios/chrome/browser/autofill/manual_fill/BUILD.gn @@ -11,11 +11,12 @@ source_set("manual_fill") { ] deps = [ "//base", - "//components/autofill/core/common:common", - "//components/keyed_service/core:core", - "//components/password_manager/core/browser:browser", + "//components/autofill/core/common", + "//components/keyed_service/core", + "//components/password_manager/core/browser", + "//components/password_manager/core/browser:affiliation", "//ios/chrome/browser/browser_state:browser_state", - "//ios/chrome/browser/passwords:passwords", + "//ios/chrome/browser/passwords", ] libs = [ "UIKit.framework" ] configs += [ "//build/config/compiler:enable_arc" ] @@ -30,11 +31,11 @@ source_set("unit_tests") { deps = [ ":manual_fill", "//base/test:test_support", - "//components/autofill/core/common:common", - "//components/keyed_service/core:core", + "//components/autofill/core/common", + "//components/keyed_service/core", "//components/password_manager/core/browser:test_support", "//ios/chrome/browser/browser_state:test_support", - "//ios/chrome/browser/passwords:passwords", - "//testing/gtest:gtest", + "//ios/chrome/browser/passwords", + "//testing/gtest", ] } diff --git a/chromium/ios/chrome/browser/browser_state/BUILD.gn b/chromium/ios/chrome/browser/browser_state/BUILD.gn index 39a69107b77..9836169ec6e 100644 --- a/chromium/ios/chrome/browser/browser_state/BUILD.gn +++ b/chromium/ios/chrome/browser/browser_state/BUILD.gn @@ -18,9 +18,14 @@ source_set("browser_state") { deps = [ "//base", + "//components/autofill/core/browser", + "//components/keyed_service/core", + "//components/keyed_service/ios", "//components/prefs", + "//components/search_engines", "//components/sync_preferences", "//components/variations/net", + "//components/webdata_services", "//ios/chrome/browser/net:net_types", "//ios/web/public/webui", ] @@ -59,7 +64,6 @@ source_set("browser_state_impl") { ":browser_state", "//base", "//base:i18n", - "//components/about_handler", "//components/bookmarks/browser", "//components/browser_sync", "//components/content_settings/core/browser", @@ -74,8 +78,8 @@ source_set("browser_state_impl") { "//components/prefs", "//components/proxy_config", "//components/proxy_config/ios", - "//components/signin/core/browser", "//components/signin/ios/browser:active_state_manager", + "//components/signin/public/identity_manager", "//components/sync_preferences", "//components/user_prefs", "//google_apis", @@ -117,13 +121,13 @@ source_set("browser_state_impl") { "//ios/chrome/browser/undo", "//ios/chrome/browser/unified_consent", "//ios/chrome/browser/web_state_list/web_usage_enabler", + "//ios/chrome/browser/webdata_services", "//ios/net", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/signin", "//ios/web/net/cookies", "//net", "//net:extras", - "//services/identity/public/cpp", "//services/identity/public/mojom", ] allow_circular_includes_from = [ @@ -191,6 +195,7 @@ source_set("test_support") { "//ios/chrome/browser/prefs:browser_prefs", "//ios/chrome/browser/sync/glue", "//ios/chrome/browser/undo", + "//ios/chrome/browser/webdata_services", "//ios/chrome/test:test_support", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/ui", diff --git a/chromium/ios/chrome/browser/browsing_data/BUILD.gn b/chromium/ios/chrome/browser/browsing_data/BUILD.gn index 5e3b7ba64bb..1722a712f61 100644 --- a/chromium/ios/chrome/browser/browsing_data/BUILD.gn +++ b/chromium/ios/chrome/browser/browsing_data/BUILD.gn @@ -50,7 +50,6 @@ source_set("browsing_data") { "//components/password_manager/core/browser", "//components/prefs", "//components/sessions", - "//components/signin/core/browser", "//components/signin/ios/browser", "//components/translate/core/browser:browser", "//ios/chrome/browser", @@ -69,9 +68,10 @@ source_set("browsing_data") { "//ios/chrome/browser/snapshots", "//ios/chrome/browser/sync", "//ios/chrome/browser/translate:translate", + "//ios/chrome/browser/webdata_services", "//ios/net", "//ios/public/provider/chrome/browser", - "//ios/web", + "//ios/web/common:web_view_creation_util", "//net", "//url", ] diff --git a/chromium/ios/chrome/browser/complex_tasks/BUILD.gn b/chromium/ios/chrome/browser/complex_tasks/BUILD.gn new file mode 100644 index 00000000000..d71cbe756c7 --- /dev/null +++ b/chromium/ios/chrome/browser/complex_tasks/BUILD.gn @@ -0,0 +1,31 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +source_set("complex_tasks") { + sources = [ + "ios_content_record_task_id.h", + "ios_content_record_task_id.mm", + "ios_task_tab_helper.h", + "ios_task_tab_helper.mm", + ] + deps = [ + "//ios/web", + ] + configs += [ "//build/config/compiler:enable_arc" ] +} + +source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ + "ios_task_tab_helper_unittest.mm", + ] + deps = [ + ":complex_tasks", + "//ios/web/public:public", + "//ios/web/public/test:test", + "//ios/web/public/test:util", + "//ios/web/public/test/fakes:fakes", + ] +} diff --git a/chromium/ios/chrome/browser/feature_engagement/BUILD.gn b/chromium/ios/chrome/browser/feature_engagement/BUILD.gn index ce0155153cc..366205f7093 100644 --- a/chromium/ios/chrome/browser/feature_engagement/BUILD.gn +++ b/chromium/ios/chrome/browser/feature_engagement/BUILD.gn @@ -45,7 +45,6 @@ source_set("eg_tests") { "//ios/chrome/browser", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/ui/popup_menu:constants", - "//ios/chrome/browser/ui/tab_grid:egtest_support", "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/util", "//ios/chrome/test/app:test_support", diff --git a/chromium/ios/chrome/browser/flags/BUILD.gn b/chromium/ios/chrome/browser/flags/BUILD.gn new file mode 100644 index 00000000000..6056bdf480e --- /dev/null +++ b/chromium/ios/chrome/browser/flags/BUILD.gn @@ -0,0 +1,64 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +source_set("flags") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "about_flags.h", + "about_flags.mm", + "ios_chrome_flag_descriptions.cc", + "ios_chrome_flag_descriptions.h", + ] + + deps = [ + "//base", + "//components/autofill/core/common", + "//components/autofill/ios/browser", + "//components/dom_distiller/core", + "//components/feature_engagement/public", + "//components/flags_ui", + "//components/flags_ui:switches", + "//components/invalidation/impl:feature_list", + "//components/ntp_tiles", + "//components/omnibox/browser", + "//components/omnibox/common", + "//components/password_manager/core/common", + "//components/payments/core", + "//components/search_provider_logos", + "//components/security_state/core", + "//components/send_tab_to_self", + "//components/signin/core/browser", + "//components/signin/public/base", + "//components/strings:components_strings", + "//components/sync/driver", + "//components/translate/core/browser", + "//components/ukm/ios:features", + "//components/unified_consent", + "//components/variations", + "//ios/chrome/app/strings:ios_strings", + "//ios/chrome/browser", + "//ios/chrome/browser/app_launcher:feature_flags", + "//ios/chrome/browser/browsing_data:feature_flags", + "//ios/chrome/browser/crash_report:flags", + "//ios/chrome/browser/drag_and_drop", + "//ios/chrome/browser/find_in_page:feature_flags", + "//ios/chrome/browser/passwords:feature_flags", + "//ios/chrome/browser/reading_list:features", + "//ios/chrome/browser/signin:feature_flags", + "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/browser/ui/dialogs:feature_flags", + "//ios/chrome/browser/ui/fullscreen:feature_flags", + "//ios/chrome/browser/ui/infobars:feature_flags", + "//ios/chrome/browser/ui/settings/autofill:feature_flags", + "//ios/chrome/browser/ui/table_view:feature_flags", + "//ios/chrome/browser/ui/toolbar/public:feature_flags", + "//ios/chrome/browser/ui/toolbar_container:feature_flags", + "//ios/chrome/browser/web:feature_flags", + "//ios/public/provider/chrome/browser", + "//ios/web/common", + "//ios/web/common:web_view_creation_util", + "//ios/web/public", + "//ios/web/public:user_agent", + ] +} diff --git a/chromium/ios/chrome/browser/infobars/BUILD.gn b/chromium/ios/chrome/browser/infobars/BUILD.gn index 78fd90d8ac8..5ad5e83ebca 100644 --- a/chromium/ios/chrome/browser/infobars/BUILD.gn +++ b/chromium/ios/chrome/browser/infobars/BUILD.gn @@ -37,6 +37,8 @@ source_set("infobars") { source_set("badge") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ + "infobar_badge_model.h", + "infobar_badge_model.mm", "infobar_badge_tab_helper.h", "infobar_badge_tab_helper.mm", "infobar_badge_tab_helper_delegate.h", @@ -44,6 +46,7 @@ source_set("badge") { deps = [ ":infobars", ":public", + "//ios/chrome/browser/ui/badges:public", "//ios/chrome/browser/ui/infobars:feature_flags", "//ios/chrome/browser/ui/infobars:infobars_ui", "//ios/web", @@ -75,6 +78,7 @@ source_set("unit_tests") { "//base/test:test_support", "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/infobars:public", + "//ios/chrome/browser/ui/badges:public", "//ios/chrome/browser/ui/infobars:feature_flags", "//ios/chrome/browser/ui/infobars:infobars_ui", "//ios/chrome/browser/ui/infobars:test_support", diff --git a/chromium/ios/chrome/browser/memory/BUILD.gn b/chromium/ios/chrome/browser/memory/BUILD.gn index e11599cc30a..ee0d8a27fd7 100644 --- a/chromium/ios/chrome/browser/memory/BUILD.gn +++ b/chromium/ios/chrome/browser/memory/BUILD.gn @@ -14,6 +14,7 @@ source_set("memory") { ] deps = [ "//base", + "//build:branding_buildflags", "//components/prefs", "//ios/chrome/browser", "//ios/chrome/browser/ui/util", diff --git a/chromium/ios/chrome/browser/metrics/BUILD.gn b/chromium/ios/chrome/browser/metrics/BUILD.gn index 75424c4c18f..53e50b4c8c4 100644 --- a/chromium/ios/chrome/browser/metrics/BUILD.gn +++ b/chromium/ios/chrome/browser/metrics/BUILD.gn @@ -28,6 +28,22 @@ source_set("features") { ] } +source_set("chrome_browser_state_client") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "chrome_browser_state_client.h", + "chrome_browser_state_client.mm", + ] + deps = [ + "//base", + "//components/metrics:demographic_metrics_provider", + "//components/network_time", + "//ios/chrome/browser", + "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/sync", + ] +} + source_set("metrics") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ @@ -57,6 +73,7 @@ source_set("metrics") { ":ukm_url_recorder", ] deps = [ + ":chrome_browser_state_client", ":features", "//base", "//components/browser_sync", @@ -64,6 +81,7 @@ source_set("metrics") { "//components/keyed_service/core", "//components/keyed_service/ios", "//components/metrics", + "//components/metrics:demographic_metrics_provider", "//components/metrics:net", "//components/metrics:ui", "//components/metrics_services_manager", @@ -103,6 +121,7 @@ source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ + "chrome_browser_state_client_unittest.mm", "ios_chrome_metrics_service_accessor_unittest.cc", "ios_chrome_stability_metrics_provider_unittest.mm", "mobile_session_shutdown_metrics_provider_unittest.mm", @@ -110,18 +129,23 @@ source_set("unit_tests") { "ukm_url_recorder_unittest.mm", ] deps = [ + ":chrome_browser_state_client", ":metrics", "//base", "//base/test:test_support", "//components/metrics", "//components/metrics:test_support", + "//components/network_time:network_time", "//components/prefs", "//components/prefs:test_support", "//components/ukm:test_support", "//components/version_info", + "//ios/chrome/browser", + "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/web:test_support", "//ios/chrome/test:test_support", "//ios/web/public:public", + "//ios/web/public/test", "//ios/web/public/test/fakes", "//net:test_support", "//testing/gtest", @@ -154,6 +178,7 @@ source_set("metrics_internal") { "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web_state_list", "//ios/web", + "//services/metrics/public/cpp:ukm_builders", "//ui/base", "//url", ] @@ -213,7 +238,6 @@ source_set("eg_tests") { "//ios/chrome/browser/ui/authentication/cells", "//ios/chrome/browser/ui/popup_menu:constants", "//ios/chrome/browser/ui/settings", - "//ios/chrome/browser/ui/tab_grid:egtest_support", "//ios/chrome/browser/ui/toolbar/buttons", "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/util", @@ -243,7 +267,6 @@ source_set("test_support") { "//ios/chrome/browser/tabs", "//ios/chrome/browser/ui/main", "//ios/chrome/browser/ui/popup_menu:constants", - "//ios/chrome/browser/ui/tab_grid:egtest_support", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web_state_list", "//ios/chrome/test/app:test_support", diff --git a/chromium/ios/chrome/browser/ntp_snippets/BUILD.gn b/chromium/ios/chrome/browser/ntp_snippets/BUILD.gn index 928431f6176..a69d5f01824 100644 --- a/chromium/ios/chrome/browser/ntp_snippets/BUILD.gn +++ b/chromium/ios/chrome/browser/ntp_snippets/BUILD.gn @@ -19,6 +19,7 @@ source_set("ntp_snippets") { "//components/ntp_snippets", "//components/pref_registry", "//components/reading_list/core", + "//components/signin/public/identity_manager", "//components/version_info", "//google_apis", "//ios/chrome/app:tests_hook", @@ -35,6 +36,5 @@ source_set("ntp_snippets") { "//ios/chrome/common", "//ios/web", "//net", - "//services/identity/public/cpp", ] } diff --git a/chromium/ios/chrome/browser/open_in/BUILD.gn b/chromium/ios/chrome/browser/open_in/BUILD.gn new file mode 100644 index 00000000000..d398e7bf258 --- /dev/null +++ b/chromium/ios/chrome/browser/open_in/BUILD.gn @@ -0,0 +1,45 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/ios/rules.gni") + +source_set("open_in") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "open_in_tab_helper.h", + "open_in_tab_helper.mm", + "open_in_tab_helper_delegate.h", + ] + deps = [ + "//base", + "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser", + "//ios/chrome/browser/browser_state", + "//ios/web/public", + "//ui/base:base", + "//url", + ] +} + +source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ + "open_in_tab_helper_unittest.mm", + ] + deps = [ + ":open_in", + "//base", + "//base/test:test_support", + "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser", + "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/ui/open_in", + "//ios/chrome/browser/web:tab_id_tab_helper", + "//ios/web/public/test/fakes", + "//testing/gtest", + "//ui/base:base", + "//url", + ] +} diff --git a/chromium/ios/chrome/browser/overlays/BUILD.gn b/chromium/ios/chrome/browser/overlays/BUILD.gn index 51c035c3b74..0985ace754e 100644 --- a/chromium/ios/chrome/browser/overlays/BUILD.gn +++ b/chromium/ios/chrome/browser/overlays/BUILD.gn @@ -6,7 +6,10 @@ source_set("overlays") { public = [ "public/overlay_dismissal_callback.h", "public/overlay_modality.h", + "public/overlay_presentation_context.h", + "public/overlay_presentation_context_observer.h", "public/overlay_presenter.h", + "public/overlay_presenter_observer.h", "public/overlay_request.h", "public/overlay_request_queue.h", "public/overlay_response.h", diff --git a/chromium/ios/chrome/browser/overlays/public/web_content_area/BUILD.gn b/chromium/ios/chrome/browser/overlays/public/web_content_area/BUILD.gn index df86fb05c5b..a809bdad270 100644 --- a/chromium/ios/chrome/browser/overlays/public/web_content_area/BUILD.gn +++ b/chromium/ios/chrome/browser/overlays/public/web_content_area/BUILD.gn @@ -4,12 +4,14 @@ source_set("web_content_area") { sources = [ + "http_auth_overlay.h", + "http_auth_overlay.mm", "java_script_alert_overlay.h", "java_script_alert_overlay.mm", "java_script_confirmation_overlay.h", "java_script_confirmation_overlay.mm", - "java_script_dialog_source.cc", "java_script_dialog_source.h", + "java_script_dialog_source.mm", "java_script_prompt_overlay.h", "java_script_prompt_overlay.mm", ] @@ -19,6 +21,8 @@ source_set("web_content_area") { deps = [ "//base", "//ios/chrome/browser/overlays", + "//ios/web/public", + "//ios/web/public:web_state_types", "//url", ] } diff --git a/chromium/ios/chrome/browser/overlays/test/BUILD.gn b/chromium/ios/chrome/browser/overlays/test/BUILD.gn index 4c7a3ed9844..ab2ca630c4b 100644 --- a/chromium/ios/chrome/browser/overlays/test/BUILD.gn +++ b/chromium/ios/chrome/browser/overlays/test/BUILD.gn @@ -5,8 +5,8 @@ source_set("test") { testonly = true sources = [ - "fake_overlay_presenter_ui_delegate.cc", - "fake_overlay_presenter_ui_delegate.h", + "fake_overlay_presentation_context.cc", + "fake_overlay_presentation_context.h", "fake_overlay_user_data.cc", "fake_overlay_user_data.h", ] diff --git a/chromium/ios/chrome/browser/overscroll_actions/BUILD.gn b/chromium/ios/chrome/browser/overscroll_actions/BUILD.gn index 3184f6e926f..75405c5c709 100644 --- a/chromium/ios/chrome/browser/overscroll_actions/BUILD.gn +++ b/chromium/ios/chrome/browser/overscroll_actions/BUILD.gn @@ -30,6 +30,7 @@ source_set("unit_tests") { "//base/test:test_support", "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/ui/overscroll_actions", + "//ios/chrome/common/colors", "//ios/chrome/test/fakes", "//ios/web/public", "//ios/web/public/test", diff --git a/chromium/ios/chrome/browser/passwords/BUILD.gn b/chromium/ios/chrome/browser/passwords/BUILD.gn index 1d90f1a5c05..343e71d19e1 100644 --- a/chromium/ios/chrome/browser/passwords/BUILD.gn +++ b/chromium/ios/chrome/browser/passwords/BUILD.gn @@ -30,8 +30,8 @@ source_set("passwords") { "password_controller.h", "password_controller.mm", "password_form_filler.h", - "password_manager_internals_service_factory.cc", - "password_manager_internals_service_factory.h", + "password_manager_log_router_factory.cc", + "password_manager_log_router_factory.h", "password_tab_helper.h", "password_tab_helper.mm", "save_passwords_consumer.h", @@ -53,12 +53,12 @@ source_set("passwords") { "//components/keyed_service/core", "//components/keyed_service/ios", "//components/password_manager/core/browser", + "//components/password_manager/core/browser:affiliation", "//components/password_manager/core/browser/form_parsing", "//components/password_manager/core/common", "//components/password_manager/ios", "//components/prefs", "//components/security_state/core", - "//components/signin/core/browser", "//components/strings", "//components/sync", "//components/translate/core/browser:browser", @@ -82,6 +82,7 @@ source_set("passwords") { "//ios/chrome/browser/ui/infobars/coordinators", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web", + "//ios/chrome/browser/webdata_services", "//ios/chrome/common/ui_util", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/ui", diff --git a/chromium/ios/chrome/browser/payments/BUILD.gn b/chromium/ios/chrome/browser/payments/BUILD.gn index 9b329be70f3..e5fa2cc4a4d 100644 --- a/chromium/ios/chrome/browser/payments/BUILD.gn +++ b/chromium/ios/chrome/browser/payments/BUILD.gn @@ -36,10 +36,11 @@ source_set("payments") { "//components/image_fetcher/ios", "//components/keyed_service/ios", "//components/payments/core", + "//components/payments/core:error_strings", "//components/payments/mojom", "//components/prefs", "//components/security_state/core", - "//components/signin/core/browser", + "//components/signin/public/identity_manager", "//components/strings:components_strings_grit", "//ios/chrome/browser", "//ios/chrome/browser/autofill", @@ -49,7 +50,6 @@ source_set("payments") { "//ios/web", "//ios/web/public/security", "//net", - "//services/identity/public/cpp:cpp", "//ui/base", "//url", ] @@ -116,13 +116,10 @@ source_set("test_support") { "//components/payments/core", "//components/payments/core:test_support", "//components/prefs", - "//components/signin/core/browser", + "//components/signin/public/identity_manager", "//ios/chrome/browser/browser_state:test_support", - "//ios/chrome/browser/signin", - "//ios/chrome/browser/signin:test_support", "//ios/web", "//ios/web/public/test", "//ios/web/public/test/fakes", - "//services/identity/public/cpp:cpp", ] } diff --git a/chromium/ios/chrome/browser/prefs/BUILD.gn b/chromium/ios/chrome/browser/prefs/BUILD.gn index e2c496b926b..b997018d6a6 100644 --- a/chromium/ios/chrome/browser/prefs/BUILD.gn +++ b/chromium/ios/chrome/browser/prefs/BUILD.gn @@ -52,7 +52,7 @@ source_set("browser_prefs") { "//components/rappor", "//components/search_engines", "//components/sessions", - "//components/signin/core/browser", + "//components/signin/public/identity_manager", "//components/strings", "//components/sync", "//components/sync_sessions", @@ -76,7 +76,6 @@ source_set("browser_prefs") { "//ios/chrome/browser/voice:prefs", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/user", - "//services/identity/public/cpp:cpp", "//ui/base", ] } diff --git a/chromium/ios/chrome/browser/prerender/BUILD.gn b/chromium/ios/chrome/browser/prerender/BUILD.gn index 9cb0c20fef9..27db3fd7d5e 100644 --- a/chromium/ios/chrome/browser/prerender/BUILD.gn +++ b/chromium/ios/chrome/browser/prerender/BUILD.gn @@ -36,6 +36,7 @@ source_set("prerender") { "//ios/chrome/browser/web", "//ios/chrome/browser/web_state_list", "//ios/web/public/deprecated", + "//ios/web/public/deprecated:deprecated_web_util", "//ui/base", "//url", ] diff --git a/chromium/ios/chrome/browser/search_engines/BUILD.gn b/chromium/ios/chrome/browser/search_engines/BUILD.gn index 6f45520594f..fcb6f270aae 100644 --- a/chromium/ios/chrome/browser/search_engines/BUILD.gn +++ b/chromium/ios/chrome/browser/search_engines/BUILD.gn @@ -39,6 +39,7 @@ source_set("search_engines") { "//ios/chrome/browser/browser_state", "//ios/chrome/browser/google", "//ios/chrome/browser/history", + "//ios/chrome/browser/webdata_services", "//ios/chrome/common", "//ios/web", "//net", diff --git a/chromium/ios/chrome/browser/signin/BUILD.gn b/chromium/ios/chrome/browser/signin/BUILD.gn index 2996fbee978..61bff4ea6a9 100644 --- a/chromium/ios/chrome/browser/signin/BUILD.gn +++ b/chromium/ios/chrome/browser/signin/BUILD.gn @@ -20,6 +20,8 @@ source_set("signin") { "chrome_identity_service_observer_bridge.mm", "constants.h", "constants.mm", + "device_accounts_provider_impl.h", + "device_accounts_provider_impl.mm", "gaia_auth_fetcher_ios.h", "gaia_auth_fetcher_ios.mm", "gaia_auth_fetcher_ios_bridge.h", @@ -37,8 +39,6 @@ source_set("signin") { "ios_chrome_signin_client.mm", "ios_chrome_signin_status_metrics_provider_delegate.cc", "ios_chrome_signin_status_metrics_provider_delegate.h", - "profile_oauth2_token_service_ios_provider_impl.h", - "profile_oauth2_token_service_ios_provider_impl.mm", "signin_browser_state_info_updater.h", "signin_browser_state_info_updater.mm", "signin_browser_state_info_updater_factory.h", @@ -65,6 +65,8 @@ source_set("signin") { "//components/signin/core/browser", "//components/signin/ios/browser", "//components/signin/ios/browser:active_state_manager", + "//components/signin/public/identity_manager", + "//components/signin/public/identity_manager/ios", "//components/sync", "//components/unified_consent", "//google_apis", @@ -75,15 +77,15 @@ source_set("signin") { "//ios/chrome/browser/crash_report", "//ios/chrome/browser/reading_list:reading_list_remover", "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/webdata_services", "//ios/chrome/common", "//ios/net", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/signin", "//ios/web/common", + "//ios/web/common:web_view_creation_util", "//net", "//services/identity:lib", - "//services/identity/public/cpp", - "//services/identity/public/mojom", "//services/service_manager/public/mojom", "//url", ] @@ -109,23 +111,20 @@ source_set("test_support") { "authentication_service_delegate_fake.mm", "authentication_service_fake.h", "authentication_service_fake.mm", - "identity_test_environment_chrome_browser_state_adaptor.cc", - "identity_test_environment_chrome_browser_state_adaptor.h", ] deps = [ ":signin", "//base", "//components/image_fetcher/core:test_support", "//components/keyed_service/core", - "//components/signin/core/browser", - "//components/signin/core/browser:internals_test_support", - "//components/signin/ios/browser", + "//components/signin/public/base", + "//components/signin/public/base:test_support", + "//components/signin/public/identity_manager:test_support", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/sync", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/signin", - "//services/identity/public/cpp:test_support", ] } @@ -146,10 +145,9 @@ source_set("unit_tests") { "//base", "//components/pref_registry", "//components/prefs", - "//components/signin/core/browser", - "//components/signin/core/browser:internals_test_support", - "//components/signin/ios/browser", - "//components/signin/ios/browser:test_support", + "//components/signin/public/base:test_support", + "//components/signin/public/identity_manager", + "//components/signin/public/identity_manager:test_support", "//components/sync:test_support", "//components/sync_preferences", "//components/sync_preferences:test_support", @@ -172,7 +170,6 @@ source_set("unit_tests") { "//ios/web/public/test", "//ios/web/public/test/fakes", "//net:test_support", - "//services/identity/public/cpp:test_support", "//testing/gmock", "//testing/gtest", "//third_party/ocmock", diff --git a/chromium/ios/chrome/browser/snapshots/BUILD.gn b/chromium/ios/chrome/browser/snapshots/BUILD.gn index 4812e7ed67e..42045a989b0 100644 --- a/chromium/ios/chrome/browser/snapshots/BUILD.gn +++ b/chromium/ios/chrome/browser/snapshots/BUILD.gn @@ -35,6 +35,7 @@ source_set("snapshots") { "//ios/chrome/browser/browser_state", "//ios/chrome/browser/infobars", "//ios/chrome/browser/ntp", + "//ios/chrome/browser/overlays", "//ios/chrome/browser/tabs", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/util", @@ -79,10 +80,13 @@ source_set("unit_tests") { "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/ui/image_util", "//ios/chrome/browser/ui/util", + "//ios/chrome/browser/web:tab_id_tab_helper", "//ios/web", "//ios/web/public/test", "//ios/web/public/test/fakes:fakes", + "//testing/gmock", "//testing/gtest", + "//third_party/ocmock", "//ui/base:test_support", "//ui/gfx", ] diff --git a/chromium/ios/chrome/browser/suggestions/BUILD.gn b/chromium/ios/chrome/browser/suggestions/BUILD.gn index a3784b3ca6e..5ec806bdfb9 100644 --- a/chromium/ios/chrome/browser/suggestions/BUILD.gn +++ b/chromium/ios/chrome/browser/suggestions/BUILD.gn @@ -12,12 +12,12 @@ source_set("suggestions") { "//base", "//components/browser_sync", "//components/keyed_service/ios", + "//components/signin/public/identity_manager", "//components/suggestions", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/signin", "//ios/chrome/browser/sync", "//ios/web", "//net", - "//services/identity/public/cpp", ] } diff --git a/chromium/ios/chrome/browser/sync/BUILD.gn b/chromium/ios/chrome/browser/sync/BUILD.gn index c9e8dcc10b6..7a7f7973274 100644 --- a/chromium/ios/chrome/browser/sync/BUILD.gn +++ b/chromium/ios/chrome/browser/sync/BUILD.gn @@ -52,7 +52,7 @@ source_set("sync") { "//components/search_engines", "//components/send_tab_to_self", "//components/sessions", - "//components/signin/core/browser", + "//components/signin/public/base", "//components/sync", "//components/sync_device_info", "//components/sync_preferences", @@ -65,6 +65,7 @@ source_set("sync") { "//ios/chrome/browser/autofill", "//ios/chrome/browser/bookmarks", "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/complex_tasks", "//ios/chrome/browser/dom_distiller", "//ios/chrome/browser/favicon", "//ios/chrome/browser/gcm", @@ -79,6 +80,7 @@ source_set("sync") { "//ios/chrome/browser/sync/sessions", "//ios/chrome/browser/tabs", "//ios/chrome/browser/undo", + "//ios/chrome/browser/webdata_services", "//ios/chrome/common", "//ios/web", "//net", @@ -119,8 +121,10 @@ source_set("test_support") { } source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ + "ios_chrome_synced_tab_delegate_unittest.mm", "profile_sync_service_factory_unittest.cc", "session_sync_service_factory_unittest.cc", ] @@ -133,5 +137,6 @@ source_set("unit_tests") { "//ios/chrome/browser/browser_state:test_support", "//ios/web/public/test", "//testing/gtest", + "//ui/base", ] } diff --git a/chromium/ios/chrome/browser/tabs/BUILD.gn b/chromium/ios/chrome/browser/tabs/BUILD.gn index 203241527ba..ab23318ac0c 100644 --- a/chromium/ios/chrome/browser/tabs/BUILD.gn +++ b/chromium/ios/chrome/browser/tabs/BUILD.gn @@ -4,31 +4,24 @@ source_set("tabs") { sources = [ - "legacy_tab_helper.h", - "tab.h", "tab_helper_util.h", "tab_model.h", "tab_model_list.h", "tab_model_list_observer.h", - "tab_model_observer.h", "tab_model_synced_window_delegate.h", "tab_model_synced_window_delegate_getter.h", - "tab_private.h", + "tab_parenting_global_observer.cc", + "tab_parenting_global_observer.h", "tab_title_util.h", ] public_deps = [ "//ios/web", ] deps = [ - "//components/search_engines", "//components/sessions", - "//components/signin/ios/browser", "//components/sync_sessions", "//ios/chrome/browser/sessions:serialisation", - "//ios/chrome/browser/web:tab_helper_delegates", "//ios/chrome/browser/web_state_list", - "//ios/net", - "//ios/web/public", "//ui/base", ] libs = [ "UIKit.framework" ] @@ -37,16 +30,11 @@ source_set("tabs") { source_set("tabs_internal") { sources = [ - "legacy_tab_helper.mm", - "tab.h", - "tab.mm", "tab_helper_util.mm", "tab_model.mm", "tab_model_closing_web_state_observer.h", "tab_model_closing_web_state_observer.mm", "tab_model_list.mm", - "tab_model_observers.h", - "tab_model_observers.mm", "tab_model_selected_tab_observer.h", "tab_model_selected_tab_observer.mm", "tab_model_synced_window_delegate.mm", @@ -61,32 +49,21 @@ source_set("tabs_internal") { deps = [ ":tabs", "//base", - "//components/content_settings/core/browser", - "//components/favicon/core", "//components/favicon/ios", - "//components/google/core/browser", "//components/history/core/browser", "//components/history/ios/browser", - "//components/infobars/core", - "//components/keyed_service/core", "//components/language/ios/browser", - "//components/metrics_services_manager", "//components/navigation_metrics", - "//components/prefs", - "//components/reading_list/core", - "//components/search_engines", + "//components/profile_metrics", "//components/sessions", "//components/strings", - "//components/url_formatter", "//ios/chrome/app/strings", "//ios/chrome/browser", - "//ios/chrome/browser/app_launcher", "//ios/chrome/browser/autofill", "//ios/chrome/browser/autofill:autofill_internal", - "//ios/chrome/browser/bookmarks", "//ios/chrome/browser/browser_state", - "//ios/chrome/browser/content_settings", - "//ios/chrome/browser/crash_report:crash_report_internal", + "//ios/chrome/browser/browser_state_metrics", + "//ios/chrome/browser/complex_tasks", "//ios/chrome/browser/download", "//ios/chrome/browser/download:features", "//ios/chrome/browser/favicon", @@ -97,10 +74,10 @@ source_set("tabs_internal") { "//ios/chrome/browser/infobars", "//ios/chrome/browser/infobars:badge", "//ios/chrome/browser/itunes_urls", - "//ios/chrome/browser/language", "//ios/chrome/browser/metrics", "//ios/chrome/browser/metrics:metrics_internal", "//ios/chrome/browser/network_activity:tab_helper", + "//ios/chrome/browser/open_in", "//ios/chrome/browser/overscroll_actions", "//ios/chrome/browser/passwords", "//ios/chrome/browser/prerender", @@ -116,32 +93,20 @@ source_set("tabs_internal") { "//ios/chrome/browser/translate", "//ios/chrome/browser/u2f", "//ios/chrome/browser/ui:feature_flags", - "//ios/chrome/browser/ui/alert_coordinator", - "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/infobars:feature_flags", "//ios/chrome/browser/ui/open_in", - "//ios/chrome/browser/ui/overscroll_actions", - "//ios/chrome/browser/ui/util", "//ios/chrome/browser/voice", "//ios/chrome/browser/web", "//ios/chrome/browser/web:feature_flags", - "//ios/chrome/browser/web:tab_helper_delegates", "//ios/chrome/browser/web:web_internal", "//ios/chrome/browser/web_state_list", "//ios/chrome/browser/web_state_list/web_usage_enabler", - "//ios/net", "//ios/public/provider/chrome/browser", - "//ios/web", - "//ios/web/public", - "//ios/web/public/deprecated", "//ios/web/public/security", "//ios/web/public/session", - "//net", "//ui/base", - "//url", ] libs = [ - "CoreLocation.framework", "Foundation.framework", "UIKit.framework", ] @@ -154,7 +119,6 @@ source_set("unit_tests") { "tab_model_list_unittest.mm", "tab_model_unittest.mm", "tab_title_util_unittest.mm", - "tab_unittest.mm", ] deps = [ ":tabs", diff --git a/chromium/ios/chrome/browser/translate/BUILD.gn b/chromium/ios/chrome/browser/translate/BUILD.gn index 857141fdbe0..8439b23f03f 100644 --- a/chromium/ios/chrome/browser/translate/BUILD.gn +++ b/chromium/ios/chrome/browser/translate/BUILD.gn @@ -5,18 +5,12 @@ source_set("translate") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ - "after_translate_infobar_controller.h", - "after_translate_infobar_controller.mm", - "before_translate_infobar_controller.h", - "before_translate_infobar_controller.mm", "chrome_ios_translate_client.h", "chrome_ios_translate_client.mm", "language_selection_context.h", "language_selection_context.mm", "language_selection_delegate.h", "language_selection_handler.h", - "never_translate_infobar_controller.h", - "never_translate_infobar_controller.mm", "translate_accept_languages_factory.cc", "translate_accept_languages_factory.h", "translate_infobar_controller.h", @@ -24,8 +18,6 @@ source_set("translate") { "translate_infobar_delegate_observer_bridge.h", "translate_infobar_delegate_observer_bridge.mm", "translate_infobar_tags.h", - "translate_message_infobar_controller.h", - "translate_message_infobar_controller.mm", "translate_option_selection_delegate.h", "translate_option_selection_handler.h", "translate_ranker_factory.cc", @@ -131,32 +123,3 @@ source_set("eg_tests") { ] libs = [ "XCTest.framework" ] } - -source_set("external_url_eg_tests") { - configs += [ "//build/config/compiler:enable_arc" ] - testonly = true - sources = [ - "legacy_translate_infobar_egtest.mm", - ] - deps = [ - ":translate", - "//base", - "//base/test:test_support", - "//components/language/ios/browser", - "//components/strings", - "//components/translate/core/browser", - "//components/translate/core/common", - "//components/translate/ios/browser", - "//ios/chrome/browser/browser_state", - "//ios/chrome/browser/ui/translate:translate_ui", - "//ios/chrome/test/app:test_support", - "//ios/chrome/test/earl_grey:test_support", - "//ios/third_party/earl_grey:earl_grey+link", - "//ios/web:earl_grey_test_support", - "//ios/web/public/test", - "//ios/web/public/test/http_server", - "//net", - "//ui/base", - ] - libs = [ "XCTest.framework" ] -} diff --git a/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn b/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn index 305de56d324..eb650786fd1 100644 --- a/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn @@ -41,7 +41,6 @@ source_set("activity_services") { "//ios/chrome/browser/ui/activity_services/activities", "//ios/chrome/browser/ui/activity_services/requirements", "//ios/chrome/browser/ui/commands", - "//ios/chrome/browser/ui/context_menu", "//ios/chrome/browser/ui/util", "//ios/web", "//net", @@ -73,6 +72,7 @@ source_set("coordinator") { "//ios/chrome/browser/ui/activity_services/requirements", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", + "//ios/chrome/browser/web_state_list", "//url", ] } @@ -109,7 +109,6 @@ source_set("unit_tests") { "//ios/chrome/browser/ui/activity_services/activities", "//ios/chrome/browser/ui/activity_services/requirements", "//ios/chrome/browser/ui/commands", - "//ios/chrome/browser/ui/context_menu", "//ios/chrome/browser/ui/util", "//ios/testing:ocmock_support", "//ios/web", @@ -125,6 +124,7 @@ source_set("unit_tests") { source_set("eg_tests") { configs += [ "//build/config/compiler:enable_arc" ] + defines = [ "CHROME_EARL_GREY_1" ] testonly = true sources = [ "activity_service_controller_egtest.mm", @@ -136,6 +136,7 @@ source_set("eg_tests") { "//ios/chrome/browser/ui/util", "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", + "//ios/testing/earl_grey:earl_grey_support", "//ios/third_party/material_components_ios", "//ios/web:earl_grey_test_support", "//ios/web/public/test", @@ -144,3 +145,28 @@ source_set("eg_tests") { ] libs = [ "XCTest.framework" ] } + +source_set("eg2_tests") { + defines = [ "CHROME_EARL_GREY_2" ] + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + testonly = true + + sources = [ + "activity_service_controller_egtest.mm", + ] + + deps = [ + "//components/strings", + "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/test/earl_grey:eg_test_support+eg2", + "//ios/testing/earl_grey:eg_test_support+eg2", + "//ios/third_party/earl_grey2:test_lib", + "//ios/web/public/test/http_server", + "//ui/base", + ] + + libs = [ "UIKit.framework" ] +} diff --git a/chromium/ios/chrome/browser/ui/alert_view_controller/BUILD.gn b/chromium/ios/chrome/browser/ui/alert_view_controller/BUILD.gn index 257e5b7c29c..531ec3390e3 100644 --- a/chromium/ios/chrome/browser/ui/alert_view_controller/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/alert_view_controller/BUILD.gn @@ -15,6 +15,7 @@ source_set("alert_view_controller") { "//ios/chrome/browser/ui/elements", "//ios/chrome/browser/ui/presenters", "//ios/chrome/browser/ui/util", + "//ios/chrome/common/colors", "//ios/chrome/common/ui_util", ] libs = [ "UIKit.framework" ] diff --git a/chromium/ios/chrome/browser/ui/appearance/BUILD.gn b/chromium/ios/chrome/browser/ui/appearance/BUILD.gn new file mode 100644 index 00000000000..ed90b799b71 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/appearance/BUILD.gn @@ -0,0 +1,18 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/chrome_build.gni") + +source_set("appearance") { + sources = [ + "appearance_customization.h", + "appearance_customization.mm", + ] + deps = [ + "//ios/chrome/browser/ui/settings:settings_root", + "//ios/chrome/browser/ui/table_view", + "//ios/chrome/common/colors", + ] + configs += [ "//build/config/compiler:enable_arc" ] +} diff --git a/chromium/ios/chrome/browser/ui/authentication/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/BUILD.gn index c596be0ee30..27e9d8a994b 100644 --- a/chromium/ios/chrome/browser/ui/authentication/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/BUILD.gn @@ -38,8 +38,9 @@ source_set("authentication") { "//components/google/core/browser", "//components/infobars/core", "//components/prefs", - "//components/signin/core/browser", - "//components/signin/ios/browser", + "//components/signin/public/base", + "//components/signin/public/identity_manager", + "//components/signin/public/identity_manager/objc", "//components/strings", "//components/unified_consent", "//google_apis", @@ -61,12 +62,11 @@ source_set("authentication") { "//ios/chrome/browser/ui/util", "//ios/chrome/browser/unified_consent", "//ios/chrome/common", + "//ios/chrome/common/colors", "//ios/chrome/common/ui_util", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/images", "//ios/public/provider/chrome/browser/signin", - "//services/identity/public/cpp", - "//services/identity/public/objc", "//ui/base", "//ui/gfx", "//url", @@ -113,7 +113,8 @@ source_set("unit_tests") { "//components/consent_auditor", "//components/consent_auditor:test_support", "//components/pref_registry", - "//components/signin/core/browser:browser", + "//components/signin/public/base", + "//components/signin/public/identity_manager", "//components/sync_preferences", "//components/sync_preferences:test_support", "//components/unified_consent", @@ -138,7 +139,6 @@ source_set("unit_tests") { "//ios/chrome/test:test_support", "//ios/public/provider/chrome/browser/signin:test_support", "//ios/web/public/test", - "//services/identity/public/cpp", "//testing/gtest", "//third_party/ocmock", "//ui/base", @@ -146,6 +146,7 @@ source_set("unit_tests") { } source_set("eg_test_support") { + defines = [ "CHROME_EARL_GREY_1" ] configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ @@ -153,12 +154,13 @@ source_set("eg_test_support") { "signin_earl_grey_ui.mm", "signin_earlgrey_utils.h", "signin_earlgrey_utils.mm", + "signin_earlgrey_utils_app_interface.h", + "signin_earlgrey_utils_app_interface.mm", ] deps = [ ":authentication", "unified_consent", - "//components/signin/core/browser", - "//components/signin/core/browser:shared", + "//components/signin/public/identity_manager", "//components/unified_consent", "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser/browser_state", @@ -171,7 +173,7 @@ source_set("eg_test_support") { "//ios/chrome/test/earl_grey:test_support", "//ios/public/provider/chrome/browser/signin", "//ios/public/provider/chrome/browser/signin:test_support", + "//ios/testing/earl_grey:earl_grey_support", "//ios/third_party/earl_grey:earl_grey+link", - "//services/identity/public/cpp", ] } diff --git a/chromium/ios/chrome/browser/ui/authentication/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/cells/BUILD.gn index 72bf92166e5..b3a7f0d4de6 100644 --- a/chromium/ios/chrome/browser/ui/authentication/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/cells/BUILD.gn @@ -24,7 +24,6 @@ source_set("cells") { ] deps = [ "//base", - "//components/signin/core/browser", "//components/unified_consent", "//ios/chrome/app/strings", "//ios/chrome/browser", @@ -34,6 +33,7 @@ source_set("cells") { "//ios/chrome/browser/ui/settings/cells:public", "//ios/chrome/browser/ui/table_view:styler", "//ios/chrome/browser/ui/table_view/cells", + "//ios/chrome/common/colors", "//ios/chrome/common/ui_util", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/signin", @@ -58,7 +58,6 @@ source_set("unit_tests") { "//components/consent_auditor", "//components/consent_auditor:test_support", "//components/pref_registry", - "//components/signin/core/browser:browser", "//components/sync_preferences", "//components/sync_preferences:test_support", "//components/unified_consent", @@ -80,6 +79,7 @@ source_set("unit_tests") { "//ios/chrome/browser/ui/table_view:styler", "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/browser/unified_consent", + "//ios/chrome/common/colors", "//ios/chrome/test:test_support", "//ios/public/provider/chrome/browser/signin:test_support", "//ios/third_party/material_components_ios", diff --git a/chromium/ios/chrome/browser/ui/authentication/unified_consent/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/unified_consent/BUILD.gn index 028423b1eda..8b05a5c8fdb 100644 --- a/chromium/ios/chrome/browser/ui/authentication/unified_consent/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/unified_consent/BUILD.gn @@ -42,8 +42,8 @@ source_set("unified_consent_ui") { "//ios/chrome/browser/ui/authentication/unified_consent/identity_chooser:identity_chooser_ui", "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/util", - "//ios/chrome/browser/ui/util", "//ios/chrome/common", + "//ios/chrome/common/colors", "//ios/chrome/common/ui_util", "//ios/third_party/material_components_ios", "//ui/base", diff --git a/chromium/ios/chrome/browser/ui/authentication/unified_consent/identity_chooser/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/unified_consent/identity_chooser/BUILD.gn index 79b995481bd..14769fb42c1 100644 --- a/chromium/ios/chrome/browser/ui/authentication/unified_consent/identity_chooser/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/unified_consent/identity_chooser/BUILD.gn @@ -62,6 +62,7 @@ source_set("identity_chooser_ui") { "//ios/chrome/browser/ui/util", "//ios/chrome/browser/ui/util", "//ios/chrome/common", + "//ios/chrome/common/colors", "//ios/chrome/common/ui_util", "//ios/third_party/material_components_ios", "//ui/base", diff --git a/chromium/ios/chrome/browser/ui/autofill/BUILD.gn b/chromium/ios/chrome/browser/ui/autofill/BUILD.gn index 8c479d742bf..d54d0ac147f 100644 --- a/chromium/ios/chrome/browser/ui/autofill/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/autofill/BUILD.gn @@ -53,10 +53,12 @@ source_set("autofill") { "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web_state_list:web_state_list", + "//ios/chrome/browser/webdata_services", "//ios/chrome/common", "//ios/public/provider/chrome/browser", "//ios/third_party/material_components_ios", "//ios/third_party/material_roboto_font_loader_ios", + "//ios/web/common", "//ios/web/public/deprecated", "//ios/web/public/js_messaging", "//ui/base", diff --git a/chromium/ios/chrome/browser/ui/autofill/manual_fill/BUILD.gn b/chromium/ios/chrome/browser/ui/autofill/manual_fill/BUILD.gn index 3b7635608c2..b45c7150297 100644 --- a/chromium/ios/chrome/browser/ui/autofill/manual_fill/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/autofill/manual_fill/BUILD.gn @@ -52,10 +52,12 @@ source_set("manual_fill") { "//ios/chrome/browser/ui/autofill/manual_fill:manual_fill_ui", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/list_model:list_model", + "//ios/chrome/browser/ui/settings/autofill:feature_flags", "//ios/chrome/browser/ui/table_view:presentation", "//ios/chrome/browser/ui/table_view:table_view", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web_state_list:web_state_list", + "//ios/chrome/common/colors", "//ios/web/public", "//ios/web/public/deprecated", "//ios/web/public/js_messaging", @@ -104,8 +106,6 @@ source_set("manual_fill_ui") { "password_list_navigator.h", "password_view_controller.h", "password_view_controller.mm", - "uicolor_manualfill.h", - "uicolor_manualfill.mm", ] deps = [ "//base", @@ -119,7 +119,6 @@ source_set("manual_fill_ui") { "//ios/chrome/browser/favicon", "//ios/chrome/browser/ui/autofill/manual_fill/resources:mf_arrow_down", "//ios/chrome/browser/ui/autofill/manual_fill/resources:mf_arrow_up", - "//ios/chrome/browser/ui/autofill/manual_fill/resources:mf_gradient", "//ios/chrome/browser/ui/autofill/manual_fill/resources:mf_keyboard", "//ios/chrome/browser/ui/list_model:list_model", "//ios/chrome/browser/ui/table_view:styler", diff --git a/chromium/ios/chrome/browser/ui/autofill/manual_fill/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/autofill/manual_fill/resources/BUILD.gn index 5329a3fbba7..36655fe48b8 100644 --- a/chromium/ios/chrome/browser/ui/autofill/manual_fill/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/autofill/manual_fill/resources/BUILD.gn @@ -22,13 +22,6 @@ imageset("mf_arrow_up") { ] } -imageset("mf_gradient") { - sources = [ - "mf_gradient.imageset/Contents.json", - "mf_gradient.imageset/mf_gradient.png", - ] -} - imageset("mf_keyboard") { sources = [ "mf_keyboard.imageset/Contents.json", diff --git a/chromium/ios/chrome/browser/ui/badges/BUILD.gn b/chromium/ios/chrome/browser/ui/badges/BUILD.gn new file mode 100644 index 00000000000..0b0aa5f9342 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/badges/BUILD.gn @@ -0,0 +1,44 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +source_set("public") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "badge_item.h", + "badge_type.h", + ] +} + +source_set("badges") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "badge_button.h", + "badge_button.mm", + "badge_button_action_handler.h", + "badge_button_action_handler.mm", + "badge_button_factory.h", + "badge_button_factory.mm", + "badge_consumer.h", + "badge_mediator.h", + "badge_mediator.mm", + "badge_view_controller.h", + "badge_view_controller.mm", + ] + deps = [ + ":public", + "//base:base", + "//ios/chrome/browser/infobars:badge", + "//ios/chrome/browser/infobars:public", + "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/coordinators:chrome_coordinators", + "//ios/chrome/browser/ui/elements", + "//ios/chrome/browser/ui/fullscreen:ui", + "//ios/chrome/browser/ui/infobars:feature_flags", + "//ios/chrome/browser/ui/util", + "//ios/chrome/browser/web", + "//ios/chrome/browser/web_state_list", + "//ios/chrome/common/colors", + "//ios/chrome/common/ui_util", + ] +} diff --git a/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn index 69d1c2796c4..e99a849f8ee 100644 --- a/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn @@ -60,7 +60,8 @@ source_set("bookmarks") { "//components/pref_registry", "//components/prefs", "//components/query_parser", - "//components/signin/core/browser", + "//components/signin/public/identity_manager", + "//components/signin/public/identity_manager/objc", "//components/strings", "//components/undo", "//components/url_formatter", @@ -102,8 +103,6 @@ source_set("bookmarks") { "//ios/public/provider/chrome/browser/ui", "//ios/third_party/material_roboto_font_loader_ios", "//ios/web", - "//services/identity/public/cpp", - "//services/identity/public/objc", "//ui/base", "//ui/gfx", "//url", diff --git a/chromium/ios/chrome/browser/ui/browser_container/BUILD.gn b/chromium/ios/chrome/browser/ui/browser_container/BUILD.gn index 888fc878dbc..b939db9ed24 100644 --- a/chromium/ios/chrome/browser/ui/browser_container/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/browser_container/BUILD.gn @@ -13,7 +13,11 @@ source_set("browser_container") { deps = [ ":ui", "//base", + "//ios/chrome/browser/main", + "//ios/chrome/browser/overlays", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", + "//ios/chrome/browser/ui/fullscreen", + "//ios/chrome/browser/ui/overlays", ] } @@ -37,14 +41,27 @@ source_set("unit_tests") { testonly = true sources = [ + "browser_container_coordinator_unittest.mm", "browser_container_view_controller_unittest.mm", ] configs += [ "//build/config/compiler:enable_arc" ] deps = [ + ":browser_container", ":ui", "//base", + "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/main:test_support", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/web_content_area", + "//ios/chrome/browser/ui/fullscreen", + "//ios/chrome/browser/web_state_list", + "//ios/chrome/browser/web_state_list:test_support", + "//ios/chrome/common/ui_util", + "//ios/chrome/test:test_support", + "//ios/web/public/test", + "//ios/web/public/test/fakes", "//testing/gtest", ] } diff --git a/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn b/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn index 399ed2d2000..494627294f6 100644 --- a/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn @@ -43,7 +43,6 @@ source_set("browser_view") { "//ios/chrome/browser/autofill:autofill_internal", "//ios/chrome/browser/bookmarks", "//ios/chrome/browser/browser_state", - "//ios/chrome/browser/crash_report", "//ios/chrome/browser/download", "//ios/chrome/browser/download:features", "//ios/chrome/browser/feature_engagement", @@ -56,6 +55,9 @@ source_set("browser_view") { "//ios/chrome/browser/metrics:metrics_internal", "//ios/chrome/browser/net", "//ios/chrome/browser/ntp", + "//ios/chrome/browser/open_in", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/web_content_area", "//ios/chrome/browser/overscroll_actions", "//ios/chrome/browser/passwords", "//ios/chrome/browser/prefs", @@ -91,6 +93,7 @@ source_set("browser_view") { "//ios/chrome/browser/ui/context_menu", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/dialogs:dialogs_internal", + "//ios/chrome/browser/ui/dialogs:feature_flags", "//ios/chrome/browser/ui/download", "//ios/chrome/browser/ui/elements:elements_internal", "//ios/chrome/browser/ui/find_bar", @@ -113,6 +116,7 @@ source_set("browser_view") { "//ios/chrome/browser/ui/ntp:util", "//ios/chrome/browser/ui/omnibox:omnibox_internal", "//ios/chrome/browser/ui/omnibox/popup", + "//ios/chrome/browser/ui/open_in", "//ios/chrome/browser/ui/overscroll_actions", "//ios/chrome/browser/ui/page_info:coordinator", "//ios/chrome/browser/ui/page_info/requirements", @@ -125,6 +129,7 @@ source_set("browser_view") { "//ios/chrome/browser/ui/recent_tabs", "//ios/chrome/browser/ui/sad_tab", "//ios/chrome/browser/ui/sad_tab:coordinator", + "//ios/chrome/browser/ui/send_tab_to_self", "//ios/chrome/browser/ui/settings/sync/utils", "//ios/chrome/browser/ui/side_swipe", "//ios/chrome/browser/ui/signin_interaction/public", @@ -164,6 +169,7 @@ source_set("browser_view") { "//ios/web/common", "//ios/web/public", "//ios/web/public/deprecated", + "//ios/web/public/deprecated:deprecated_web_util", "//third_party/google_toolbox_for_mac", "//ui/base", "//ui/gfx", diff --git a/chromium/ios/chrome/browser/ui/commands/BUILD.gn b/chromium/ios/chrome/browser/ui/commands/BUILD.gn index 8eca2b67a51..c08a3b170cc 100644 --- a/chromium/ios/chrome/browser/ui/commands/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/commands/BUILD.gn @@ -4,6 +4,7 @@ source_set("commands") { configs += [ "//build/config/compiler:enable_arc" ] + sources = [ "activity_service_commands.h", "application_commands.h", @@ -30,16 +31,19 @@ source_set("commands") { "snackbar_commands.h", "toolbar_commands.h", ] + deps = [ - "//base", - "//components/browsing_data/core", - "//components/signin/core/browser", - "//ios/chrome/browser/browsing_data:browsing_data_remove_mask", - "//ios/chrome/browser/ui/metrics", "//ios/web", "//net", "//url", ] + + public_deps = [ + "//base", + "//components/browsing_data/core", + "//components/signin/public/base", + "//ios/chrome/browser/browsing_data:browsing_data_remove_mask", + ] } source_set("unit_tests") { @@ -51,7 +55,6 @@ source_set("unit_tests") { deps = [ ":commands", "//base", - "//ios/chrome/browser/ui/metrics", "//testing/gtest", ] } diff --git a/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn b/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn index 18359944276..c7b76ab95c5 100644 --- a/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn @@ -34,6 +34,8 @@ source_set("content_suggestions") { "//components/ntp_tiles", "//components/reading_list/core", "//components/reading_list/ios:ios", + "//components/signin/public/identity_manager", + "//components/signin/public/identity_manager/objc", "//components/strings", "//ios/chrome/app/strings", "//ios/chrome/browser", @@ -48,6 +50,7 @@ source_set("content_suggestions") { "//ios/chrome/browser/signin", "//ios/chrome/browser/signin:feature_flags", "//ios/chrome/browser/tabs", + "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/collection_view/cells", "//ios/chrome/browser/ui/commands", @@ -77,7 +80,6 @@ source_set("content_suggestions") { "//ios/public/provider/chrome/browser/signin", "//ios/public/provider/chrome/browser/ui", "//ios/public/provider/chrome/browser/voice", - "//services/identity/public/objc", "//ui/base", "//ui/strings", ] @@ -119,6 +121,7 @@ source_set("content_suggestions_ui") { "//base", "//components/strings", "//ios/chrome/browser/signin:feature_flags", + "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/collection_view", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/content_suggestions/cells:cells_ui", @@ -131,7 +134,9 @@ source_set("content_suggestions_ui") { "//ios/chrome/browser/ui/overscroll_actions", "//ios/chrome/browser/ui/toolbar/buttons", "//ios/chrome/browser/ui/toolbar/public", + "//ios/chrome/browser/ui/toolbar/resources:tab_toolbar_shadow_color", "//ios/chrome/browser/ui/util:util", + "//ios/chrome/common/colors", "//ios/chrome/common/favicon", "//ios/chrome/common/ui_util", "//ios/web/common", @@ -148,10 +153,10 @@ source_set("content_suggestions_constant") { "ntp_home_constant.h", "ntp_home_constant.mm", ] - configs += [ "//build/config/compiler:enable_arc" ] deps = [ - "//ios/chrome/browser/ui/util", + "//ios/chrome/common/colors", ] + configs += [ "//build/config/compiler:enable_arc" ] } source_set("content_suggestions_ui_util") { @@ -165,6 +170,7 @@ source_set("content_suggestions_ui_util") { "//base:i18n", "//components/strings", "//ios/chrome/app/strings", + "//ios/chrome/browser/signin:feature_flags", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/content_suggestions/cells:cells_ui", "//ios/chrome/browser/ui/location_bar:constants", @@ -172,6 +178,7 @@ source_set("content_suggestions_ui_util") { "//ios/chrome/browser/ui/ntp_tile_views:constants", "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/util", + "//ios/chrome/common/colors", "//ios/third_party/material_components_ios", "//ios/web/common", "//ui/base", @@ -194,6 +201,7 @@ source_set("unit_tests") { ":content_suggestions_ui_util", "//base", "//components/ntp_snippets", + "//components/signin/public/identity_manager", "//ios/chrome/browser", "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/ntp_snippets", @@ -217,7 +225,6 @@ source_set("unit_tests") { "//ios/public/provider/chrome/browser/ui", "//ios/web/public/test", "//ios/web/public/test/fakes", - "//services/identity/public/objc", "//testing/gtest", "//testing/gtest", "//third_party/ocmock", @@ -257,7 +264,6 @@ source_set("eg_tests") { "//ios/chrome/browser/ui/content_suggestions/cells:cells_ui", "//ios/chrome/browser/ui/location_bar:location_bar", "//ios/chrome/browser/ui/settings", - "//ios/chrome/browser/ui/tab_grid:egtest_support", "//ios/chrome/browser/ui/toolbar/buttons", "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/util", diff --git a/chromium/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn index 7b4f0ed4906..32204cd72fe 100644 --- a/chromium/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn @@ -54,6 +54,7 @@ source_set("cells_ui") { deps = [ "//base", "//ios/chrome/app/strings", + "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/collection_view", "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/content_suggestions/identifier", @@ -62,6 +63,7 @@ source_set("cells_ui") { "//ios/chrome/browser/ui/ntp_tile_views:constants", "//ios/chrome/browser/ui/util", "//ios/chrome/common", + "//ios/chrome/common/colors", "//ios/chrome/common/favicon", "//ios/chrome/common/ui_util", "//ui/base", diff --git a/chromium/ios/chrome/browser/ui/context_menu/BUILD.gn b/chromium/ios/chrome/browser/ui/context_menu/BUILD.gn index 5f8d2b5d857..3950903f8a5 100644 --- a/chromium/ios/chrome/browser/ui/context_menu/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/context_menu/BUILD.gn @@ -7,8 +7,6 @@ source_set("context_menu") { sources = [ "context_menu_coordinator.h", "context_menu_coordinator.mm", - "context_menu_item.h", - "context_menu_item.mm", ] deps = [ "//base", diff --git a/chromium/ios/chrome/browser/ui/dialogs/BUILD.gn b/chromium/ios/chrome/browser/ui/dialogs/BUILD.gn index 60589a8dfc8..1ae4f03ca40 100644 --- a/chromium/ios/chrome/browser/ui/dialogs/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/dialogs/BUILD.gn @@ -56,6 +56,8 @@ source_set("dialogs_internal") { "java_script_dialog_presenter_impl.mm", "nsurl_protection_space_util.h", "nsurl_protection_space_util.mm", + "overlay_java_script_dialog_presenter.h", + "overlay_java_script_dialog_presenter.mm", ] deps = [ ":completion_block_util", @@ -64,6 +66,8 @@ source_set("dialogs_internal") { "//components/strings", "//components/url_formatter", "//ios/chrome/app/strings", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/web_content_area", "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/dialogs/non_modal", @@ -94,6 +98,7 @@ source_set("unit_tests_internal") { "dialog_presenter_unittest.mm", "java_script_dialog_presenter_impl_unittest.mm", "nsurl_protection_space_util_unittest.mm", + "overlay_java_script_dialog_presenter_unittest.mm", ] deps = [ ":completion_block_util", @@ -101,6 +106,8 @@ source_set("unit_tests_internal") { "//base", "//components/strings", "//ios/chrome/app/strings", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/web_content_area", "//ios/chrome/browser/ui/alert_coordinator", "//ios/web", "//ios/web/public/test/fakes", diff --git a/chromium/ios/chrome/browser/ui/fancy_ui/BUILD.gn b/chromium/ios/chrome/browser/ui/fancy_ui/BUILD.gn index bd2c82ad52a..fe8377f0844 100644 --- a/chromium/ios/chrome/browser/ui/fancy_ui/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/fancy_ui/BUILD.gn @@ -14,6 +14,7 @@ source_set("fancy_ui") { "//base", "//base:i18n", "//ios/chrome/browser/ui/colors", + "//ios/chrome/common/colors", ] public_deps = [ "//ios/third_party/material_components_ios", diff --git a/chromium/ios/chrome/browser/ui/favicon/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/favicon/resources/BUILD.gn index aa6b381236b..3d7c12a8252 100644 --- a/chromium/ios/chrome/browser/ui/favicon/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/favicon/resources/BUILD.gn @@ -39,12 +39,3 @@ imageset("default_favicon") { "default_favicon.imageset/default_favicon@3x.png", ] } - -imageset("default_favicon_incognito") { - sources = [ - "default_favicon_incognito.imageset/Contents.json", - "default_favicon_incognito.imageset/default_favicon_incognito.png", - "default_favicon_incognito.imageset/default_favicon_incognito@2x.png", - "default_favicon_incognito.imageset/default_favicon_incognito@3x.png", - ] -} diff --git a/chromium/ios/chrome/browser/ui/first_run/BUILD.gn b/chromium/ios/chrome/browser/ui/first_run/BUILD.gn index e91f47ed033..ea2f17eac1f 100644 --- a/chromium/ios/chrome/browser/ui/first_run/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/first_run/BUILD.gn @@ -26,7 +26,7 @@ source_set("first_run") { "//base:i18n", "//components/metrics", "//components/prefs", - "//components/signin/core/browser", + "//components/signin/public/identity_manager", "//components/unified_consent", "//ios/chrome/app/strings", "//ios/chrome/browser", @@ -46,13 +46,14 @@ source_set("first_run") { "//ios/chrome/browser/ui/settings/utils", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/ui/util:terms_util", + "//ios/chrome/browser/web_state_list", "//ios/chrome/common", + "//ios/chrome/common/colors", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/signin", "//ios/third_party/material_components_ios", "//ios/third_party/material_roboto_font_loader_ios", - "//ios/web", - "//services/identity/public/cpp:cpp", + "//ios/web/common:web_view_creation_util", "//ui/base", "//ui/gfx", "//url", diff --git a/chromium/ios/chrome/browser/ui/infobars/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/BUILD.gn index 18d799c7189..225fd41b2bb 100644 --- a/chromium/ios/chrome/browser/ui/infobars/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/infobars/BUILD.gn @@ -149,6 +149,7 @@ source_set("eg_tests") { "//ios/chrome/app:app_internal", "//ios/chrome/browser/infobars", "//ios/chrome/browser/tabs", + "//ios/chrome/browser/web_state_list", "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", "//ios/third_party/earl_grey:earl_grey+link", diff --git a/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn b/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn index 3cc4c329bed..2fd031e1b28 100644 --- a/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn @@ -44,6 +44,8 @@ source_set("location_bar") { "//ios/chrome/browser/search_engines", "//ios/chrome/browser/ssl", "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/browser/ui/badges", + "//ios/chrome/browser/ui/badges:public", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/elements", "//ios/chrome/browser/ui/fullscreen", @@ -58,6 +60,8 @@ source_set("location_bar") { "//ios/chrome/browser/ui/omnibox/popup", "//ios/chrome/browser/ui/orchestrator:orchestrator", "//ios/chrome/browser/ui/toolbar/buttons", + "//ios/chrome/browser/ui/toolbar/buttons/resources:tab_toolbar_button_color", + "//ios/chrome/browser/ui/toolbar/buttons/resources:tab_toolbar_button_color_incognito", "//ios/chrome/browser/ui/toolbar/keyboard_assist:keyboard_assist", "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/toolbar/public:feature_flags", @@ -67,6 +71,7 @@ source_set("location_bar") { "//ios/chrome/browser/web", "//ios/chrome/browser/web_state_list", "//ios/chrome/common:timing", + "//ios/chrome/common/colors", "//ios/chrome/common/ui_util", "//ios/public/provider/chrome/browser:browser", "//ios/public/provider/chrome/browser/voice", diff --git a/chromium/ios/chrome/browser/ui/material_components/BUILD.gn b/chromium/ios/chrome/browser/ui/material_components/BUILD.gn index 1c2163bdc29..39579086c9c 100644 --- a/chromium/ios/chrome/browser/ui/material_components/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/material_components/BUILD.gn @@ -16,6 +16,7 @@ source_set("material_components") { deps = [ "//base", "//ios/chrome/browser/ui/colors", + "//ios/chrome/common/colors", "//ios/third_party/material_components_ios", ] libs = [ "UIKit.framework" ] diff --git a/chromium/ios/chrome/browser/ui/metrics/BUILD.gn b/chromium/ios/chrome/browser/ui/metrics/BUILD.gn deleted file mode 100644 index 2e1cdbc5474..00000000000 --- a/chromium/ios/chrome/browser/ui/metrics/BUILD.gn +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 2017 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -source_set("metrics") { - sources = [ - "metrics_recorder.h", - ] - configs += [ "//build/config/compiler:enable_arc" ] -} - -source_set("test_support") { - testonly = true - sources = [ - "metrics_test_util.h", - "metrics_test_util.mm", - ] - deps = [ - "//base", - ] - configs += [ "//build/config/compiler:enable_arc" ] -} diff --git a/chromium/ios/chrome/browser/ui/ntp_tile_views/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp_tile_views/BUILD.gn index 228fd5e2ba1..70af4d1d4c8 100644 --- a/chromium/ios/chrome/browser/ui/ntp_tile_views/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/ntp_tile_views/BUILD.gn @@ -23,6 +23,7 @@ source_set("ntp_tile_views") { "resources:ntp_recent_icon", "//base", "//ios/chrome/browser/ui/util", + "//ios/chrome/common/colors", "//ios/chrome/common/favicon", "//ios/chrome/common/ui_util", "//ios/third_party/material_components_ios", diff --git a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn index c298336a903..40f19bde58d 100644 --- a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn @@ -54,6 +54,7 @@ source_set("omnibox_suggestion_icon_util") { "resources:omnibox_completion_default_favicon", "resources:omnibox_completion_history", "resources:omnibox_completion_search", + "resources:omnibox_popup_recent_query", "resources:search", "//base", ] diff --git a/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn index 2d60b347344..4e1e259d8bc 100644 --- a/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn @@ -46,6 +46,14 @@ source_set("popup") { configs += [ "//build/config/compiler:enable_arc" ] } +source_set("popup_accessibility_identifier_constants") { + sources = [ + "omnibox_popup_accessibility_identifier_constants.h", + "omnibox_popup_accessibility_identifier_constants.mm", + ] + configs += [ "//build/config/compiler:enable_arc" ] +} + source_set("popup_ui") { sources = [ "autocomplete_result_consumer.h", @@ -74,6 +82,7 @@ source_set("popup_ui") { "simple_omnibox_icon.mm", ] deps = [ + ":popup_accessibility_identifier_constants", "resources:omnibox_popup_tab_match", "//base", "//components/omnibox/common", @@ -123,6 +132,7 @@ source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ + "omnibox_popup_row_cell_unittest.mm", "omnibox_popup_view_controller_unittest.mm", ] deps = [ @@ -144,6 +154,7 @@ source_set("eg_tests") { "omnibox_popup_egtest.mm", ] deps = [ + ":popup_accessibility_identifier_constants", ":popup_internal", ":popup_ui", "//base", @@ -151,7 +162,6 @@ source_set("eg_tests") { "//components/omnibox/browser", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant", - "//ios/chrome/browser/ui/tab_grid:egtest_support", "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", "//ios/testing/earl_grey:earl_grey_support", @@ -160,4 +170,27 @@ source_set("eg_tests") { ] libs = [ "XCTest.framework" ] configs += [ "//build/config/compiler:enable_arc" ] + defines = [ "CHROME_EARL_GREY_1" ] +} + +source_set("eg2_tests") { + defines = [ "CHROME_EARL_GREY_2" ] + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + testonly = true + sources = [ + "omnibox_popup_egtest.mm", + ] + deps = [ + ":popup_accessibility_identifier_constants", + "//base", + "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant", + "//ios/chrome/test/earl_grey:eg_test_support+eg2", + "//ios/testing/earl_grey:eg_test_support+eg2", + "//ios/third_party/earl_grey2:test_lib", + "//net:test_support", + ] + libs = [ "UIKit.framework" ] } diff --git a/chromium/ios/chrome/browser/ui/omnibox/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/resources/BUILD.gn index 43c652a6ad9..2301d851eec 100644 --- a/chromium/ios/chrome/browser/ui/omnibox/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/omnibox/resources/BUILD.gn @@ -170,3 +170,11 @@ imageset("background_stroke") { "background_stroke.imageset/background_stroke@3x.png", ] } + +imageset("omnibox_popup_recent_query") { + sources = [ + "omnibox_popup_recent_query.imageset/Contents.json", + "omnibox_popup_recent_query.imageset/omnibox_popup_recent_query@2x.png", + "omnibox_popup_recent_query.imageset/omnibox_popup_recent_query@3x.png", + ] +} diff --git a/chromium/ios/chrome/browser/ui/open_in/BUILD.gn b/chromium/ios/chrome/browser/ui/open_in/BUILD.gn index 5267ee9cf76..4118e0d0440 100644 --- a/chromium/ios/chrome/browser/ui/open_in/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/open_in/BUILD.gn @@ -8,6 +8,8 @@ source_set("open_in") { "open_in_controller.h", "open_in_controller.mm", "open_in_controller_testing.h", + "open_in_mediator.h", + "open_in_mediator.mm", "open_in_toolbar.h", "open_in_toolbar.mm", ] @@ -15,9 +17,12 @@ source_set("open_in") { "//base", "//components/strings", "//ios/chrome/app/strings", + "//ios/chrome/browser/open_in", "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/colors", + "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/util", + "//ios/chrome/browser/web_state_list", "//ios/chrome/common/ui_util", "//ios/chrome/common/ui_util", "//ios/third_party/material_components_ios", @@ -35,10 +40,14 @@ source_set("unit_tests") { testonly = true sources = [ "open_in_controller_unittest.mm", + "open_in_mediator_unittest.mm", "open_in_toolbar_unittest.mm", ] deps = [ ":open_in", + "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/web_state_list", + "//ios/chrome/browser/web_state_list:test_support", "//ios/web/public/test", "//ios/web/public/test/fakes", "//net", @@ -49,3 +58,27 @@ source_set("unit_tests") { "//third_party/ocmock", ] } + +source_set("eg2_tests") { + defines = [ "CHROME_EARL_GREY_2" ] + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + testonly = true + + sources = [ + "open_in_controller_egtest.mm", + ] + deps = [ + "//base", + "//ios/chrome/app/strings", + "//ios/chrome/test/earl_grey:eg_test_support+eg2", + "//ios/testing/earl_grey:eg_test_support+eg2", + "//ios/third_party/earl_grey2:test_lib", + "//net:test_support", + "//ui/base", + ] + + libs = [ "UIKit.framework" ] +} diff --git a/chromium/ios/chrome/browser/ui/overlays/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/BUILD.gn index f158aa40792..c729e8852be 100644 --- a/chromium/ios/chrome/browser/ui/overlays/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/overlays/BUILD.gn @@ -11,15 +11,18 @@ source_set("overlays") { "overlay_container_coordinator.mm", "overlay_coordinator_factory+initialization.h", "overlay_coordinator_factory.mm", - "overlay_presenter_ui_delegate_impl.h", - "overlay_presenter_ui_delegate_impl.mm", + "overlay_presentation_context_impl.h", + "overlay_presentation_context_impl.mm", "overlay_request_ui_state.h", "overlay_request_ui_state.mm", ] configs += [ "//build/config/compiler:enable_arc" ] - friend = [ ":unit_tests" ] + friend = [ + ":unit_tests", + "//ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/test", + ] deps = [ ":container_ui", diff --git a/chromium/ios/chrome/browser/ui/overlays/web_content_area/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/web_content_area/BUILD.gn index 937a52166d6..8f1371dd9d0 100644 --- a/chromium/ios/chrome/browser/ui/overlays/web_content_area/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/overlays/web_content_area/BUILD.gn @@ -15,5 +15,9 @@ source_set("web_content_area") { deps = [ "//base", "//ios/chrome/browser/ui/overlays:coordinators", + "//ios/chrome/browser/ui/overlays/web_content_area/http_auth_dialogs", + "//ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs:alerts", + "//ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs:confirmations", + "//ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs:prompts", ] } diff --git a/chromium/ios/chrome/browser/ui/overlays/web_content_area/http_auth_dialogs/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/web_content_area/http_auth_dialogs/BUILD.gn new file mode 100644 index 00000000000..89b23456e5e --- /dev/null +++ b/chromium/ios/chrome/browser/ui/overlays/web_content_area/http_auth_dialogs/BUILD.gn @@ -0,0 +1,59 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +source_set("http_auth_dialogs") { + sources = [ + "http_auth_dialog_overlay_coordinator.h", + "http_auth_dialog_overlay_coordinator.mm", + "http_auth_dialog_overlay_mediator.h", + "http_auth_dialog_overlay_mediator.mm", + ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + "//base", + "//components/strings:components_strings_grit", + "//components/url_formatter", + "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/web_content_area", + "//ios/chrome/browser/ui/alert_view_controller", + "//ios/chrome/browser/ui/elements", + "//ios/chrome/browser/ui/overlays:coordinators", + "//ui/base", + ] +} + +source_set("unit_tests") { + testonly = true + sources = [ + "http_auth_dialog_overlay_mediator_unittest.mm", + ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + ":http_auth_dialogs", + "//base/test:test_support", + "//components/strings:components_strings_grit", + "//components/url_formatter", + "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/web_content_area", + "//ios/chrome/browser/overlays/test", + "//ios/chrome/browser/ui/alert_view_controller", + "//ios/chrome/browser/ui/alert_view_controller/test", + "//ios/chrome/browser/ui/dialogs", + "//ios/chrome/browser/ui/elements", + "//ios/chrome/browser/ui/overlays/test", + "//ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/test", + "//ios/web/public", + "//ios/web/public/test", + "//ios/web/public/test/fakes", + "//testing/gmock", + "//testing/gtest", + "//ui/base", + ] +} diff --git a/chromium/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/BUILD.gn new file mode 100644 index 00000000000..0cd1acc8dc8 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/BUILD.gn @@ -0,0 +1,144 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +source_set("common") { + sources = [ + "java_script_dialog_blocking_action.h", + "java_script_dialog_blocking_action.mm", + "java_script_dialog_overlay_coordinator+subclassing.h", + "java_script_dialog_overlay_coordinator.h", + "java_script_dialog_overlay_coordinator.mm", + "java_script_dialog_overlay_mediator.h", + "java_script_dialog_overlay_mediator.mm", + ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + "//base", + "//components/strings:components_strings_grit", + "//components/url_formatter", + "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/web_content_area", + "//ios/chrome/browser/ui/alert_view_controller", + "//ios/chrome/browser/ui/dialogs", + "//ios/chrome/browser/ui/elements", + "//ios/chrome/browser/ui/overlays:coordinators", + "//ui/base", + ] +} + +source_set("alerts") { + sources = [ + "java_script_alert_overlay_coordinator.h", + "java_script_alert_overlay_coordinator.mm", + "java_script_alert_overlay_mediator.h", + "java_script_alert_overlay_mediator.mm", + ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + ":common", + "//base", + "//components/strings:components_strings_grit", + "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/web_content_area", + "//ios/chrome/browser/ui/alert_view_controller", + "//ios/chrome/browser/ui/elements", + "//ios/chrome/browser/ui/overlays:coordinators", + "//ui/base", + ] +} + +source_set("confirmations") { + sources = [ + "java_script_confirmation_overlay_coordinator.h", + "java_script_confirmation_overlay_coordinator.mm", + "java_script_confirmation_overlay_mediator.h", + "java_script_confirmation_overlay_mediator.mm", + ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + ":common", + "//base", + "//components/strings:components_strings_grit", + "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/web_content_area", + "//ios/chrome/browser/ui/alert_view_controller", + "//ios/chrome/browser/ui/elements", + "//ios/chrome/browser/ui/overlays:coordinators", + "//ui/base", + ] +} + +source_set("prompts") { + sources = [ + "java_script_prompt_overlay_coordinator.h", + "java_script_prompt_overlay_coordinator.mm", + "java_script_prompt_overlay_mediator.h", + "java_script_prompt_overlay_mediator.mm", + ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + ":common", + "//base", + "//components/strings:components_strings_grit", + "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/web_content_area", + "//ios/chrome/browser/ui/alert_view_controller", + "//ios/chrome/browser/ui/elements", + "//ios/chrome/browser/ui/overlays:coordinators", + "//ui/base", + ] +} + +source_set("unit_tests") { + testonly = true + sources = [ + "java_script_alert_overlay_coordinator_unittest.mm", + "java_script_alert_overlay_mediator_unittest.mm", + "java_script_confirmation_overlay_coordinator_unittest.mm", + "java_script_confirmation_overlay_mediator_unittest.mm", + "java_script_dialog_overlay_mediator_unittest.mm", + "java_script_prompt_overlay_coordinator_unittest.mm", + "java_script_prompt_overlay_mediator_unittest.mm", + ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + ":alerts", + ":common", + ":confirmations", + ":prompts", + "//base/test:test_support", + "//components/strings:components_strings_grit", + "//components/url_formatter", + "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/web_content_area", + "//ios/chrome/browser/overlays/test", + "//ios/chrome/browser/ui/alert_view_controller", + "//ios/chrome/browser/ui/alert_view_controller/test", + "//ios/chrome/browser/ui/dialogs", + "//ios/chrome/browser/ui/elements", + "//ios/chrome/browser/ui/overlays/test", + "//ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/test", + "//ios/web/public", + "//ios/web/public/test", + "//ios/web/public/test/fakes", + "//testing/gmock", + "//testing/gtest", + "//ui/base", + ] +} diff --git a/chromium/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/test/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/test/BUILD.gn new file mode 100644 index 00000000000..7bd4f4243dd --- /dev/null +++ b/chromium/ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/test/BUILD.gn @@ -0,0 +1,40 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +source_set("test") { + testonly = true + sources = [ + "java_script_dialog_overlay_coordinator_test.h", + "java_script_dialog_overlay_coordinator_test.mm", + "java_script_dialog_overlay_mediator_test.h", + "java_script_dialog_overlay_mediator_test.mm", + ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + "//base/test:test_support", + "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/main:test_support", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/web_content_area", + "//ios/chrome/browser/ui/alert_view_controller", + "//ios/chrome/browser/ui/alert_view_controller/test", + "//ios/chrome/browser/ui/overlays", + "//ios/chrome/browser/ui/overlays:coordinators", + "//ios/chrome/browser/ui/overlays/test", + "//ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs:alerts", + "//ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs:common", + "//ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs:confirmations", + "//ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs:prompts", + "//ios/chrome/browser/web_state_list", + "//ios/chrome/browser/web_state_list:test_support", + "//ios/chrome/test:test_support", + "//ios/web/public", + "//ios/web/public/test", + "//ios/web/public/test/fakes", + "//testing/gmock", + "//testing/gtest", + ] +} diff --git a/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn b/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn index f2fa8c19405..8b1ea856af9 100644 --- a/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn @@ -34,6 +34,7 @@ source_set("overscroll_actions") { "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/ui/voice", + "//ios/chrome/common/colors", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/ui", "//ios/web/common", diff --git a/chromium/ios/chrome/browser/ui/page_info/BUILD.gn b/chromium/ios/chrome/browser/ui/page_info/BUILD.gn index a86df900580..c7548ae1f7e 100644 --- a/chromium/ios/chrome/browser/ui/page_info/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/page_info/BUILD.gn @@ -29,6 +29,7 @@ source_set("page_info") { "//ios/chrome/browser/ui/popup_menu", "//ios/chrome/browser/ui/util", "//ios/chrome/common", + "//ios/chrome/common/colors", "//ios/web", "//ios/web/public/security", "//ui/base", diff --git a/chromium/ios/chrome/browser/ui/payments/BUILD.gn b/chromium/ios/chrome/browser/ui/payments/BUILD.gn index e4cf8e750fd..8718dbc5c18 100644 --- a/chromium/ios/chrome/browser/ui/payments/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/payments/BUILD.gn @@ -68,7 +68,7 @@ source_set("payments") { "//components/omnibox/browser", "//components/payments/core", "//components/payments/mojom", - "//components/signin/core/browser", + "//components/prefs", "//components/strings", "//components/url_formatter", "//ios/chrome/app/strings", @@ -223,8 +223,10 @@ source_set("unit_tests") { "//components/payments/core:test_support", "//components/payments/mojom", "//components/prefs:prefs", - "//components/signin/core/browser", + "//components/signin/public/identity_manager", + "//components/signin/public/identity_manager:test_support", "//components/strings", + "//components/sync/driver:test_support", "//ios/chrome/app/strings", "//ios/chrome/browser", "//ios/chrome/browser/autofill:autofill_internal", @@ -232,6 +234,9 @@ source_set("unit_tests") { "//ios/chrome/browser/payments", "//ios/chrome/browser/payments:test_support", "//ios/chrome/browser/signin", + "//ios/chrome/browser/signin:test_support", + "//ios/chrome/browser/sync", + "//ios/chrome/browser/sync:test_support", "//ios/chrome/browser/ui/autofill", "//ios/chrome/browser/ui/autofill:autofill_ui", "//ios/chrome/browser/ui/autofill:bridges", @@ -242,14 +247,13 @@ source_set("unit_tests") { "//ios/chrome/browser/ui/payments/cells", "//ios/chrome/browser/web:test_support", "//ios/chrome/test:test_support", + "//ios/public/provider/chrome/browser/signin:test_support", "//ios/testing:ocmock_support", "//ios/third_party/material_components_ios", "//ios/web", "//ios/web/public/deprecated:test_doubles", "//ios/web/public/js_messaging", "//ios/web/public/test", - "//services/identity/public/cpp:cpp", - "//services/identity/public/cpp:test_support", "//testing/gmock", "//testing/gtest", "//third_party/libaddressinput:strings_grit", diff --git a/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn index eddff42c88c..17a0156d94e 100644 --- a/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn @@ -33,6 +33,7 @@ source_set("popup_menu") { "resources:popup_menu_report_an_issue", "resources:popup_menu_request_desktop_site", "resources:popup_menu_request_mobile_site", + "resources:popup_menu_search", "resources:popup_menu_settings", "resources:popup_menu_site_information", "resources:popup_menu_stop", @@ -66,6 +67,7 @@ source_set("popup_menu") { "//ios/chrome/browser/ui/popup_menu/public/cells", "//ios/chrome/browser/ui/presenters", "//ios/chrome/browser/ui/reading_list", + "//ios/chrome/browser/ui/toolbar/public:feature_flags", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web_state_list", "//ios/public/provider/chrome/browser", @@ -98,6 +100,7 @@ source_set("unit_tests") { "//components/feature_engagement/test:test_support", "//components/language/ios/browser", "//components/reading_list/core", + "//components/translate/core/browser", "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/ui/popup_menu/cells", "//ios/chrome/browser/ui/popup_menu/public:popup_menu_ui", diff --git a/chromium/ios/chrome/browser/ui/popup_menu/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/resources/BUILD.gn index d4be342cad8..963e3200b44 100644 --- a/chromium/ios/chrome/browser/ui/popup_menu/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/popup_menu/resources/BUILD.gn @@ -4,6 +4,14 @@ import("//build/config/ios/asset_catalog.gni") +imageset("popup_menu_search") { + sources = [ + "popup_menu_search.imageset/Contents.json", + "popup_menu_search.imageset/popup_menu_search@2x.png", + "popup_menu_search.imageset/popup_menu_search@3x.png", + ] +} + imageset("popup_menu_paste_and_go") { sources = [ "popup_menu_paste_and_go.imageset/Contents.json", diff --git a/chromium/ios/chrome/browser/ui/promos/BUILD.gn b/chromium/ios/chrome/browser/ui/promos/BUILD.gn index b6ea1578fa2..b88404a69d5 100644 --- a/chromium/ios/chrome/browser/ui/promos/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/promos/BUILD.gn @@ -11,7 +11,7 @@ source_set("promos") { ] deps = [ "//base", - "//components/signin/core/browser", + "//components/signin/public/base", "//components/unified_consent", "//components/version_info", "//ios/chrome/app:tests_hook", diff --git a/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn b/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn index aa5c206a2a8..c0ecfa9a754 100644 --- a/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn @@ -19,6 +19,7 @@ source_set("recent_tabs") { "resources:show_history", "//base", "//components/sessions", + "//components/signin/public/identity_manager", "//components/sync", "//ios/chrome/app/strings", "//ios/chrome/browser/browser_state", @@ -32,7 +33,6 @@ source_set("recent_tabs") { "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/url_loading", - "//services/identity/public/cpp", "//ui/base", ] public_deps = [ @@ -40,11 +40,17 @@ source_set("recent_tabs") { ] } -source_set("recent_tabs_ui") { +source_set("recent_tabs_ui_constants") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ "recent_tabs_constants.h", "recent_tabs_constants.mm", + ] +} + +source_set("recent_tabs_ui") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ "recent_tabs_consumer.h", "recent_tabs_presentation_delegate.h", "recent_tabs_table_view_controller.h", @@ -57,6 +63,7 @@ source_set("recent_tabs_ui") { "synced_sessions.mm", ] deps = [ + ":recent_tabs_ui_constants", "//base", "//components/sessions", "//components/strings", @@ -76,10 +83,12 @@ source_set("recent_tabs_ui") { "//ios/chrome/browser/ui/signin_interaction/public", "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/table_view:presentation", + "//ios/chrome/browser/ui/table_view:styler", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/url_loading", "//ios/chrome/browser/web_state_list", "//ios/chrome/browser/web_state_list", + "//ios/chrome/common/colors", "//ios/chrome/common/favicon", "//ui/base", ] @@ -99,6 +108,8 @@ source_set("unit_tests") { ":recent_tabs_ui", "//base", "//components/browser_sync", + "//components/signin/public/identity_manager", + "//components/signin/public/identity_manager:test_support", "//components/sync:test_support_model", "//components/sync_sessions", "//components/sync_user_events", @@ -109,8 +120,6 @@ source_set("unit_tests") { "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/test:test_support", "//ios/web/public/test", - "//services/identity/public/cpp", - "//services/identity/public/cpp:test_support", "//testing/gtest", "//third_party/ocmock", ] @@ -124,6 +133,7 @@ source_set("eg_tests") { ] deps = [ ":recent_tabs_ui", + ":recent_tabs_ui_constants", "//base/test:test_support", "//components/strings", "//ios/chrome/app:app_internal", diff --git a/chromium/ios/chrome/browser/ui/send_tab_to_self/BUILD.gn b/chromium/ios/chrome/browser/ui/send_tab_to_self/BUILD.gn new file mode 100644 index 00000000000..2742829fcfd --- /dev/null +++ b/chromium/ios/chrome/browser/ui/send_tab_to_self/BUILD.gn @@ -0,0 +1,50 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +source_set("send_tab_to_self") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "send_tab_to_self_coordinator.h", + "send_tab_to_self_coordinator.mm", + ] + deps = [ + ":send_tab_to_self_ui", + "//base", + "//components/send_tab_to_self", + "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/main", + "//ios/chrome/browser/sync", + "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/coordinators:chrome_coordinators", + "//ios/chrome/browser/ui/infobars/presentation", + ] +} +source_set("send_tab_to_self_ui") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "send_tab_to_self_image_detail_text_item.h", + "send_tab_to_self_image_detail_text_item.mm", + "send_tab_to_self_modal_delegate.h", + "send_tab_to_self_modal_positioner.h", + "send_tab_to_self_modal_presentation_controller.h", + "send_tab_to_self_modal_presentation_controller.mm", + "send_tab_to_self_table_view_controller.h", + "send_tab_to_self_table_view_controller.mm", + ] + deps = [ + "resources:send_tab_to_self_devices", + "resources:send_tab_to_self_laptop", + "resources:send_tab_to_self_smartphone", + "resources:send_tab_to_self_tablet", + "//base", + "//components/send_tab_to_self", + "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser/ui/settings/cells", + "//ios/chrome/browser/ui/table_view", + "//ios/chrome/browser/ui/table_view:styler", + "//ios/chrome/browser/ui/table_view/cells", + "//ios/chrome/common/colors", + "//ui/base", + ] +} diff --git a/chromium/ios/chrome/browser/ui/send_tab_to_self/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/send_tab_to_self/resources/BUILD.gn new file mode 100644 index 00000000000..98a06020b58 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/send_tab_to_self/resources/BUILD.gn @@ -0,0 +1,37 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/ios/asset_catalog.gni") + +imageset("send_tab_to_self_devices") { + sources = [ + "send_tab_to_self_devices.imageset/Contents.json", + "send_tab_to_self_devices.imageset/send_tab_to_self_devices_2x.png", + "send_tab_to_self_devices.imageset/send_tab_to_self_devices_3x.png", + ] +} + +imageset("send_tab_to_self_laptop") { + sources = [ + "send_tab_to_self_laptop.imageset/Contents.json", + "send_tab_to_self_laptop.imageset/send_tab_to_self_laptop_2x.png", + "send_tab_to_self_laptop.imageset/send_tab_to_self_laptop_3x.png", + ] +} + +imageset("send_tab_to_self_smartphone") { + sources = [ + "send_tab_to_self_smartphone.imageset/Contents.json", + "send_tab_to_self_smartphone.imageset/send_tab_to_self_smartphone_2x.png", + "send_tab_to_self_smartphone.imageset/send_tab_to_self_smartphone_3x.png", + ] +} + +imageset("send_tab_to_self_tablet") { + sources = [ + "send_tab_to_self_tablet.imageset/Contents.json", + "send_tab_to_self_tablet.imageset/send_tab_to_self_tablet_2x.png", + "send_tab_to_self_tablet.imageset/send_tab_to_self_tablet_3x.png", + ] +} diff --git a/chromium/ios/chrome/browser/ui/settings/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/BUILD.gn index 37e8617182e..1c386ca4cc9 100644 --- a/chromium/ios/chrome/browser/ui/settings/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/BUILD.gn @@ -29,6 +29,7 @@ source_set("settings_root") { "//ios/chrome/browser/ui/table_view:styler", "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/browser/ui/util", + "//ios/chrome/common/colors", "//ios/chrome/common/ui_util", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/user_feedback", @@ -79,6 +80,7 @@ source_set("settings") { "resources:settings_addresses", "resources:settings_article_suggestions", "resources:settings_bandwidth", + "resources:settings_catalog_example_text", "resources:settings_content_settings", "resources:settings_debug", "resources:settings_error", @@ -95,6 +97,7 @@ source_set("settings") { "resources:sync_and_google_services_sync_on", "//base", "//base:i18n", + "//build:branding_buildflags", "//components/autofill/core/browser", "//components/autofill/core/common", "//components/browsing_data/core", @@ -113,7 +116,8 @@ source_set("settings") { "//components/prefs/ios", "//components/resources", "//components/search_engines", - "//components/signin/core/browser", + "//components/signin/public/identity_manager", + "//components/signin/public/identity_manager/objc", "//components/strings", "//components/translate/core/browser", "//components/translate/core/common", @@ -174,6 +178,7 @@ source_set("settings") { "//ios/chrome/browser/voice", "//ios/chrome/browser/web:web", "//ios/chrome/common", + "//ios/chrome/common/colors", "//ios/chrome/common/favicon", "//ios/chrome/common/ui_util", "//ios/public/provider/chrome/browser", @@ -185,8 +190,6 @@ source_set("settings") { "//ios/third_party/material_components_ios", "//ios/third_party/material_roboto_font_loader_ios", "//net", - "//services/identity/public/cpp", - "//services/identity/public/objc", "//ui/base", "//url", ] @@ -315,7 +318,6 @@ source_set("unit_tests") { "//ios/web/public/test", "//net", "//net:test_support", - "//services/identity/public/cpp:test_support", "//testing/gmock", "//testing/gtest", "//third_party/ocmock", @@ -370,6 +372,7 @@ source_set("eg_tests") { "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/ui/util:util", + "//ios/chrome/test:eg_test_support", "//ios/chrome/test:test_support", "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", diff --git a/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn index bd79bcd5c49..edf65cac65d 100644 --- a/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn @@ -5,6 +5,8 @@ source_set("autofill") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ + "autofill_add_credit_card_view_controller.h", + "autofill_add_credit_card_view_controller.mm", "autofill_credit_card_edit_table_view_controller.h", "autofill_credit_card_edit_table_view_controller.mm", "autofill_credit_card_table_view_controller.h", @@ -18,6 +20,7 @@ source_set("autofill") { "autofill_profile_table_view_controller.mm", ] deps = [ + ":feature_flags", "//components/autofill/core/browser", "//components/autofill/core/common", "//components/autofill/ios/browser", @@ -38,10 +41,22 @@ source_set("autofill") { "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/browser/ui/util", + "//ios/chrome/common/colors", "//ui/base", ] } +source_set("feature_flags") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "features.h", + "features.mm", + ] + deps = [ + "//base", + ] +} + source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true diff --git a/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn index c440a845e4c..9bfb744f924 100644 --- a/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn @@ -51,6 +51,7 @@ source_set("cells") { "//ios/chrome/browser/ui/table_view:styler", "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/browser/ui/util", + "//ios/chrome/common/colors", "//ios/chrome/common/ui_util", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/signin", diff --git a/chromium/ios/chrome/browser/ui/settings/clear_browsing_data/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/clear_browsing_data/BUILD.gn index 1fe6f1de309..52b5b2661a1 100644 --- a/chromium/ios/chrome/browser/ui/settings/clear_browsing_data/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/clear_browsing_data/BUILD.gn @@ -30,6 +30,7 @@ source_set("clear_browsing_data") { "//components/feature_engagement/public", "//components/history/core/browser", "//components/prefs/ios", + "//components/signin/public/identity_manager", "//components/strings", "//ios/chrome/app/strings", "//ios/chrome/browser", @@ -55,9 +56,9 @@ source_set("clear_browsing_data") { "//ios/chrome/browser/ui/table_view:styler", "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/common", + "//ios/chrome/common/colors", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/images", - "//services/identity/public/cpp", "//ui/base", ] } @@ -78,6 +79,7 @@ source_set("unit_tests") { "//components/browsing_data/core", "//components/pref_registry", "//components/prefs", + "//components/signin/public/identity_manager:test_support", "//components/sync:test_support", "//components/sync_preferences", "//components/sync_preferences:test_support", @@ -88,16 +90,18 @@ source_set("unit_tests") { "//ios/chrome/browser/browsing_data:feature_flags", "//ios/chrome/browser/browsing_data:test_support", "//ios/chrome/browser/prefs:browser_prefs", + "//ios/chrome/browser/signin", "//ios/chrome/browser/signin:test_support", "//ios/chrome/browser/sync", + "//ios/chrome/browser/sync:test_support", "//ios/chrome/browser/ui/collection_view", "//ios/chrome/browser/ui/collection_view:test_support", "//ios/chrome/browser/ui/settings/cells", "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/table_view:test_support", "//ios/chrome/common", + "//ios/public/provider/chrome/browser/signin:test_support", "//ios/web/public/test", - "//services/identity/public/cpp:test_support", "//testing/gtest", "//third_party/ocmock", "//ui/base", diff --git a/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn index 95630840dc1..fd996a30896 100644 --- a/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn @@ -42,6 +42,8 @@ source_set("google_services") { "//components/google/core/common", "//components/metrics", "//components/prefs", + "//components/signin/public/identity_manager", + "//components/signin/public/identity_manager/objc", "//components/strings", "//components/sync", "//components/ukm/ios:features", @@ -70,7 +72,6 @@ source_set("google_services") { "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/images", "//ios/public/provider/chrome/browser/signin", - "//services/identity/public/objc", "//ui/base", ] allow_circular_includes_from = @@ -82,55 +83,29 @@ source_set("eg_tests") { testonly = true sources = [ "accounts_table_egtest.mm", + "google_services_settings_egtest.mm", ] deps = [ ":google_services", "//components/browser_sync", + "//components/prefs", "//components/strings", "//components/sync", "//components/unified_consent", + "//ios/chrome/app:app_internal", "//ios/chrome/app/strings", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/ntp_snippets", "//ios/chrome/browser/signin", "//ios/chrome/browser/sync", - "//ios/chrome/browser/ui/authentication:eg_test_support", - "//ios/chrome/browser/ui/authentication/cells", - "//ios/chrome/test/app:test_support", - "//ios/chrome/test/earl_grey:test_support", - "//ios/public/provider/chrome/browser/signin:test_support", - "//ui/base", - ] -} - -source_set("unified_consent_eg_tests") { - configs += [ "//build/config/compiler:enable_arc" ] - testonly = true - sources = [ - "google_services_settings_egtest.mm", - ] - - deps = [ - ":google_services", - "//base", - "//base/test:test_support", - "//components/prefs", - "//components/unified_consent", - "//ios/chrome/app:app_internal", - "//ios/chrome/app/strings:ios_chromium_strings_grit", - "//ios/chrome/app/strings:ios_strings_grit", - "//ios/chrome/browser/browser_state", "//ios/chrome/browser/tabs", "//ios/chrome/browser/ui/authentication:eg_test_support", + "//ios/chrome/browser/ui/authentication/cells", "//ios/chrome/browser/web_state_list", "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", "//ios/public/provider/chrome/browser/signin:test_support", "//ui/base", ] - libs = [ - "UIKit.framework", - "XCTest.framework", - ] } diff --git a/chromium/ios/chrome/browser/ui/settings/language/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/language/BUILD.gn index c3d15652da2..b95c1c4497e 100644 --- a/chromium/ios/chrome/browser/ui/settings/language/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/language/BUILD.gn @@ -39,6 +39,8 @@ source_set("language_ui") { "language_settings_histograms.h", "language_settings_table_view_controller.h", "language_settings_table_view_controller.mm", + "language_settings_ui_constants.h", + "language_settings_ui_constants.mm", ] deps = [ "//ios/chrome/app/strings:ios_strings_grit", @@ -51,7 +53,52 @@ source_set("language_ui") { "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/browser/ui/util", + "//ios/chrome/common/colors", "//ios/chrome/common/ui_util", "//ui/base", ] } + +source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ + "language_settings_mediator_unittest.mm", + ] + deps = [ + ":language_ui", + "//base/test:test_support", + "//components/language/core/browser", + "//components/pref_registry", + "//components/prefs", + "//components/sync_preferences", + "//components/sync_preferences:test_support", + "//components/translate/core/browser", + "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/prefs:browser_prefs", + "//ios/chrome/browser/translate", + "//ios/chrome/browser/ui/settings/language", + "//ios/chrome/browser/ui/settings/language/cells", + "//testing/gtest", + ] +} + +source_set("eg_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ + "language_settings_egtest.mm", + ] + deps = [ + ":language_ui", + "//components/language/core/browser", + "//components/translate/core/browser", + "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/translate", + "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/test/app:test_support", + "//ios/chrome/test/earl_grey:test_support", + "//ui/strings:ui_strings_grit", + ] +} diff --git a/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn index 68636df2cc6..7d67fbacf1e 100644 --- a/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn @@ -39,6 +39,7 @@ source_set("password") { "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/browser/ui/util", + "//ios/chrome/common/colors", "//ios/chrome/common/ui_util", "//ios/third_party/material_components_ios", "//ui/base", @@ -86,6 +87,7 @@ source_set("unit_tests") { "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web:test_support", + "//ios/chrome/common/colors", "//ios/chrome/test/app:test_support", "//ios/web/public/test", "//ios/web/public/test", diff --git a/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn index bb1a3149232..dfe0806c02c 100644 --- a/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn @@ -4,6 +4,12 @@ import("//build/config/ios/asset_catalog.gni") +colorset("settings_catalog_example_text") { + sources = [ + "settings_catalog_example_text.colorset/Contents.json", + ] +} + imageset("app_icon_placeholder") { sources = [ "app_icon_placeholder.imageset/Contents.json", diff --git a/chromium/ios/chrome/browser/ui/settings/sync/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/sync/BUILD.gn index 5f17b99985e..94d8f90bbb9 100644 --- a/chromium/ios/chrome/browser/ui/settings/sync/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/sync/BUILD.gn @@ -20,6 +20,7 @@ source_set("sync") { "//components/browser_sync", "//components/google/core/common", "//components/prefs", + "//components/signin/public/identity_manager/objc", "//components/strings", "//components/sync", "//components/unified_consent", @@ -45,9 +46,9 @@ source_set("sync") { "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/browser/ui/util", + "//ios/chrome/common/colors", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/signin", - "//services/identity/public/objc", "//ui/base", "//url", ] diff --git a/chromium/ios/chrome/browser/ui/settings/sync/utils/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/sync/utils/BUILD.gn index dfd04004059..84aadc554b0 100644 --- a/chromium/ios/chrome/browser/ui/settings/sync/utils/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/sync/utils/BUILD.gn @@ -17,7 +17,6 @@ source_set("utils") { "//base", "//components/browser_sync", "//components/infobars/core", - "//components/signin/core/browser", "//components/strings", "//components/sync", "//components/unified_consent", diff --git a/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn b/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn index c9907e2f534..cce5cf9f2c3 100644 --- a/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn @@ -34,7 +34,7 @@ source_set("side_swipe") { "//ios/chrome/browser/ui/fullscreen", "//ios/chrome/browser/ui/ntp", "//ios/chrome/browser/ui/ntp:util", - "//ios/chrome/browser/ui/tab_grid/grid:grid_ui", + "//ios/chrome/browser/ui/tab_grid/grid:grid_ui_constants", "//ios/chrome/browser/ui/tabs/requirements", "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/util", diff --git a/chromium/ios/chrome/browser/ui/signin_interaction/BUILD.gn b/chromium/ios/chrome/browser/ui/signin_interaction/BUILD.gn index ccd205bf25b..3766d691a01 100644 --- a/chromium/ios/chrome/browser/ui/signin_interaction/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/signin_interaction/BUILD.gn @@ -15,7 +15,7 @@ source_set("signin_interaction") { "//base", "//components//unified_consent", "//components/prefs", - "//components/signin/core/browser", + "//components/signin/public/identity_manager", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/signin", @@ -25,7 +25,6 @@ source_set("signin_interaction") { "//ios/chrome/browser/unified_consent", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/signin", - "//services/identity/public/cpp:cpp", ] } @@ -55,37 +54,6 @@ source_set("eg_tests") { testonly = true sources = [ "signin_interaction_controller_egtest.mm", - "signin_interaction_controller_unity_disabled_egtest.mm", - ] - deps = [ - ":eg_test_support", - "//base", - "//base/test:test_support", - "//components/unified_consent", - "//ios/chrome/app/strings", - "//ios/chrome/browser", - "//ios/chrome/browser/signin", - "//ios/chrome/browser/ui/authentication", - "//ios/chrome/browser/ui/authentication:eg_test_support", - "//ios/chrome/browser/ui/authentication/cells", - "//ios/chrome/browser/ui/commands", - "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant", - "//ios/chrome/browser/ui/settings", - "//ios/chrome/browser/ui/util", - "//ios/chrome/test/app:test_support", - "//ios/chrome/test/earl_grey:test_support", - "//ios/public/provider/chrome/browser/signin:test_support", - "//ios/testing/earl_grey:earl_grey_support", - "//ios/third_party/earl_grey:earl_grey+link", - ] - libs = [ "XCTest.framework" ] -} - -source_set("unity_eg_tests") { - configs += [ "//build/config/compiler:enable_arc" ] - testonly = true - sources = [ - "signin_interaction_controller_egtest.mm", "signin_interaction_controller_unity_egtest.mm", ] deps = [ @@ -93,37 +61,29 @@ source_set("unity_eg_tests") { "//base", "//base/test:test_support", "//components/unified_consent", + "//ios/chrome/app:app_internal", "//ios/chrome/app/strings", - "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser", "//ios/chrome/browser/signin", + "//ios/chrome/browser/tabs", "//ios/chrome/browser/ui/authentication", "//ios/chrome/browser/ui/authentication:eg_test_support", "//ios/chrome/browser/ui/authentication/cells", "//ios/chrome/browser/ui/authentication/unified_consent/identity_chooser:identity_chooser_ui", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant", + "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui_constants", "//ios/chrome/browser/ui/settings", + "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/browser/ui/util", + "//ios/chrome/browser/web_state_list", "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", "//ios/public/provider/chrome/browser/signin:test_support", "//ios/testing/earl_grey:earl_grey_support", "//ios/third_party/earl_grey:earl_grey+link", "//ui/base", + "//ui/base", ] libs = [ "XCTest.framework" ] } - -source_set("unified_consent_enabled_hooks") { - configs += [ "//build/config/compiler:enable_arc" ] - testonly = true - sources = [ - "unified_consent_enabled_egtests_hook.mm", - ] - deps = [ - "//components/unified_consent", - "//components/unified_consent:test_support", - "//ios/chrome/app:tests_hook", - ] -} diff --git a/chromium/ios/chrome/browser/ui/snackbar/BUILD.gn b/chromium/ios/chrome/browser/ui/snackbar/BUILD.gn index 6c34a29c12d..78dc55eba27 100644 --- a/chromium/ios/chrome/browser/ui/snackbar/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/snackbar/BUILD.gn @@ -10,6 +10,8 @@ source_set("snackbar") { ] deps = [ "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/coordinators:chrome_coordinators", + "//ios/chrome/browser/ui/util", "//ios/third_party/material_components_ios", ] libs = [ "UIKit.framework" ] diff --git a/chromium/ios/chrome/browser/ui/static_content/BUILD.gn b/chromium/ios/chrome/browser/ui/static_content/BUILD.gn index e97a092a882..e7e81d9c887 100644 --- a/chromium/ios/chrome/browser/ui/static_content/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/static_content/BUILD.gn @@ -14,6 +14,7 @@ source_set("static_content") { "//base", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/url_loading", + "//ios/web/common:web_view_creation_util", "//ios/web/public/deprecated", "//net", "//ui/base", diff --git a/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn index 316e67c85e6..4610f390a27 100644 --- a/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn @@ -47,12 +47,19 @@ source_set("tab_grid") { ] } +source_set("tab_grid_ui_constants") { + configs += [ "//build/config/compiler:enable_arc" ] + + sources = [ + "tab_grid_constants.h", + "tab_grid_constants.mm", + ] +} + source_set("tab_grid_ui") { sources = [ "tab_grid_bottom_toolbar.h", "tab_grid_bottom_toolbar.mm", - "tab_grid_constants.h", - "tab_grid_constants.mm", "tab_grid_empty_state_view.h", "tab_grid_empty_state_view.mm", "tab_grid_new_tab_button.h", @@ -71,7 +78,9 @@ source_set("tab_grid_ui") { configs += [ "//build/config/compiler:enable_arc" ] deps = [ + ":tab_grid_ui_constants", "grid:grid_ui", + "grid:grid_ui_constants", "resources:new_tab_floating_button", "resources:new_tab_floating_button_incognito", "resources:new_tab_toolbar_button", @@ -121,29 +130,6 @@ source_set("unit_tests") { ] } -source_set("egtest_support") { - configs += [ "//build/config/compiler:enable_arc" ] - testonly = true - sources = [ - "tab_grid_egtest_util.h", - "tab_grid_egtest_util.mm", - ] - - deps = [ - ":tab_grid_ui", - "grid:grid_ui", - "//base", - "//base/test:test_support", - "//ios/chrome/app/strings", - "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui", - "//ios/chrome/browser/ui/util", - "//ios/chrome/test/app:test_support", - "//ios/chrome/test/earl_grey:test_support", - "//ios/third_party/earl_grey:earl_grey+link", - "//ui/base", - ] -} - source_set("eg_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true @@ -153,7 +139,7 @@ source_set("eg_tests") { ] deps = [ - ":egtest_support", + ":tab_grid_ui_constants", "//ios/chrome/app:app_internal", "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser/tabs:tabs", diff --git a/chromium/ios/chrome/browser/ui/tab_grid/grid/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_grid/grid/BUILD.gn index 198c8ff458c..d67c9403ede 100644 --- a/chromium/ios/chrome/browser/ui/tab_grid/grid/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/tab_grid/grid/BUILD.gn @@ -4,13 +4,19 @@ import("//ios/public/provider/chrome/browser/build_config.gni") +source_set("grid_ui_constants") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "grid_constants.h", + "grid_constants.mm", + ] +} + source_set("grid_ui") { sources = [ "grid_cell.h", "grid_cell.mm", "grid_commands.h", - "grid_constants.h", - "grid_constants.mm", "grid_consumer.h", "grid_empty_view.h", "grid_image_data_source.h", @@ -26,6 +32,7 @@ source_set("grid_ui") { configs += [ "//build/config/compiler:enable_arc" ] deps = [ + ":grid_ui_constants", "resources:grid_cell_close_button", "//base", "//ios/chrome/app/strings", diff --git a/chromium/ios/chrome/browser/ui/tab_grid/grid/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_grid/grid/resources/BUILD.gn index 2e88b9ff9c9..3bffe2146b4 100644 --- a/chromium/ios/chrome/browser/ui/tab_grid/grid/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/tab_grid/grid/resources/BUILD.gn @@ -7,7 +7,6 @@ import("//build/config/ios/asset_catalog.gni") imageset("grid_cell_close_button") { sources = [ "grid_cell_close_button.imageset/Contents.json", - "grid_cell_close_button.imageset/grid_cell_close_button.png", "grid_cell_close_button.imageset/grid_cell_close_button@2x.png", "grid_cell_close_button.imageset/grid_cell_close_button@3x.png", ] diff --git a/chromium/ios/chrome/browser/ui/tab_grid/transitions/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_grid/transitions/BUILD.gn index 3854b7348a7..1349ffda9af 100644 --- a/chromium/ios/chrome/browser/ui/tab_grid/transitions/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/tab_grid/transitions/BUILD.gn @@ -24,7 +24,7 @@ source_set("transitions") { deps = [ "//base", - "//ios/chrome/browser/ui/util", + "//ios/chrome/browser/crash_report", "//ios/chrome/browser/ui/util", ] } diff --git a/chromium/ios/chrome/browser/ui/table_view/BUILD.gn b/chromium/ios/chrome/browser/ui/table_view/BUILD.gn index ffe51bf3578..039d32ed66d 100644 --- a/chromium/ios/chrome/browser/ui/table_view/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/table_view/BUILD.gn @@ -40,6 +40,7 @@ source_set("styler") { ] public_deps = [ "//ios/chrome/browser/ui/util", + "//ios/chrome/common/colors", ] } @@ -78,6 +79,17 @@ source_set("views") { ] } +source_set("feature_flags") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "feature_flags.h", + "feature_flags.mm", + ] + deps = [ + "//base", + ] +} + source_set("test_support") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true diff --git a/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn index e64a21ef968..67305a90b73 100644 --- a/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn @@ -56,6 +56,7 @@ source_set("cells") { "//ios/chrome/browser/ui/table_view:styler", "//ios/chrome/browser/ui/util", "//ios/chrome/common", + "//ios/chrome/common/colors", "//ios/chrome/common/favicon", "//ios/chrome/common/ui_util", "//ios/third_party/material_components_ios:material_components_ios", @@ -85,6 +86,7 @@ source_set("unit_tests") { ":cells", "//base", "//ios/chrome/browser/ui/table_view:styler", + "//ios/chrome/common/colors", "//net:net", "//testing/gtest", "//third_party/ocmock:ocmock", diff --git a/chromium/ios/chrome/browser/ui/tabs/BUILD.gn b/chromium/ios/chrome/browser/ui/tabs/BUILD.gn index 9b5ffedbe60..64add5e4406 100644 --- a/chromium/ios/chrome/browser/ui/tabs/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/tabs/BUILD.gn @@ -26,13 +26,15 @@ source_set("tabs") { ] deps = [ "resources:open_new_tab_background", + "resources:tabstrip_active_tab_close_button_color", + "resources:tabstrip_active_tab_incognito_close_button_color", "resources:tabstrip_background_tab", "resources:tabstrip_foreground_tab", + "resources:tabstrip_inactive_tab_close_button_color", + "resources:tabstrip_inactive_tab_text_color", "resources:tabstrip_incognito_background_tab", "resources:tabstrip_incognito_foreground_tab", "resources:tabstrip_new_tab", - "resources:tabstrip_new_tab_incognito", - "resources:tabstrip_new_tab_incognito_pressed", "resources:tabstrip_new_tab_pressed", "resources:tabstrip_tab_switcher_count_button", "resources:tabstrip_tab_switcher_count_button_pressed", @@ -48,8 +50,7 @@ source_set("tabs") { "//ios/chrome/browser/ui/bubble", "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/commands", - "//ios/chrome/browser/ui/favicon/resources:default_favicon", - "//ios/chrome/browser/ui/favicon/resources:default_favicon_incognito", + "//ios/chrome/browser/ui/favicon/resources:default_world_favicon", "//ios/chrome/browser/ui/fullscreen", "//ios/chrome/browser/ui/image_util", "//ios/chrome/browser/ui/ntp:util", @@ -61,6 +62,7 @@ source_set("tabs") { "//ios/chrome/browser/web_state_list", "//ios/chrome/common", "//ios/chrome/common:common_extension", + "//ios/chrome/common/colors", "//ios/chrome/common/ui_util", "//ios/third_party/material_components_ios", "//ios/web", diff --git a/chromium/ios/chrome/browser/ui/tabs/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/tabs/resources/BUILD.gn index db1e1bd38ea..b088fd30f32 100644 --- a/chromium/ios/chrome/browser/ui/tabs/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/tabs/resources/BUILD.gn @@ -17,7 +17,7 @@ imageset("tabstrip_background_tab") { sources = [ "tabstrip_background_tab.imageset/Contents.json", "tabstrip_background_tab.imageset/tabstrip_background_tab@2x~ipad.png", - "tabstrip_background_tab.imageset/tabstrip_background_tab~ipad.png", + "tabstrip_background_tab.imageset/tabstrip_background_tab_dark@2x~ipad.png", ] } @@ -25,7 +25,7 @@ imageset("tabstrip_foreground_tab") { sources = [ "tabstrip_foreground_tab.imageset/Contents.json", "tabstrip_foreground_tab.imageset/tabstrip_foreground_tab@2x~ipad.png", - "tabstrip_foreground_tab.imageset/tabstrip_foreground_tab~ipad.png", + "tabstrip_foreground_tab.imageset/tabstrip_foreground_tab_dark@2x~ipad.png", ] } @@ -33,7 +33,6 @@ imageset("tabstrip_incognito_background_tab") { sources = [ "tabstrip_incognito_background_tab.imageset/Contents.json", "tabstrip_incognito_background_tab.imageset/tabstrip_incognito_background_tab@2x~ipad.png", - "tabstrip_incognito_background_tab.imageset/tabstrip_incognito_background_tab~ipad.png", ] } @@ -41,7 +40,6 @@ imageset("tabstrip_incognito_foreground_tab") { sources = [ "tabstrip_incognito_foreground_tab.imageset/Contents.json", "tabstrip_incognito_foreground_tab.imageset/tabstrip_incognito_foreground_tab@2x~ipad.png", - "tabstrip_incognito_foreground_tab.imageset/tabstrip_incognito_foreground_tab~ipad.png", ] } @@ -49,23 +47,6 @@ imageset("tabstrip_new_tab") { sources = [ "tabstrip_new_tab.imageset/Contents.json", "tabstrip_new_tab.imageset/tabstrip_new_tab@2x~ipad.png", - "tabstrip_new_tab.imageset/tabstrip_new_tab~ipad.png", - ] -} - -imageset("tabstrip_new_tab_incognito") { - sources = [ - "tabstrip_new_tab_incognito.imageset/Contents.json", - "tabstrip_new_tab_incognito.imageset/tabstrip_new_tab_incognito@2x~ipad.png", - "tabstrip_new_tab_incognito.imageset/tabstrip_new_tab_incognito~ipad.png", - ] -} - -imageset("tabstrip_new_tab_incognito_pressed") { - sources = [ - "tabstrip_new_tab_incognito_pressed.imageset/Contents.json", - "tabstrip_new_tab_incognito_pressed.imageset/tabstrip_new_tab_incognito_pressed@2x~ipad.png", - "tabstrip_new_tab_incognito_pressed.imageset/tabstrip_new_tab_incognito_pressed~ipad.png", ] } @@ -73,7 +54,6 @@ imageset("tabstrip_new_tab_pressed") { sources = [ "tabstrip_new_tab_pressed.imageset/Contents.json", "tabstrip_new_tab_pressed.imageset/tabstrip_new_tab_pressed@2x~ipad.png", - "tabstrip_new_tab_pressed.imageset/tabstrip_new_tab_pressed~ipad.png", ] } @@ -100,3 +80,27 @@ imageset("tabstrip_toggle_button_gradient") { "tabstrip_toggle_button_gradient.imageset/tabstrip_toggle_button_gradient~ipad.png", ] } + +colorset("tabstrip_active_tab_close_button_color") { + sources = [ + "tabstrip_active_tab_close_button_color.colorset/Contents.json", + ] +} + +colorset("tabstrip_active_tab_incognito_close_button_color") { + sources = [ + "tabstrip_active_tab_incognito_close_button_color.colorset/Contents.json", + ] +} + +colorset("tabstrip_inactive_tab_close_button_color") { + sources = [ + "tabstrip_inactive_tab_close_button_color.colorset/Contents.json", + ] +} + +colorset("tabstrip_inactive_tab_text_color") { + sources = [ + "tabstrip_inactive_tab_text_color.colorset/Contents.json", + ] +} diff --git a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn index b75aa7e19ef..0c5ccd5947e 100644 --- a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn @@ -82,6 +82,7 @@ source_set("toolbar_ui") { "toolbar_progress_bar.mm", ] deps = [ + "resources:tab_toolbar_shadow_color", "//base", "//ios/chrome/app/strings", "//ios/chrome/browser/ui/activity_services/requirements", @@ -145,8 +146,25 @@ source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] } +source_set("eg2_tests") { + defines = [ "CHROME_EARL_GREY_2" ] + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + testonly = true + sources = [] + deps = [ + "//ios/chrome/test/earl_grey:eg_test_support+eg2", + "//ios/testing/earl_grey:eg_test_support+eg2", + "//ios/third_party/earl_grey2:test_lib", + ] + libs = [ "UIKit.framework" ] +} + source_set("eg_tests") { configs += [ "//build/config/compiler:enable_arc" ] + defines = [ "CHROME_EARL_GREY_1" ] testonly = true sources = [ "adaptive_toolbar_egtest.mm", @@ -168,7 +186,6 @@ source_set("eg_tests") { "//ios/chrome/browser/ui/omnibox/popup:popup_internal", "//ios/chrome/browser/ui/omnibox/popup:popup_ui", "//ios/chrome/browser/ui/popup_menu:constants", - "//ios/chrome/browser/ui/tab_grid:egtest_support", "//ios/chrome/browser/ui/toolbar/buttons", "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/util", diff --git a/chromium/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn index 3883d929022..971dc2aed80 100644 --- a/chromium/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn @@ -6,6 +6,8 @@ source_set("buttons") { sources = [ "toolbar_button.h", "toolbar_button.mm", + "toolbar_button_actions_handler.h", + "toolbar_button_actions_handler.mm", "toolbar_button_factory.h", "toolbar_button_factory.mm", "toolbar_button_visibility_configuration.h", @@ -23,10 +25,17 @@ source_set("buttons") { "toolbar_type.h", ] deps = [ + "resources:tab_toolbar_button_color", + "resources:tab_toolbar_button_color_highlighted", + "resources:tab_toolbar_button_color_highlighted_incognito", + "resources:tab_toolbar_button_color_incognito", + "resources:tab_toolbar_button_halo_color", + "resources:tab_toolbar_button_halo_color_incognito", "resources:toolbar_back", "resources:toolbar_bookmark", "resources:toolbar_bookmark_active", "resources:toolbar_forward", + "resources:toolbar_new_tab_page", "resources:toolbar_reload", "resources:toolbar_search", "resources:toolbar_share", @@ -36,15 +45,20 @@ source_set("buttons") { "//components/strings", "//ios/chrome/app/strings", "//ios/chrome/app/theme", + "//ios/chrome/browser", + "//ios/chrome/browser/browser_state", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant", "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/toolbar/public:feature_flags", "//ios/chrome/browser/ui/util", + "//ios/chrome/browser/web_state_list", + "//ios/chrome/common/colors", "//ios/chrome/common/ui_util", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/images", "//ios/third_party/material_components_ios", + "//ios/web/public", "//ui/base", ] libs = [ "UIKit.framework" ] diff --git a/chromium/ios/chrome/browser/ui/toolbar/buttons/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/buttons/resources/BUILD.gn index 5b718005528..0f5b2ee98c6 100644 --- a/chromium/ios/chrome/browser/ui/toolbar/buttons/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/toolbar/buttons/resources/BUILD.gn @@ -4,6 +4,50 @@ import("//build/config/ios/asset_catalog.gni") +colorset("tab_toolbar_button_color") { + sources = [ + "tab_toolbar_button_color.colorset/Contents.json", + ] +} + +colorset("tab_toolbar_button_color_incognito") { + sources = [ + "tab_toolbar_button_color_incognito.colorset/Contents.json", + ] +} + +colorset("tab_toolbar_button_color_highlighted") { + sources = [ + "tab_toolbar_button_color_highlighted.colorset/Contents.json", + ] +} + +colorset("tab_toolbar_button_color_highlighted_incognito") { + sources = [ + "tab_toolbar_button_color_highlighted_incognito.colorset/Contents.json", + ] +} + +colorset("tab_toolbar_button_halo_color") { + sources = [ + "tab_toolbar_button_halo_color.colorset/Contents.json", + ] +} + +colorset("tab_toolbar_button_halo_color_incognito") { + sources = [ + "tab_toolbar_button_halo_color_incognito.colorset/Contents.json", + ] +} + +imageset("toolbar_new_tab_page") { + sources = [ + "toolbar_new_tab_page.imageset/Contents.json", + "toolbar_new_tab_page.imageset/toolbar_new_tab_page@2x.png", + "toolbar_new_tab_page.imageset/toolbar_new_tab_page@3x.png", + ] +} + imageset("toolbar_stop") { sources = [ "toolbar_stop.imageset/Contents.json", diff --git a/chromium/ios/chrome/browser/ui/toolbar/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/resources/BUILD.gn new file mode 100644 index 00000000000..f614247f099 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/toolbar/resources/BUILD.gn @@ -0,0 +1,11 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/ios/asset_catalog.gni") + +colorset("tab_toolbar_shadow_color") { + sources = [ + "tab_toolbar_shadow_color.colorset/Contents.json", + ] +} diff --git a/chromium/ios/chrome/browser/ui/translate/BUILD.gn b/chromium/ios/chrome/browser/ui/translate/BUILD.gn index 5bcf3107edd..11a653edce8 100644 --- a/chromium/ios/chrome/browser/ui/translate/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/translate/BUILD.gn @@ -5,10 +5,6 @@ source_set("translate") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ - "language_selection_coordinator.h", - "language_selection_coordinator.mm", - "language_selection_mediator.h", - "language_selection_mediator.mm", "translate_infobar_coordinator.h", "translate_infobar_coordinator.mm", "translate_infobar_mediator.h", @@ -37,10 +33,6 @@ source_set("translate") { source_set("translate_ui") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ - "language_selection_consumer.h", - "language_selection_provider.h", - "language_selection_view_controller.h", - "language_selection_view_controller.mm", "translate_infobar_language_tab_strip_view.h", "translate_infobar_language_tab_strip_view.mm", "translate_infobar_language_tab_strip_view_delegate.h", diff --git a/chromium/ios/chrome/browser/ui/webui/BUILD.gn b/chromium/ios/chrome/browser/ui/webui/BUILD.gn index 634b672ce40..6a0cae91593 100644 --- a/chromium/ios/chrome/browser/ui/webui/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/webui/BUILD.gn @@ -37,6 +37,8 @@ source_set("webui") { deps = [ "//base", "//base:i18n", + "//build:branding_buildflags", + "//components/autofill/core/browser", "//components/crash/core/browser", "//components/flags_ui", "//components/keyed_service/core", @@ -58,6 +60,7 @@ source_set("webui") { "//ios/chrome/browser/browser_state", "//ios/chrome/browser/crash_report", "//ios/chrome/browser/favicon:favicon", + "//ios/chrome/browser/flags", "//ios/chrome/browser/metrics", "//ios/chrome/browser/ntp_tiles", "//ios/chrome/browser/passwords", @@ -72,7 +75,6 @@ source_set("webui") { "//ios/web/public/webui", "//net", "//services/service_manager/public/cpp", - "//third_party/brotli:dec", "//ui/base", "//url", ] @@ -90,9 +92,8 @@ source_set("webui_internal") { ] deps = [ ":webui", - "//base", "//components/resources", - "//components/signin/core/browser", + "//components/signin/public/identity_manager", "//ios/chrome/app/resources:ios_resources", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", @@ -102,10 +103,14 @@ source_set("webui_internal") { "//ios/chrome/browser/ui/webui/net_export", "//ios/chrome/browser/ui/webui/sync_internals", "//ios/chrome/browser/ui/webui/translate_internals", - "//ios/web/public/webui", - "//services/identity/public/cpp", "//url", ] + + public_deps = [ + "//base", + "//components/signin/core/browser", + "//ios/web/public/webui", + ] } source_set("eg_tests") { diff --git a/chromium/ios/chrome/browser/ui/webui/sync_internals/BUILD.gn b/chromium/ios/chrome/browser/ui/webui/sync_internals/BUILD.gn index e9028adfbee..1fb9f696321 100644 --- a/chromium/ios/chrome/browser/ui/webui/sync_internals/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/webui/sync_internals/BUILD.gn @@ -13,7 +13,6 @@ source_set("sync_internals") { "//base", "//components/browser_sync", "//components/resources", - "//components/signin/core/browser", "//components/sync", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", diff --git a/chromium/ios/chrome/browser/unified_consent/BUILD.gn b/chromium/ios/chrome/browser/unified_consent/BUILD.gn index 24d644ccbd1..ad5cdb62a09 100644 --- a/chromium/ios/chrome/browser/unified_consent/BUILD.gn +++ b/chromium/ios/chrome/browser/unified_consent/BUILD.gn @@ -12,7 +12,6 @@ source_set("unified_consent") { "//components/browser_sync", "//components/keyed_service/ios", "//components/metrics", - "//components/signin/core/browser", "//components/sync", "//components/sync_preferences", "//components/unified_consent", diff --git a/chromium/ios/chrome/browser/upgrade/BUILD.gn b/chromium/ios/chrome/browser/upgrade/BUILD.gn index d8053334443..905c5d78a5b 100644 --- a/chromium/ios/chrome/browser/upgrade/BUILD.gn +++ b/chromium/ios/chrome/browser/upgrade/BUILD.gn @@ -16,7 +16,7 @@ source_set("upgrade") { "//components/version_info", "//ios/chrome/app/strings", "//ios/chrome/browser/ui/commands", - "//ios/web", + "//ios/web/common", "//net", "//ui/base", "//ui/gfx", diff --git a/chromium/ios/chrome/browser/web/BUILD.gn b/chromium/ios/chrome/browser/web/BUILD.gn index 3677cadaecf..7f717b82100 100644 --- a/chromium/ios/chrome/browser/web/BUILD.gn +++ b/chromium/ios/chrome/browser/web/BUILD.gn @@ -25,6 +25,8 @@ source_set("web") { "sad_tab_tab_helper.mm", "web_navigation_util.h", "web_navigation_util.mm", + "web_state_delegate_tab_helper.h", + "web_state_delegate_tab_helper.mm", ] deps = [ ":feature_flags", @@ -39,8 +41,11 @@ source_set("web") { "//ios/chrome/browser", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/ntp", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/web_content_area", "//ios/chrome/browser/snapshots", "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/dialogs:dialogs_internal", "//ios/chrome/browser/ui/elements", "//ios/chrome/browser/ui/fullscreen", "//ios/chrome/browser/ui/util", @@ -48,7 +53,6 @@ source_set("web") { "//ios/net", "//ios/web", "//ios/web/common", - "//third_party/zlib/google:compression_utils", "//ui/base", "//url", ] @@ -94,6 +98,7 @@ source_set("unit_tests") { "services_unittest.mm", "tab_id_tab_helper_unittest.mm", "web_navigation_util_unittest.mm", + "web_state_delegate_tab_helper_unittest.mm", ] deps = [ ":accessibility", @@ -105,12 +110,14 @@ source_set("unit_tests") { "//base", "//base/test:test_support", "//components/search_engines", - "//components/services/patch/public/interfaces", - "//components/services/unzip/public/interfaces", + "//components/services/patch/public/mojom", + "//components/services/unzip/public/mojom", "//components/strings:components_strings_grit", "//ios/chrome/browser", "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/ntp", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/web_content_area", "//ios/chrome/browser/snapshots", "//ios/chrome/browser/ui/util", "//ios/chrome/test:test_support", @@ -226,10 +233,10 @@ source_set("web_internal") { "//components/resources", "//components/services/patch:lib", "//components/services/patch/public/cpp:manifest", - "//components/services/patch/public/interfaces", + "//components/services/patch/public/mojom", "//components/services/unzip:lib", "//components/services/unzip/public/cpp:manifest", - "//components/services/unzip/public/interfaces", + "//components/services/unzip/public/mojom", "//components/strings", "//components/version_info", "//ios/chrome/app/resources:ios_resources", @@ -248,6 +255,7 @@ source_set("web_internal") { "//ios/public/provider/chrome/browser/voice", "//ios/web", "//ios/web/public", + "//ios/web/public/js_messaging", "//net", "//services/identity/public/cpp:manifest", "//services/identity/public/mojom", @@ -305,7 +313,7 @@ source_set("unit_tests_internal") { "//ios/chrome/browser/passwords", "//ios/chrome/browser/web", "//ios/chrome/test/fakes", - "//ios/web", + "//ios/web/common:web_view_creation_util", "//ios/web/public/test", "//ios/web/public/test/fakes", "//net", @@ -381,7 +389,9 @@ source_set("eg2_tests") { ] testonly = true - sources = [] + sources = [ + "error_page_egtest.mm", + ] deps = [ "//components/content_settings/core/common", @@ -411,7 +421,7 @@ source_set("perf_tests") { "//base/test:test_support", "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/test/base:perf_test_support", - "//ios/web", + "//ios/web/common:web_view_creation_util", "//ios/web/public/test", ] libs = [ "WebKit.framework" ] diff --git a/chromium/ios/chrome/browser/webdata_services/BUILD.gn b/chromium/ios/chrome/browser/webdata_services/BUILD.gn new file mode 100644 index 00000000000..b75897dce1b --- /dev/null +++ b/chromium/ios/chrome/browser/webdata_services/BUILD.gn @@ -0,0 +1,22 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +source_set("webdata_services") { + sources = [ + "web_data_service_factory.cc", + "web_data_service_factory.h", + ] + deps = [ + "//base", + "//components/autofill/core/browser", + "//components/keyed_service/core", + "//components/keyed_service/ios", + "//components/search_engines", + "//components/signin/public/webdata", + "//components/webdata_services", + "//ios/chrome/browser", + "//ios/chrome/browser/browser_state", + "//ios/web/public/thread", + ] +} diff --git a/chromium/ios/chrome/common/app_group/BUILD.gn b/chromium/ios/chrome/common/app_group/BUILD.gn index 7b6f303e2b6..88962a9367a 100644 --- a/chromium/ios/chrome/common/app_group/BUILD.gn +++ b/chromium/ios/chrome/common/app_group/BUILD.gn @@ -39,6 +39,22 @@ source_set("client") { ] } +# This target will be included into application extensions and the list +# of its dependencies must be kept as short as possible. +source_set("command") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "app_group_command.h", + "app_group_command.mm", + ] + + deps = [ + ":app_group", + ":client", + "//base", + ] +} + source_set("main_app") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ diff --git a/chromium/ios/chrome/common/colors/BUILD.gn b/chromium/ios/chrome/common/colors/BUILD.gn new file mode 100644 index 00000000000..c569f2b92ed --- /dev/null +++ b/chromium/ios/chrome/common/colors/BUILD.gn @@ -0,0 +1,20 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/chrome_build.gni") + +source_set("colors") { + sources = [ + "UIColor+cr_semantic_colors.h", + "UIColor+cr_semantic_colors.mm", + "incognito_color_util.h", + "incognito_color_util.mm", + "semantic_color_names.h", + "semantic_color_names.mm", + ] + deps = [ + "resources", + ] + configs += [ "//build/config/compiler:enable_arc" ] +} diff --git a/chromium/ios/chrome/common/colors/resources/BUILD.gn b/chromium/ios/chrome/common/colors/resources/BUILD.gn new file mode 100644 index 00000000000..bb7057b5841 --- /dev/null +++ b/chromium/ios/chrome/common/colors/resources/BUILD.gn @@ -0,0 +1,101 @@ +# Copyright 2017 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/ios/asset_catalog.gni") + +group("resources") { + deps = [ + ":background_color", + ":background_dark_color", + ":destructive_tint_color", + ":disabled_tint_color", + ":scrim_background_color", + ":solid_button_text_color", + ":text_primary_color", + ":text_primary_dark_color", + ":textfield_background_color", + ":textfield_background_dark_color", + ":textfield_placeholder_color", + ":textfield_placeholder_dark_color", + ":tint_color", + ] +} + +colorset("background_color") { + sources = [ + "background_color.colorset/Contents.json", + ] +} + +colorset("background_dark_color") { + sources = [ + "background_dark_color.colorset/Contents.json", + ] +} + +colorset("destructive_tint_color") { + sources = [ + "destructive_tint_color.colorset/Contents.json", + ] +} + +colorset("disabled_tint_color") { + sources = [ + "disabled_tint_color.colorset/Contents.json", + ] +} + +colorset("scrim_background_color") { + sources = [ + "scrim_background_color.colorset/Contents.json", + ] +} + +colorset("solid_button_text_color") { + sources = [ + "solid_button_text_color.colorset/Contents.json", + ] +} + +colorset("text_primary_color") { + sources = [ + "text_primary_color.colorset/Contents.json", + ] +} + +colorset("text_primary_dark_color") { + sources = [ + "text_primary_dark_color.colorset/Contents.json", + ] +} + +colorset("textfield_placeholder_color") { + sources = [ + "textfield_placeholder_color.colorset/Contents.json", + ] +} + +colorset("textfield_placeholder_dark_color") { + sources = [ + "textfield_placeholder_dark_color.colorset/Contents.json", + ] +} + +colorset("textfield_background_color") { + sources = [ + "textfield_background_color.colorset/Contents.json", + ] +} + +colorset("textfield_background_dark_color") { + sources = [ + "textfield_background_dark_color.colorset/Contents.json", + ] +} + +colorset("tint_color") { + sources = [ + "tint_color.colorset/Contents.json", + ] +} diff --git a/chromium/ios/chrome/content_widget_extension/BUILD.gn b/chromium/ios/chrome/content_widget_extension/BUILD.gn index 6c7be6d719d..c7184122ed0 100644 --- a/chromium/ios/chrome/content_widget_extension/BUILD.gn +++ b/chromium/ios/chrome/content_widget_extension/BUILD.gn @@ -8,8 +8,8 @@ import("//build/config/mac/base_rules.gni") import("//build/mac/tweak_info_plist.gni") import("//ios/build/chrome_build.gni") import("//ios/build/config.gni") -import("//tools/grit/repack.gni") import("//ios/chrome/tools/strings/generate_localizable_strings.gni") +import("//tools/grit/repack.gni") tweak_info_plist("tweak_info_plist") { info_plist = "Info.plist" @@ -54,6 +54,7 @@ source_set("content_widget") { "//base", "//ios/chrome/common:common_extension", "//ios/chrome/common/app_group", + "//ios/chrome/common/app_group:command", "//ios/chrome/common/favicon", "//ios/chrome/common/ntp_tile", "//ios/chrome/common/ui_util", diff --git a/chromium/ios/chrome/search_widget_extension/BUILD.gn b/chromium/ios/chrome/search_widget_extension/BUILD.gn index cb65f7d5b79..84efa421c93 100644 --- a/chromium/ios/chrome/search_widget_extension/BUILD.gn +++ b/chromium/ios/chrome/search_widget_extension/BUILD.gn @@ -63,6 +63,7 @@ source_set("search_widget") { "//components/open_from_clipboard:open_from_clipboard_impl", "//ios/chrome/common:common_extension", "//ios/chrome/common/app_group", + "//ios/chrome/common/app_group:command", "//ios/chrome/common/ui_util", ] diff --git a/chromium/ios/chrome/share_extension/BUILD.gn b/chromium/ios/chrome/share_extension/BUILD.gn index 3ea0d30137d..267003ad022 100644 --- a/chromium/ios/chrome/share_extension/BUILD.gn +++ b/chromium/ios/chrome/share_extension/BUILD.gn @@ -52,6 +52,7 @@ ios_appex_bundle("share_extension") { "//base", "//ios/chrome/common/app_group", "//ios/chrome/common/app_group:client", + "//ios/chrome/common/app_group:command", ] bundle_deps_filter = [ "//third_party/icu:icudata" ] diff --git a/chromium/ios/chrome/test/BUILD.gn b/chromium/ios/chrome/test/BUILD.gn index f7d343900da..c8c37640a9f 100644 --- a/chromium/ios/chrome/test/BUILD.gn +++ b/chromium/ios/chrome/test/BUILD.gn @@ -31,8 +31,6 @@ source_set("test_support") { "ios_chrome_unit_test_suite.mm", "root_view_controller_test.h", "root_view_controller_test.mm", - "scoped_block_popups_pref.h", - "scoped_block_popups_pref.mm", "scoped_key_window.h", "testing_application_context.h", "testing_application_context.mm", @@ -77,7 +75,7 @@ source_set("eg_test_support") { ] deps = [ ":test_support", - "//base", + "//base:base", "//ios/third_party/earl_grey:earl_grey+link", ] } @@ -144,6 +142,7 @@ test("ios_chrome_unittests") { "//ios/chrome/browser/autofill/manual_fill:unit_tests", "//ios/chrome/browser/browser_state:unit_tests", "//ios/chrome/browser/browsing_data:unit_tests", + "//ios/chrome/browser/complex_tasks:unit_tests", "//ios/chrome/browser/crash_report:unit_tests", "//ios/chrome/browser/device_sharing:unit_tests", "//ios/chrome/browser/download:unit_tests", @@ -163,6 +162,7 @@ test("ios_chrome_unittests") { "//ios/chrome/browser/network_activity:unit_tests", "//ios/chrome/browser/ntp:unit_tests", "//ios/chrome/browser/omaha:unit_tests", + "//ios/chrome/browser/open_in:unit_tests", "//ios/chrome/browser/overlays:unit_tests", "//ios/chrome/browser/overscroll_actions:unit_tests", "//ios/chrome/browser/passwords:unit_tests", @@ -225,6 +225,8 @@ test("ios_chrome_unittests") { "//ios/chrome/browser/ui/omnibox/popup:unit_tests", "//ios/chrome/browser/ui/open_in:unit_tests", "//ios/chrome/browser/ui/overlays:unit_tests", + "//ios/chrome/browser/ui/overlays/web_content_area/http_auth_dialogs:unit_tests", + "//ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs:unit_tests", "//ios/chrome/browser/ui/payments:unit_tests", "//ios/chrome/browser/ui/payments/cells:unit_tests", "//ios/chrome/browser/ui/popup_menu:unit_tests", @@ -238,6 +240,7 @@ test("ios_chrome_unittests") { "//ios/chrome/browser/ui/settings/autofill:unit_tests", "//ios/chrome/browser/ui/settings/cells:unit_tests", "//ios/chrome/browser/ui/settings/clear_browsing_data:unit_tests", + "//ios/chrome/browser/ui/settings/language:unit_tests", "//ios/chrome/browser/ui/settings/password:unit_tests", "//ios/chrome/browser/ui/settings/sync:unit_tests", "//ios/chrome/browser/ui/side_swipe:unit_tests", diff --git a/chromium/ios/chrome/test/app/BUILD.gn b/chromium/ios/chrome/test/app/BUILD.gn index b95e7312f6b..18d9d454934 100644 --- a/chromium/ios/chrome/test/app/BUILD.gn +++ b/chromium/ios/chrome/test/app/BUILD.gn @@ -44,7 +44,7 @@ source_set("test_support") { "//components/keyed_service/core", "//components/metrics", "//components/prefs", - "//components/signin/core/browser", + "//components/signin/public/base", "//components/sync/test/fake_server", "//components/sync_device_info", "//google_apis", diff --git a/chromium/ios/chrome/test/earl_grey/BUILD.gn b/chromium/ios/chrome/test/earl_grey/BUILD.gn index c0db9b81537..79ec78648ee 100644 --- a/chromium/ios/chrome/test/earl_grey/BUILD.gn +++ b/chromium/ios/chrome/test/earl_grey/BUILD.gn @@ -10,19 +10,15 @@ group("all_tests") { ":ios_chrome_autofill_automation_egtests", ":ios_chrome_bookmarks_egtests", ":ios_chrome_device_check_egtests", - ":ios_chrome_external_url_egtests", ":ios_chrome_flaky_egtests", ":ios_chrome_integration_egtests", - ":ios_chrome_manual_fill_egtests", ":ios_chrome_multitasking_egtests", ":ios_chrome_perf_egtests", ":ios_chrome_reading_list_egtests", ":ios_chrome_settings_egtests", ":ios_chrome_smoke_egtests", - ":ios_chrome_tab_grid_egtests", ":ios_chrome_translate_egtests", ":ios_chrome_ui_egtests", - ":ios_chrome_unified_consent_egtests", ":ios_chrome_web_egtests", ] } @@ -39,6 +35,7 @@ chrome_ios_eg_test("ios_chrome_integration_egtests") { "//ios/chrome/browser/ntp_tiles:eg_tests", "//ios/chrome/browser/passwords:eg_tests", "//ios/chrome/browser/prerender:eg_tests", + "//ios/chrome/browser/ui/autofill/manual_fill:eg_tests", "//ios/chrome/browser/ui/payments:eg_tests", ] } @@ -49,13 +46,6 @@ chrome_ios_eg_test("ios_chrome_autofill_automation_egtests") { ] } -chrome_ios_eg_test("ios_chrome_manual_fill_egtests") { - deps = [ - ":test_support", - "//ios/chrome/browser/ui/autofill/manual_fill:eg_tests", - ] -} - chrome_ios_eg_test("ios_chrome_reading_list_egtests") { deps = [ ":test_support", @@ -75,17 +65,11 @@ chrome_ios_eg_test("ios_chrome_settings_egtests") { "//ios/chrome/browser/ui/settings/autofill:eg_tests", "//ios/chrome/browser/ui/settings/clear_browsing_data:eg_tests", "//ios/chrome/browser/ui/settings/google_services:eg_tests", + "//ios/chrome/browser/ui/settings/language:eg_tests", "//ios/chrome/browser/ui/settings/password:eg_tests", ] } -chrome_ios_eg_test("ios_chrome_tab_grid_egtests") { - deps = [ - ":test_support", - "//ios/chrome/browser/ui/tab_grid:eg_tests", - ] -} - chrome_ios_eg_test("ios_chrome_ui_egtests") { deps = [ "//ios/chrome/browser/ui/activity_services:eg_tests", @@ -114,6 +98,7 @@ chrome_ios_eg_test("ios_chrome_ui_egtests") { "//ios/chrome/browser/ui/settings/sync/utils:eg_tests", "//ios/chrome/browser/ui/side_swipe:eg_tests", "//ios/chrome/browser/ui/signin_interaction:eg_tests", + "//ios/chrome/browser/ui/tab_grid:eg_tests", "//ios/chrome/browser/ui/tabs:eg_tests", "//ios/chrome/browser/ui/toolbar:eg_tests", "//ios/chrome/browser/ui/webui:eg_tests", @@ -202,25 +187,6 @@ chrome_ios_eg_test("ios_chrome_translate_egtests") { ] } -chrome_ios_eg_test("ios_chrome_external_url_egtests") { - deps = [ - "//ios/chrome/browser/translate:external_url_eg_tests", - ] -} - -chrome_ios_eg_test("ios_chrome_unified_consent_egtests") { - deps = [ - "//ios/chrome/browser/ui/bookmarks:eg_tests", - "//ios/chrome/browser/ui/first_run:eg_tests", - "//ios/chrome/browser/ui/settings:eg_tests", - "//ios/chrome/browser/ui/settings/google_services:eg_tests", - "//ios/chrome/browser/ui/settings/google_services:unified_consent_eg_tests", - "//ios/chrome/browser/ui/signin_interaction:unity_eg_tests", - ] - hooks_target = - "//ios/chrome/browser/ui/signin_interaction:unified_consent_enabled_hooks" -} - source_set("test_support") { defines = [ "CHROME_EARL_GREY_1" ] configs += [ "//build/config/compiler:enable_arc" ] @@ -238,7 +204,6 @@ source_set("test_support") { "chrome_earl_grey_app_interface.mm", "chrome_earl_grey_ui.h", "chrome_earl_grey_ui.mm", - "chrome_error_util.h", "chrome_matchers.h", "chrome_matchers.mm", "chrome_matchers_app_interface.h", @@ -247,16 +212,24 @@ source_set("test_support") { "chrome_test_case.mm", "chrome_test_case_app_interface.h", "chrome_test_case_app_interface.mm", + "scoped_block_popups_pref.h", + "scoped_block_popups_pref.mm", ] deps = [ "//base", "//base/test:test_support", - "//components/signin/core/browser", + "//components/content_settings/core/browser", + "//components/payments/core:core", "//components/strings", "//components/sync/base", + "//components/translate/core/browser", + "//components/ukm/ios:features", "//components/unified_consent", "//ios/chrome/app/strings", + "//ios/chrome/browser/content_settings:content_settings", + "//ios/chrome/browser/ntp:features", + "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/authentication:authentication", "//ios/chrome/browser/ui/authentication/cells", "//ios/chrome/browser/ui/bookmarks:bookmarks_ui", @@ -270,12 +243,15 @@ source_set("test_support") { "//ios/chrome/browser/ui/omnibox:omnibox_internal", "//ios/chrome/browser/ui/payments:payments_ui", "//ios/chrome/browser/ui/popup_menu:constants", + "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui_constants", "//ios/chrome/browser/ui/settings:settings", "//ios/chrome/browser/ui/settings/cells", "//ios/chrome/browser/ui/settings/clear_browsing_data", "//ios/chrome/browser/ui/settings/google_services", "//ios/chrome/browser/ui/settings/sync", "//ios/chrome/browser/ui/static_content", + "//ios/chrome/browser/ui/tab_grid:tab_grid_ui_constants", + "//ios/chrome/browser/ui/tab_grid/grid:grid_ui_constants", "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/browser/ui/toolbar/buttons", "//ios/chrome/browser/ui/toolbar/public", @@ -285,9 +261,11 @@ source_set("test_support") { "//ios/third_party/material_components_ios", "//ios/web", "//ios/web:earl_grey_test_support", + "//ios/web/common", "//ios/web/public/deprecated", "//ios/web/public/test:element_selector", "//ios/web/public/test/http_server", + "//services/metrics/public/cpp:metrics_cpp", "//ui/base", "//ui/base:test_support", "//url", @@ -329,6 +307,8 @@ source_set("eg_app_support+eg2") { ] testonly = true sources = [ + "accessibility_util.h", + "accessibility_util.mm", "chrome_actions_app_interface.h", "chrome_actions_app_interface.mm", "chrome_earl_grey_app_interface.h", @@ -342,10 +322,17 @@ source_set("eg_app_support+eg2") { deps = [ "//base", "//base/test:test_support", - "//components/signin/core/browser", + "//components/content_settings/core/browser", + "//components/payments/core:core", "//components/strings", + "//components/sync/base", + "//components/translate/core/browser", + "//components/ukm/ios:features", "//components/unified_consent", "//ios/chrome/app/strings", + "//ios/chrome/browser/content_settings:content_settings", + "//ios/chrome/browser/ntp:features", + "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/authentication/cells", "//ios/chrome/browser/ui/bookmarks:bookmarks_ui", "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant", @@ -355,22 +342,29 @@ source_set("eg_app_support+eg2") { "//ios/chrome/browser/ui/omnibox:omnibox_internal", "//ios/chrome/browser/ui/payments:payments_ui", "//ios/chrome/browser/ui/popup_menu:constants", + "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui_constants", "//ios/chrome/browser/ui/settings:settings", "//ios/chrome/browser/ui/settings/cells", "//ios/chrome/browser/ui/settings/clear_browsing_data", "//ios/chrome/browser/ui/settings/google_services", "//ios/chrome/browser/ui/settings/sync", "//ios/chrome/browser/ui/static_content", + "//ios/chrome/browser/ui/tab_grid:tab_grid_ui_constants", + "//ios/chrome/browser/ui/tab_grid/grid:grid_ui_constants", "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/util", "//ios/chrome/test/app:test_support", "//ios/testing:nserror_support", "//ios/testing/earl_grey:eg_app_support+eg2", "//ios/third_party/earl_grey2:app_framework+link", + "//ios/third_party/gtx:gtx+link", "//ios/web:eg_app_support+eg2", + "//ios/web/common", + "//ios/web/public", "//ios/web/public/deprecated", "//ios/web/public/test:element_selector", "//ios/web/public/test:util", + "//services/metrics/public/cpp:metrics_cpp", "//ui/base", "//ui/base:test_support", ] @@ -385,6 +379,8 @@ source_set("eg_test_support+eg2") { testonly = true sources = [ + "accessibility_util.h", + "accessibility_util.mm", "chrome_actions.h", "chrome_actions.mm", "chrome_actions_app_interface.h", @@ -395,13 +391,14 @@ source_set("eg_test_support+eg2") { "chrome_earl_grey_ui.mm", "chrome_egtest_bundle_main.h", "chrome_egtest_bundle_main.mm", - "chrome_error_util.h", "chrome_matchers.h", "chrome_matchers.mm", "chrome_matchers_app_interface.h", "chrome_test_case.h", "chrome_test_case.mm", "chrome_test_case_app_interface.h", + "scoped_block_popups_pref.h", + "scoped_block_popups_pref.mm", ] deps = [ @@ -412,9 +409,14 @@ source_set("eg_test_support+eg2") { "//components/sync/base", "//ios/chrome/app/strings", "//ios/chrome/browser/ui/popup_menu:constants", + "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui_constants", + "//ios/chrome/browser/ui/tab_grid:tab_grid_ui_constants", + "//ios/chrome/browser/ui/tab_grid/grid:grid_ui_constants", + "//ios/testing:http_server_bundle_data", "//ios/testing:nserror_support", "//ios/testing/earl_grey:eg_test_support+eg2", "//ios/third_party/earl_grey2:test_lib", + "//ios/third_party/gtx:gtx+link", "//ios/web/public/test:element_selector", "//ios/web/public/test/http_server", "//net:test_support", diff --git a/chromium/ios/chrome/test/earl_grey2/BUILD.gn b/chromium/ios/chrome/test/earl_grey2/BUILD.gn index fa31f9264d6..a7563eda40c 100644 --- a/chromium/ios/chrome/test/earl_grey2/BUILD.gn +++ b/chromium/ios/chrome/test/earl_grey2/BUILD.gn @@ -39,7 +39,11 @@ chrome_ios_eg2_test("ios_chrome_ui_eg2tests_module") { xcode_test_application_name = "ios_chrome_eg2tests" deps = [ + "//ios/chrome/browser/ui/activity_services:eg2_tests", "//ios/chrome/browser/ui/download:eg2_tests", + "//ios/chrome/browser/ui/omnibox/popup:eg2_tests", + "//ios/chrome/browser/ui/open_in:eg2_tests", + "//ios/chrome/browser/ui/toolbar:eg2_tests", ] } diff --git a/chromium/ios/chrome/test/earl_grey2/chrome_ios_eg2_test.gni b/chromium/ios/chrome/test/earl_grey2/chrome_ios_eg2_test.gni index 3a230f142f1..cb947e0f732 100644 --- a/chromium/ios/chrome/test/earl_grey2/chrome_ios_eg2_test.gni +++ b/chromium/ios/chrome/test/earl_grey2/chrome_ios_eg2_test.gni @@ -102,6 +102,7 @@ template("chrome_ios_eg2_test_app_host") { bundle_deps += [ "//ios/chrome/app/resources", "//ios/third_party/earl_grey2:app_framework+bundle", + "//ios/third_party/gtx:gtx+bundle", ios_application_icons_target, ] @@ -155,7 +156,10 @@ template("chrome_ios_eg2_test") { } deps += [ "//ios/chrome/test/earl_grey:eg_test_support+eg2" ] - bundle_deps = [ "//ios/chrome/app/resources" ] + bundle_deps = [ + "//ios/chrome/app/resources", + "//ios/third_party/gtx:gtx+bundle", + ] } } diff --git a/chromium/ios/chrome/test/wpt/BUILD.gn b/chromium/ios/chrome/test/wpt/BUILD.gn new file mode 100644 index 00000000000..a70b635143c --- /dev/null +++ b/chromium/ios/chrome/test/wpt/BUILD.gn @@ -0,0 +1,90 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/ios/ios_sdk.gni") +import("//build/config/ios/rules.gni") +import("//ios/chrome/test/earl_grey2/chrome_ios_eg2_test.gni") + +group("all_tests") { + testonly = true + deps = [ + ":ios_cwt_chromedriver_tests", + ":ios_cwt_chromedriver_tests_module", + ] +} + +chrome_ios_eg2_test_app_host("ios_cwt_chromedriver_tests") { + deps = [ + ":eg_app_support+eg2", + ] +} + +chrome_ios_eg2_test("ios_cwt_chromedriver_tests_module") { + xcode_test_application_name = "ios_cwt_chromedriver_tests" + + deps = [ + ":cwt_chromedriver_tests", + ] +} + +source_set("shared_helper_headers") { + testonly = true + sources = [ + "cwt_webdriver_app_interface.h", + ] +} + +source_set("eg_app_support+eg2") { + defines = [ "CHROME_EARL_GREY_2" ] + testonly = true + configs += [ "//build/config/compiler:enable_arc" ] + + sources = [ + "cwt_webdriver_app_interface.mm", + ] + + deps = [ + "//base", + "//base/test:test_support", + "//ios/chrome/app:app_internal", + "//ios/chrome/browser/tabs:tabs", + "//ios/chrome/browser/web:tab_id_tab_helper", + "//ios/chrome/browser/web_state_list", + "//ios/chrome/test/app:test_support", + "//ios/testing:nserror_support", + "//ios/testing/earl_grey:eg_app_support+eg2", + "//ios/third_party/earl_grey2:app_framework+link", + "//ios/web/public/test", + "//ui/gfx", + ] + + public_deps = [ + ":shared_helper_headers", + ] +} + +source_set("cwt_chromedriver_tests") { + defines = [ "CHROME_EARL_GREY_2" ] + testonly = true + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + + sources = [ + "cwt_chrome_driver.mm", + "cwt_request_handler.h", + "cwt_request_handler.mm", + ] + + deps = [ + ":shared_helper_headers", + "//components/version_info:version_info", + "//ios/testing/earl_grey:eg_test_support+eg2", + "//ios/third_party/earl_grey2:test_lib", + "//net:test_support", + ] + + libs = [ "UIKit.framework" ] +} diff --git a/chromium/ios/public/provider/chrome/browser/signin/BUILD.gn b/chromium/ios/public/provider/chrome/browser/signin/BUILD.gn index a931d2c0527..ec1f08c90f8 100644 --- a/chromium/ios/public/provider/chrome/browser/signin/BUILD.gn +++ b/chromium/ios/public/provider/chrome/browser/signin/BUILD.gn @@ -19,6 +19,7 @@ source_set("signin") { ] deps = [ "//base", + "//google_apis", ] } @@ -38,6 +39,7 @@ source_set("test_support") { deps = [ ":signin", "//base", + "//components/signin/public/identity_manager", "//google_apis", "//ios/public/provider/chrome/browser", "//ui/base:test_support", diff --git a/chromium/ios/testing/earl_grey/BUILD.gn b/chromium/ios/testing/earl_grey/BUILD.gn index 7a5367bdb2b..3d493c8dbb1 100644 --- a/chromium/ios/testing/earl_grey/BUILD.gn +++ b/chromium/ios/testing/earl_grey/BUILD.gn @@ -15,8 +15,12 @@ source_set("earl_grey_support") { ] sources = [ + "app_launch_manager.h", + "app_launch_manager.mm", "base_earl_grey_test_case.h", "base_earl_grey_test_case.mm", + "base_earl_grey_test_case_app_interface.h", + "base_earl_grey_test_case_app_interface.mm", "base_eg_test_helper_impl.h", "base_eg_test_helper_impl.mm", "coverage_utils.h", @@ -43,6 +47,8 @@ source_set("eg_app_support+eg2") { ] sources = [ + "base_earl_grey_test_case_app_interface.h", + "base_earl_grey_test_case_app_interface.mm", "coverage_utils.h", "coverage_utils.mm", "earl_grey_app.h", @@ -59,8 +65,11 @@ source_set("eg_test_support+eg2") { testonly = true sources = [ + "app_launch_manager.h", + "app_launch_manager.mm", "base_earl_grey_test_case.h", "base_earl_grey_test_case.mm", + "base_earl_grey_test_case_app_interface.h", "base_eg_test_helper_impl.h", "base_eg_test_helper_impl.mm", "coverage_utils.h", diff --git a/chromium/ios/third_party/earl_grey/BUILD.gn b/chromium/ios/third_party/earl_grey/BUILD.gn index 5b1c3ec5574..710332d1ad4 100644 --- a/chromium/ios/third_party/earl_grey/BUILD.gn +++ b/chromium/ios/third_party/earl_grey/BUILD.gn @@ -295,6 +295,10 @@ ios_framework_bundle("earl_grey") { "//ios/third_party/ochamcrest:ochamcrest+link", ] + # EG1 is no longer maintained and will be dropped once the migration to EG2 + # is complete. + cflags_objc = [ "-Wno-deprecated-declarations" ] + libs = [ "CoreData.framework", "CoreGraphics.framework", diff --git a/chromium/ios/third_party/earl_grey2/BUILD.gn b/chromium/ios/third_party/earl_grey2/BUILD.gn index a3c935e3c45..2e3dfd2d3ac 100644 --- a/chromium/ios/third_party/earl_grey2/BUILD.gn +++ b/chromium/ios/third_party/earl_grey2/BUILD.gn @@ -8,7 +8,41 @@ import("//build/config/ios/rules.gni") config("config") { include_dirs = [ "//ios/third_party/earl_grey2/src", + "//ios/third_party/earl_grey2/src/AppFramework/Action", + "//ios/third_party/earl_grey2/src/AppFramework/Assertion", + "//ios/third_party/earl_grey2/src/AppFramework/Config", + "//ios/third_party/earl_grey2/src/AppFramework/Core", + "//ios/third_party/earl_grey2/src/AppFramework/DistantObject", + "//ios/third_party/earl_grey2/src/AppFramework/Error", + "//ios/third_party/earl_grey2/src/AppFramework/Event", + "//ios/third_party/earl_grey2/src/AppFramework/Keyboard", + "//ios/third_party/earl_grey2/src/AppFramework/Matcher", + "//ios/third_party/earl_grey2/src/AppFramework/Synchronization", + "//ios/third_party/earl_grey2/src/CommonLib", + "//ios/third_party/earl_grey2/src/CommonLib/Additions", + "//ios/third_party/earl_grey2/src/CommonLib/Assertion", + "//ios/third_party/earl_grey2/src/CommonLib/Config", + "//ios/third_party/earl_grey2/src/CommonLib/DistantObject", + "//ios/third_party/earl_grey2/src/CommonLib/Error", + "//ios/third_party/earl_grey2/src/CommonLib/Event", + "//ios/third_party/earl_grey2/src/CommonLib/Exceptions", + "//ios/third_party/earl_grey2/src/CommonLib/Matcher", + "//ios/third_party/earl_grey2/src/CommonLib/Provider", + "//ios/third_party/earl_grey2/src/UILib", + "//ios/third_party/earl_grey2/src/UILib/Additions", + "//ios/third_party/earl_grey2/src/UILib/Provider", + "//ios/third_party/earl_grey2/src/UILib/Traversal", + "//ios/third_party/earl_grey2/src/TestLib", + "//ios/third_party/earl_grey2/src/TestLib/AlertHandling", + "//ios/third_party/earl_grey2/src/TestLib/AppleInternals", + "//ios/third_party/earl_grey2/src/TestLib/Assertion", + "//ios/third_party/earl_grey2/src/TestLib/Condition", + "//ios/third_party/earl_grey2/src/TestLib/Config", + "//ios/third_party/earl_grey2/src/TestLib/Exception", + "//ios/third_party/earl_grey2/src/TestLib/DistantObject", + "//ios/third_party/earl_grey2/src/TestLib/XCTestCase", "//ios/third_party/edo/src", + "//ios/third_party/edo/src/Service/Sources", ] } @@ -37,15 +71,24 @@ source_set("common_lib") { "src/CommonLib/Additions/UIView+GREYCommon.h", "src/CommonLib/Additions/UIView+GREYCommon.m", "src/CommonLib/Assertion/GREYAssertion.h", + "src/CommonLib/Assertion/GREYAssertionBlock+Private.h", "src/CommonLib/Assertion/GREYAssertionBlock.h", "src/CommonLib/Assertion/GREYAssertionBlock.m", + "src/CommonLib/Assertion/GREYAssertionDefinesPrivate.h", + "src/CommonLib/Assertion/GREYFatalAsserts.h", + "src/CommonLib/Assertion/GREYThrowDefines.h", "src/CommonLib/Config/GREYAppState.h", "src/CommonLib/Config/GREYConfigKey.h", "src/CommonLib/Config/GREYConfigKey.m", "src/CommonLib/Config/GREYConfiguration+Private.h", "src/CommonLib/Config/GREYConfiguration.h", "src/CommonLib/Config/GREYConfiguration.m", + "src/CommonLib/DistantObject/GREYHostApplicationDistantObject.h", + "src/CommonLib/DistantObject/GREYHostBackgroundDistantObject.h", + "src/CommonLib/DistantObject/GREYTestApplicationDistantObject+Private.h", + "src/CommonLib/DistantObject/GREYTestApplicationDistantObject.h", "src/CommonLib/DistantObject/GREYValueType.m", + "src/CommonLib/Error/GREYError+Private.h", "src/CommonLib/Error/GREYError.h", "src/CommonLib/Error/GREYError.m", "src/CommonLib/Error/GREYErrorConstants.h", @@ -62,8 +105,12 @@ source_set("common_lib") { "src/CommonLib/Exceptions/GREYFailureHandler.h", "src/CommonLib/Exceptions/GREYFrameworkException.h", "src/CommonLib/Exceptions/GREYFrameworkException.m", + "src/CommonLib/GREYAppleInternals.h", "src/CommonLib/GREYConstants.h", "src/CommonLib/GREYConstants.m", + "src/CommonLib/GREYDefines.h", + "src/CommonLib/GREYDiagnosable.h", + "src/CommonLib/GREYLogger.h", "src/CommonLib/GREYObjcRuntime.h", "src/CommonLib/GREYObjcRuntime.m", "src/CommonLib/GREYStopwatch.h", @@ -73,12 +120,15 @@ source_set("common_lib") { "src/CommonLib/Matcher/GREYBaseMatcher.h", "src/CommonLib/Matcher/GREYBaseMatcher.m", "src/CommonLib/Matcher/GREYDescription.h", + "src/CommonLib/Matcher/GREYElementMatcherBlock+Private.h", "src/CommonLib/Matcher/GREYElementMatcherBlock.h", "src/CommonLib/Matcher/GREYElementMatcherBlock.m", "src/CommonLib/Matcher/GREYLayoutConstraint.h", "src/CommonLib/Matcher/GREYLayoutConstraint.m", + "src/CommonLib/Matcher/GREYMatcher.h", "src/CommonLib/Matcher/GREYStringDescription.h", "src/CommonLib/Matcher/GREYStringDescription.m", + "src/CommonLib/Provider/GREYProvider.h", ] deps = [ @@ -122,9 +172,9 @@ source_set("ui_lib") { "src/UILib/Additions/NSObject+GREYUI.h", "src/UILib/Additions/NSObject+GREYUI.m", "src/UILib/GREYElementHierarchy.m", - "src/UILib/GREYScreenshotter+Internal.h", + "src/UILib/GREYScreenshotter+Private.h", "src/UILib/GREYScreenshotter.m", - "src/UILib/GREYVisibilityChecker+Internal.h", + "src/UILib/GREYVisibilityChecker+Private.h", "src/UILib/GREYVisibilityChecker.m", "src/UILib/Provider/GREYDataEnumerator.h", "src/UILib/Provider/GREYDataEnumerator.m", @@ -132,12 +182,14 @@ source_set("ui_lib") { "src/UILib/Provider/GREYElementProvider.m", "src/UILib/Provider/GREYUIWindowProvider.h", "src/UILib/Provider/GREYUIWindowProvider.m", - "src/UILib/Traversal/GREYTraversal.h", - "src/UILib/Traversal/GREYTraversal.m", "src/UILib/Traversal/GREYTraversalBFS.h", "src/UILib/Traversal/GREYTraversalBFS.m", "src/UILib/Traversal/GREYTraversalDFS.h", "src/UILib/Traversal/GREYTraversalDFS.m", + "src/UILib/Traversal/GREYTraversalFunctions.h", + "src/UILib/Traversal/GREYTraversalFunctions.m", + "src/UILib/Traversal/GREYTraversalObject.h", + "src/UILib/Traversal/GREYTraversalObject.m", ] deps = [ @@ -175,6 +227,7 @@ source_set("app_framework_shared_headers") { "src/AppFramework/Action/GREYActionsShorthand.h", "src/AppFramework/Config/GREYAppConfiguration.h", "src/AppFramework/Core/GREYElementInteraction.h", + "src/AppFramework/Core/GREYInteraction.h", "src/AppFramework/DistantObject/GREYHostApplicationDistantObject+GREYTestHelper.h", "src/AppFramework/DistantObject/GREYHostBackgroundDistantObject+GREYApp.h", "src/AppFramework/Error/GREYFailureScreenshotter.h", @@ -184,7 +237,6 @@ source_set("app_framework_shared_headers") { "src/AppFramework/Matcher/GREYAnyOf.h", "src/AppFramework/Matcher/GREYMatchers.h", "src/AppFramework/Matcher/GREYMatchersShorthand.h", - "src/AppFramework/Matcher/GREYNot.h", "src/AppFramework/Synchronization/GREYUIThreadExecutor.h", ] } @@ -196,12 +248,11 @@ ios_framework_bundle("app_framework") { info_plist = "Info.plist" sources = [ - "src/AppFramework/Action/GREYAction.h", + "src/AppFramework/Action/GREYActionBlock+Private.h", "src/AppFramework/Action/GREYActionBlock.h", "src/AppFramework/Action/GREYActionBlock.m", - "src/AppFramework/Action/GREYActions+Internal.h", + "src/AppFramework/Action/GREYActions+Private.h", "src/AppFramework/Action/GREYActions.m", - "src/AppFramework/Action/GREYActionsShorthand.h", "src/AppFramework/Action/GREYActionsShorthand.m", "src/AppFramework/Action/GREYBaseAction.h", "src/AppFramework/Action/GREYBaseAction.m", @@ -231,8 +282,6 @@ ios_framework_bundle("app_framework") { "src/AppFramework/Additions/CAAnimation+GREYApp.m", "src/AppFramework/Additions/CALayer+GREYApp.h", "src/AppFramework/Additions/CALayer+GREYApp.m", - "src/AppFramework/Additions/NSException+GREYApp.h", - "src/AppFramework/Additions/NSException+GREYApp.m", "src/AppFramework/Additions/NSObject+GREYApp.h", "src/AppFramework/Additions/NSObject+GREYApp.m", "src/AppFramework/Additions/NSRunLoop+GREYApp.h", @@ -272,9 +321,8 @@ ios_framework_bundle("app_framework") { "src/AppFramework/Config/GREYAppConfiguration.m", "src/AppFramework/Core/GREYElementFinder.h", "src/AppFramework/Core/GREYElementFinder.m", - "src/AppFramework/Core/GREYElementInteraction+Internal.h", + "src/AppFramework/Core/GREYElementInteraction+Private.h", "src/AppFramework/Core/GREYElementInteraction.m", - "src/AppFramework/Core/GREYInteraction.h", "src/AppFramework/Core/GREYInteractionDataSource.h", "src/AppFramework/Delegate/GREYCAAnimationDelegate.h", "src/AppFramework/Delegate/GREYCAAnimationDelegate.m", @@ -290,8 +338,6 @@ ios_framework_bundle("app_framework") { "src/AppFramework/DistantObject/GREYHostBackgroundDistantObject.m", "src/AppFramework/DistantObject/GREYTestStub.m", "src/AppFramework/Error/GREYAppError.h", - "src/AppFramework/Error/GREYAppFailureHandler.h", - "src/AppFramework/Error/GREYAppFailureHandler.m", "src/AppFramework/Error/GREYFailureScreenshotter.m", "src/AppFramework/Event/GREYIOHIDEventTypes.h", "src/AppFramework/Event/GREYSyntheticEvents.m", @@ -311,11 +357,11 @@ ios_framework_bundle("app_framework") { "src/AppFramework/IdlingResources/GREYUIWebViewIdlingResource.h", "src/AppFramework/IdlingResources/GREYUIWebViewIdlingResource.m", "src/AppFramework/Keyboard/GREYKeyboard.m", + "src/AppFramework/Matcher/GREYAllOf+Private.h", "src/AppFramework/Matcher/GREYAllOf.m", "src/AppFramework/Matcher/GREYAnyOf.m", "src/AppFramework/Matcher/GREYMatchers.m", "src/AppFramework/Matcher/GREYMatchersShorthand.m", - "src/AppFramework/Matcher/GREYNot.m", "src/AppFramework/Synchronization/GREYAppStateTracker.h", "src/AppFramework/Synchronization/GREYAppStateTracker.m", "src/AppFramework/Synchronization/GREYAppStateTrackerObject.h", @@ -328,7 +374,7 @@ ios_framework_bundle("app_framework") { "src/AppFramework/Synchronization/GREYRunLoopSpinner.m", "src/AppFramework/Synchronization/GREYSyncAPI.h", "src/AppFramework/Synchronization/GREYSyncAPI.m", - "src/AppFramework/Synchronization/GREYUIThreadExecutor+Internal.h", + "src/AppFramework/Synchronization/GREYUIThreadExecutor+Private.h", "src/AppFramework/Synchronization/GREYUIThreadExecutor.m", ] @@ -383,17 +429,17 @@ source_set("test_lib") { sources = [ "src/AppFramework/Action/GREYActionsShorthand.m", - "src/AppFramework/Error/GREYFailureScreenshotterStub.m", "src/AppFramework/Matcher/GREYMatchersShorthand.m", "src/TestLib/AlertHandling/XCTestCase+GREYSystemAlertHandler.h", "src/TestLib/AlertHandling/XCTestCase+GREYSystemAlertHandler.m", - "src/TestLib/Analytics/GREYAnalytics.h", - "src/TestLib/Analytics/GREYAnalytics.m", - "src/TestLib/Analytics/GREYAnalyticsDelegate.h", + "src/TestLib/AppleInternals/GREYXCTestAppleInternals.h", + "src/TestLib/Assertion/GREYAssertionDefines.h", "src/TestLib/Condition/GREYCondition.h", "src/TestLib/Condition/GREYCondition.m", + "src/TestLib/Config/GREYTestConfiguration.h", "src/TestLib/Config/GREYTestConfiguration.m", "src/TestLib/DistantObject/GREYHostStub.m", + "src/TestLib/DistantObject/GREYTestApplicationDistantObject+GREYLogger.h", "src/TestLib/DistantObject/GREYTestApplicationDistantObject+GREYLogger.m", "src/TestLib/DistantObject/GREYTestApplicationDistantObject.m", "src/TestLib/EarlGreyImpl/EarlGrey.h", @@ -404,6 +450,8 @@ source_set("test_lib") { "src/TestLib/EarlGreyImpl/GREYElementInteractionErrorHandler.m", "src/TestLib/EarlGreyImpl/GREYElementInteractionProxy.h", "src/TestLib/EarlGreyImpl/GREYElementInteractionProxy.m", + "src/TestLib/EarlGreyImpl/GREYRemoteExecutor.h", + "src/TestLib/EarlGreyImpl/GREYRemoteExecutor.m", "src/TestLib/EarlGreyImpl/XCUIApplication+GREYTest.h", "src/TestLib/EarlGreyImpl/XCUIApplication+GREYTest.m", "src/TestLib/Exception/GREYDefaultFailureHandler.h", @@ -418,20 +466,17 @@ source_set("test_lib") { "src/TestLib/XCTestCase/XCTestCase+GREYTest.m", "src/TestLib/XCTestCase/XCUIApplication+GREYEnvironment.h", "src/TestLib/XCTestCase/XCUIApplication+GREYEnvironment.m", - "src/UILib/GREYElementHierarchyStub.m", - "src/UILib/GREYScreenshotterStub.m", - "src/UILib/GREYVisibilityCheckerStub.m", ] deps = [ ":app_framework_shared_headers", - ":common_lib", ":ui_lib_shared_headers", "//build/config/ios:xctest", "//ios/third_party/edo", ] public_deps = [ + ":common_lib", ":test_lib_shared_headers", ] diff --git a/chromium/ios/third_party/earl_grey2/ios_eg2_test.gni b/chromium/ios/third_party/earl_grey2/ios_eg2_test.gni index 1723aaa7f63..676e290d7e7 100644 --- a/chromium/ios/third_party/earl_grey2/ios_eg2_test.gni +++ b/chromium/ios/third_party/earl_grey2/ios_eg2_test.gni @@ -31,11 +31,14 @@ template("ios_eg2_test_app_host") { deps += [ "//ios/third_party/firebase" ] } - # Xcode needs those two framework installed in the application (and signed) - # for the XCTest to run, so install them using extra_system_frameworks. + # Xcode needs the following frameworks installed in the application (and + # signed) for the XCTest to run, so install them using + # extra_system_frameworks. _ios_platform_library = "$ios_sdk_platform_path/Developer/Library" - extra_system_frameworks = - [ "$_ios_platform_library/Frameworks/XCTest.framework" ] + extra_system_frameworks = [ + "$_ios_platform_library/Frameworks/XCTest.framework", + "$ios_sdk_platform_path/Developer/Library/PrivateFrameworks/XCTAutomationSupport.framework", + ] if (!defined(ldflags)) { ldflags = [] diff --git a/chromium/ios/third_party/material_components_ios/BUILD.gn b/chromium/ios/third_party/material_components_ios/BUILD.gn index 477a419948c..aeb56abc236 100644 --- a/chromium/ios/third_party/material_components_ios/BUILD.gn +++ b/chromium/ios/third_party/material_components_ios/BUILD.gn @@ -15,7 +15,10 @@ copy("mdc_components_ios_public_headers") { "src/components/Buttons/src/ShapeThemer/MaterialButtons+ShapeThemer.h", "src/components/Buttons/src/TypographyThemer/MaterialButtons+TypographyThemer.h", "src/components/Cards/src/MaterialCards.h", + "src/components/Dialogs/src/ColorThemer/MaterialDialogs+ColorThemer.h", + "src/components/Dialogs/src/MDCAlertController+ButtonForAction.h", "src/components/Dialogs/src/MaterialDialogs.h", + "src/components/Dialogs/src/TypographyThemer/MaterialDialogs+TypographyThemer.h", "src/components/ShadowElevations/src/MaterialShadowElevations.h", "src/components/Typography/src/MaterialTypography.h", "src/components/schemes/Color/src/MaterialColorScheme.h", @@ -61,6 +64,7 @@ config("config") { "src/components/Typography/src", "src/components/Shapes/src/", "src/components/private/UIMetrics/src", + "src/components/private/Color/src", "src/components/schemes/Color/src", "src/components/schemes/Container/src/", "src/components/schemes/Shape/src", @@ -221,6 +225,8 @@ source_set("material_components_ios") { "src/components/Dialogs/src/DialogThemer/MDCAlertControllerThemer.m", "src/components/Dialogs/src/DialogThemer/MDCAlertScheme.h", "src/components/Dialogs/src/DialogThemer/MDCAlertScheme.m", + "src/components/Dialogs/src/MDCAlertController+ButtonForAction.h", + "src/components/Dialogs/src/MDCAlertController+ButtonForAction.m", "src/components/Dialogs/src/MDCAlertController.h", "src/components/Dialogs/src/MDCAlertController.m", "src/components/Dialogs/src/MDCAlertControllerView.h", @@ -229,6 +235,8 @@ source_set("material_components_ios") { "src/components/Dialogs/src/MDCDialogTransitionController.h", "src/components/Dialogs/src/MDCDialogTransitionController.m", "src/components/Dialogs/src/MaterialDialogs.h", + "src/components/Dialogs/src/Theming/MDCAlertController+MaterialTheming.h", + "src/components/Dialogs/src/Theming/MDCAlertController+MaterialTheming.m", "src/components/Dialogs/src/TypographyThemer/MDCAlertTypographyThemer.h", "src/components/Dialogs/src/TypographyThemer/MDCAlertTypographyThemer.m", "src/components/Dialogs/src/UIViewController+MaterialDialogs.h", @@ -363,6 +371,8 @@ source_set("material_components_ios") { "src/components/private/Application/src/MaterialApplication.h", "src/components/private/Application/src/UIApplication+AppExtensions.h", "src/components/private/Application/src/UIApplication+AppExtensions.m", + "src/components/private/Color/src/UIColor+MaterialDynamic.h", + "src/components/private/Color/src/UIColor+MaterialDynamic.m", "src/components/private/Icons/icons/ic_arrow_back/src/MaterialIcons+ic_arrow_back.h", "src/components/private/Icons/icons/ic_arrow_back/src/MaterialIcons+ic_arrow_back.m", "src/components/private/Icons/icons/ic_check/src/MaterialIcons+ic_check.h", diff --git a/chromium/ios/web/BUILD.gn b/chromium/ios/web/BUILD.gn index a18d25abf1b..bf6cd01f8dd 100644 --- a/chromium/ios/web/BUILD.gn +++ b/chromium/ios/web/BUILD.gn @@ -4,7 +4,6 @@ import("//ios/build/config.gni") import("//ios/web/js_compile.gni") -import("//mojo/public/tools/bindings/mojom.gni") import("//testing/test.gni") import("//tools/grit/grit_rule.gni") @@ -18,16 +17,16 @@ group("all_tests") { source_set("web") { public_deps = [ - ":service_names", + "//ios/web/public/service:service_names", # TODO(crbug.com/616244): Remove private files from public dependencies. - ":services", ":threads", "//ios/web/navigation:core", "//ios/web/net", "//ios/web/public", "//ios/web/public/download", "//ios/web/public/init", + "//ios/web/service", "//ios/web/web_state:web_state_impl_header", "//ios/web/web_state/ui", "//ios/web/web_state/ui:wk_web_view_configuration_provider", @@ -40,11 +39,11 @@ source_set("web") { ":js_resources", ":navigation_resources", ":resources", - ":services", ":threads", "//base", "//ios/web/common", "//ios/web/download", + "//ios/web/favicon", "//ios/web/init", "//ios/web/navigation", "//ios/web/net", @@ -52,14 +51,13 @@ source_set("web") { "//ios/web/public/security", "//ios/web/public/session", "//ios/web/security", + "//ios/web/service", "//ios/web/session", + "//ios/web/thread", "//ios/web/web_state", "//ios/web/web_state:web_view_internal_creation_util", "//services/network:network_service", - "//services/network/public/mojom", - "//services/service_manager", "//services/service_manager/public/cpp", - "//services/service_manager/public/mojom", ] sources = [ @@ -68,9 +66,7 @@ source_set("web") { "browser_url_rewriter_impl.mm", "crw_navigation_item_storage.mm", "network_context_owner.cc", - "url_scheme_util.mm", "web_client.mm", - "web_view_creation_util.mm", ] libs = [ "WebKit.framework" ] @@ -94,34 +90,6 @@ source_set("threads") { configs += [ "//build/config/compiler:enable_arc" ] } -source_set("services") { - deps = [ - ":service_names", - "//ios/web/public", - "//services/network:network_service", - "//services/network/public/mojom", - "//services/service_manager", - "//services/service_manager/public/cpp", - "//services/service_manager/public/mojom", - ] - sources = [ - "service_manager_connection_impl.cc", - "service_manager_connection_impl.h", - "service_manager_context.h", - "service_manager_context.mm", - "web_browser_manifest.h", - "web_browser_manifest.mm", - ] - - configs += [ "//build/config/compiler:enable_arc" ] -} - -mojom("service_names") { - sources = [ - "public/service_names.mojom", - ] -} - source_set("core") { configs += [ "//build/config/compiler:enable_arc" ] deps = [ @@ -238,6 +206,7 @@ test("ios_web_unittests") { "//ios/web/browsing_data:browsing_data_unittests", "//ios/web/common:unittests", "//ios/web/download:download_unittests", + "//ios/web/favicon:unittests", "//ios/web/find_in_page:find_in_page_unittests", "//ios/web/js_messaging:unittests", "//ios/web/security:unittests", @@ -268,7 +237,6 @@ source_set("ios_web_general_unittests") { "//ios/web/test:test_constants", "//ios/web/test:test_support", "//net:test_support", - "//services/service_manager/public/cpp", "//testing/gmock", "//testing/gtest", "//third_party/ocmock", @@ -279,9 +247,7 @@ source_set("ios_web_general_unittests") { "browser_state_unittest.cc", "history_state_util_unittest.mm", "network_context_owner_unittest.cc", - "service_manager_connection_impl_unittest.cc", "test/web_test_unittest.mm", - "url_scheme_util_unittest.mm", "web_client_unittest.mm", "web_thread_unittest.cc", ] @@ -314,7 +280,6 @@ source_set("ios_web_navigation_unittests") { "//ios/web/test/fakes", "//ios/web/web_state/ui:crw_web_view_navigation_proxy", "//net:test_support", - "//services/service_manager/public/cpp", "//testing/gmock", "//testing/gtest", "//third_party/ocmock", @@ -443,12 +408,14 @@ source_set("ios_web_web_state_unittests") { "//ios/testing:ocmock_support", "//ios/web", "//ios/web/common", + "//ios/web/common:web_view_creation_util", "//ios/web/find_in_page", "//ios/web/js_messaging", "//ios/web/navigation", "//ios/web/navigation:wk_navigation_util", "//ios/web/public", "//ios/web/public/deprecated", + "//ios/web/public/js_messaging", "//ios/web/public/security", "//ios/web/public/session", "//ios/web/public/test", @@ -475,7 +442,6 @@ source_set("ios_web_web_state_unittests") { sources = [ "web_state/context_menu_params_utils_unittest.mm", "web_state/page_display_state_unittest.mm", - "web_state/ui/wk_security_origin_util_unittest.mm", "web_state/web_state_delegate_bridge_unittest.mm", "web_state/web_state_impl_unittest.mm", "web_state/web_state_observer_bridge_unittest.mm", @@ -496,7 +462,9 @@ source_set("ios_web_web_state_js_unittests") { "//components/url_formatter", "//ios/net", "//ios/testing:ocmock_support", + "//ios/web/common:web_view_creation_util", "//ios/web/find_in_page", + "//ios/web/js_messaging", "//ios/web/public", "//ios/web/public/deprecated", "//ios/web/public/js_messaging", @@ -507,8 +475,6 @@ source_set("ios_web_web_state_js_unittests") { "//ios/web/test:test_support", "//ios/web/web_state:context_menu", "//ios/web/web_state/js", - "//ios/web/web_state/js:script_util", - "//ios/web/web_state/ui:crw_wk_script_message_router", "//net:test_support", "//services/service_manager/public/cpp", "//testing/gmock", @@ -521,10 +487,8 @@ source_set("ios_web_web_state_js_unittests") { "web_state/js/common_js_unittest.mm", "web_state/js/context_menu_js_unittest.mm", "web_state/js/crw_js_injection_manager_unittest.mm", - "web_state/js/crw_js_window_id_manager_unittest.mm", "web_state/js/find_in_page_js_unittest.mm", "web_state/js/message_js_unittest.mm", - "web_state/js/page_script_util_unittest.mm", ] } @@ -540,6 +504,7 @@ source_set("ios_web_web_state_ui_unittests") { "//ios/net", "//ios/testing:ocmock_support", "//ios/web/common", + "//ios/web/js_messaging", "//ios/web/navigation", "//ios/web/navigation:block_universal_links_buildflags", "//ios/web/navigation:core", @@ -555,11 +520,7 @@ source_set("ios_web_web_state_ui_unittests") { "//ios/web/test/fakes:fakes", "//ios/web/web_state:context_menu", "//ios/web/web_state/js", - "//ios/web/web_state/js:script_util", "//ios/web/web_state/ui:crw_context_menu_controller", - "//ios/web/web_state/ui:crw_wk_script_message_router", - "//ios/web/web_state/ui:favicon_util", - "//ios/web/web_state/ui:web_view_js_utils", "//net:test_support", "//services/service_manager/public/cpp", "//testing/gmock", @@ -573,8 +534,6 @@ source_set("ios_web_web_state_ui_unittests") { "web_state/ui/crw_web_view_content_view_unittest.mm", "web_state/ui/crw_web_view_proxy_impl_unittest.mm", "web_state/ui/crw_web_view_scroll_view_proxy_unittest.mm", - "web_state/ui/crw_wk_script_message_router_unittest.mm", - "web_state/ui/favicon_util_unittest.mm", "web_state/ui/html_element_fetch_request_unittest.mm", "web_state/ui/web_view_js_utils_unittest.mm", "web_state/ui/wk_web_view_configuration_provider_unittest.mm", @@ -623,7 +582,9 @@ test("ios_web_inttests") { "//ios/testing:http_server_bundle_data", "//ios/web:resources_grit", "//ios/web/common", + "//ios/web/common:web_view_creation_util", "//ios/web/download:download_inttests", + "//ios/web/favicon:inttests", "//ios/web/js_messaging:inttests", "//ios/web/navigation", "//ios/web/navigation:core", @@ -664,7 +625,6 @@ test("ios_web_inttests") { "url_loader_inttest.mm", "web_state/bad_ssl_response_inttest.mm", "web_state/error_page_inttest.mm", - "web_state/favicon_callbacks_inttest.mm", "web_state/http_auth_inttest.mm", "web_state/keep_render_process_alive_inttest.mm", "web_state/web_state_observer_inttest.mm", @@ -680,7 +640,6 @@ js_compile_bundle("main_frame_web_bundle") { sources = [ "web_state/js/resources/error.js", - "web_state/js/resources/legacy.js", "web_state/js/resources/main_frame_context_menu.js", "web_state/js/resources/main_frame_web_bundle.js", "web_state/js/resources/navigation.js", @@ -693,12 +652,12 @@ js_compile_bundle("all_frames_web_bundle") { closure_entry_point = "__crWeb.allFramesWebBundle" sources = [ + "js_messaging/resources/message.js", "web_state/js/resources/all_frames_context_menu.js", "web_state/js/resources/all_frames_web_bundle.js", "web_state/js/resources/base.js", "web_state/js/resources/common.js", "web_state/js/resources/find_in_page.js", - "web_state/js/resources/message.js", ] } @@ -707,9 +666,19 @@ js_compile_bundle("all_frames_document_end_web_bundle") { closure_entry_point = "__crWeb.allFramesDocumentEndWebBundle" sources = [ + "js_messaging/resources/setup_frame.js", "web_state/js/resources/all_frames_document_end_web_bundle.js", "web_state/js/resources/plugin_placeholder.js", - "web_state/js/resources/setup_frame.js", + ] +} + +js_compile_bundle("main_frame_document_end_web_bundle") { + visibility = [ ":js_resources" ] + closure_entry_point = "__crWeb.mainFrameDocumentEndWebBundle" + + sources = [ + "favicon/resources/favicon.js", + "web_state/js/resources/main_frame_document_end_web_bundle.js", ] } @@ -726,12 +695,13 @@ js_compile_checked("js_resources") { public_deps = [ ":all_frames_document_end_web_bundle", ":all_frames_web_bundle", + ":main_frame_document_end_web_bundle", ":main_frame_web_bundle", ":nav_bundle", ] sources = [ - "web_state/js/resources/window_id.js", + "js_messaging/resources/window_id.js", ] } diff --git a/chromium/ios/web/common/BUILD.gn b/chromium/ios/web/common/BUILD.gn index a1561641ae5..9e56cb402c9 100644 --- a/chromium/ios/web/common/BUILD.gn +++ b/chromium/ios/web/common/BUILD.gn @@ -15,13 +15,15 @@ source_set("common") { "origin_util.mm", "referrer_util.cc", "referrer_util.h", + "url_scheme_util.h", + "url_scheme_util.mm", "url_util.cc", "url_util.h", ] deps = [ "//base", - "//ios/web/public:referrer", + "//ios/web/public/navigation", "//net", "//url", ] @@ -31,13 +33,31 @@ source_set("common") { configs += [ "//build/config/compiler:enable_arc" ] } +source_set("web_view_creation_util") { + sources = [ + "web_view_creation_util.h", + "web_view_creation_util.mm", + ] + + deps = [ + "//base", + "//ios/web/public:user_agent", + "//ios/web/web_state:web_view_internal_creation_util", + "//ios/web/web_state/ui:wk_web_view_configuration_provider", + ] + + libs = [ "UIKit.framework" ] + + configs += [ "//build/config/compiler:enable_arc" ] +} + source_set("unittests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true deps = [ ":common", "//base", - "//ios/web/public:referrer", + "//ios/web/public/navigation", "//net", "//testing/gtest", "//url", @@ -46,6 +66,7 @@ source_set("unittests") { sources = [ "origin_util_unittest.mm", "referrer_util_unittest.cc", + "url_scheme_util_unittest.mm", "url_util_unittest.cc", ] } diff --git a/chromium/ios/web/favicon/BUILD.gn b/chromium/ios/web/favicon/BUILD.gn new file mode 100644 index 00000000000..d8a81cb6839 --- /dev/null +++ b/chromium/ios/web/favicon/BUILD.gn @@ -0,0 +1,50 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//ios/build/config.gni") + +source_set("favicon") { + configs += [ "//build/config/compiler:enable_arc" ] + deps = [ + "//ios/web/public", + "//ios/web/web_state:web_state_impl_header", + ] + sources = [ + "favicon_manager.h", + "favicon_manager.mm", + "favicon_status.cc", + "favicon_url.cc", + "favicon_util.h", + "favicon_util.mm", + ] +} + +source_set("unittests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + deps = [ + "//base", + "//ios/web/favicon", + "//ios/web/public/favicon", + "//testing/gtest", + ] + sources = [ + "favicon_util_unittest.mm", + ] +} + +source_set("inttests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + deps = [ + "//base", + "//base/test:test_support", + "//ios/web/public", + "//ios/web/public:web_state_types", + "//ios/web/public/test", + ] + sources = [ + "favicon_callbacks_inttest.mm", + ] +} diff --git a/chromium/ios/web/init/BUILD.gn b/chromium/ios/web/init/BUILD.gn index ec5bee26442..93c2255539c 100644 --- a/chromium/ios/web/init/BUILD.gn +++ b/chromium/ios/web/init/BUILD.gn @@ -17,11 +17,11 @@ source_set("init") { "//base", "//base:i18n", "//crypto", - "//ios/web:services", "//ios/web:threads", "//ios/web/net", "//ios/web/public", "//ios/web/public/init", + "//ios/web/service", "//ios/web/webui", "//mojo/core/embedder", "//net", diff --git a/chromium/ios/web/js_compile.gni b/chromium/ios/web/js_compile.gni index 83bcc0b7dd7..c7051bb926d 100644 --- a/chromium/ios/web/js_compile.gni +++ b/chromium/ios/web/js_compile.gni @@ -122,7 +122,7 @@ template("js_compile_checked") { _js_modules = [ "//ios/web/web_state/js/resources/base.js", "//ios/web/web_state/js/resources/common.js", - "//ios/web/web_state/js/resources/message.js", + "//ios/web/js_messaging/resources/message.js", ] if (defined(invoker.js_modules)) { _js_modules += invoker.js_modules diff --git a/chromium/ios/web/js_messaging/BUILD.gn b/chromium/ios/web/js_messaging/BUILD.gn index e65f92fc7ef..7038bba5d9d 100644 --- a/chromium/ios/web/js_messaging/BUILD.gn +++ b/chromium/ios/web/js_messaging/BUILD.gn @@ -9,18 +9,30 @@ source_set("js_messaging") { deps = [ "//base", "//crypto", + "//ios/web/navigation:wk_navigation_util", "//ios/web/public", + "//ios/web/public/deprecated", "//ios/web/public/js_messaging", - "//ios/web/web_state:web_state_impl_header", + "//ios/web/web_view:util", "//url", ] sources = [ + "crw_js_injector.h", + "crw_js_injector.mm", + "crw_js_window_id_manager.h", + "crw_js_window_id_manager.mm", + "crw_wk_script_message_router.h", + "crw_wk_script_message_router.mm", + "page_script_util.h", + "page_script_util.mm", "web_frame_impl.h", "web_frame_impl.mm", "web_frame_util.mm", "web_frames_manager_impl.h", "web_frames_manager_impl.mm", + "web_view_js_utils.h", + "web_view_js_utils.mm", ] } @@ -32,13 +44,18 @@ source_set("unittests") { "//base", "//base/test:test_support", "//crypto", + "//ios/web/common:web_view_creation_util", "//ios/web/public/js_messaging", "//ios/web/public/test", "//ios/web/public/test/fakes", "//testing/gtest", + "//third_party/ocmock", ] sources = [ + "crw_js_window_id_manager_unittest.mm", + "crw_wk_script_message_router_unittest.mm", + "page_script_util_unittest.mm", "web_frame_impl_unittest.mm", "web_frame_util_unittest.mm", "web_frames_manager_impl_unittest.mm", diff --git a/chromium/ios/web/navigation/BUILD.gn b/chromium/ios/web/navigation/BUILD.gn index 559fd7e4c9f..ecdcc11ba3d 100644 --- a/chromium/ios/web/navigation/BUILD.gn +++ b/chromium/ios/web/navigation/BUILD.gn @@ -20,10 +20,12 @@ source_set("navigation") { "//ios/net", "//ios/web:core", "//ios/web/common", + "//ios/web/js_messaging", "//ios/web/navigation:wk_navigation_util", "//ios/web/public", - "//ios/web/public/deprecated", + "//ios/web/public/deprecated:deprecated_navigation_util", "//ios/web/public/download", + "//ios/web/public/js_messaging", "//ios/web/public/security", "//ios/web/public/session", "//ios/web/security", @@ -31,12 +33,15 @@ source_set("navigation") { "//ios/web/web_state:user_interaction", "//ios/web/web_state:web_state_impl_header", "//ios/web/web_state/ui:crw_web_view_navigation_proxy", + "//ios/web/web_state/ui/controller", "//ios/web/web_view:util", "//ui/base", "//url", ] sources = [ + "crw_js_navigation_handler.h", + "crw_js_navigation_handler.mm", "crw_navigation_item_holder.h", "crw_navigation_item_holder.mm", "crw_pending_navigation_info.h", @@ -44,6 +49,9 @@ source_set("navigation") { "crw_session_controller+private_constructors.h", "crw_session_controller.h", "crw_session_controller.mm", + "crw_web_view_navigation_observer.h", + "crw_web_view_navigation_observer.mm", + "crw_web_view_navigation_observer_delegate.h", "crw_wk_navigation_handler.h", "crw_wk_navigation_handler.mm", "crw_wk_navigation_states.h", @@ -83,7 +91,7 @@ source_set("core") { "//components/url_formatter:url_formatter", "//ios/web/navigation:wk_navigation_util", "//ios/web/public", - "//ios/web/public/deprecated", + "//ios/web/public/deprecated:deprecated_navigation_util", "//ios/web/public/security", "//ui/base", ] diff --git a/chromium/ios/web/public/BUILD.gn b/chromium/ios/web/public/BUILD.gn index e6586a6d6b2..6cd253eb424 100644 --- a/chromium/ios/web/public/BUILD.gn +++ b/chromium/ios/web/public/BUILD.gn @@ -6,9 +6,13 @@ import("//ios/build/config.gni") source_set("public") { public_deps = [ - ":referrer", + ":ui", ":user_agent", ":web_state_types", + "//ios/web/public/favicon", + "//ios/web/public/navigation", + "//ios/web/public/service", + "//ios/web/public/thread", "//net", "//services/network/public/cpp", "//services/network/public/mojom", @@ -23,41 +27,19 @@ source_set("public") { sources = [ "browser_state.h", - "browser_url_rewriter.h", - "favicon_status.cc", - "favicon_status.h", - "favicon_url.cc", - "favicon_url.h", "java_script_dialog_callback.h", "java_script_dialog_presenter.h", "java_script_dialog_type.h", - "navigation_item.h", - "navigation_manager.h", - "reload_type.h", - "service_manager_connection.h", - "url_scheme_util.h", - "url_schemes.h", "url_schemes.mm", "web_client.h", - "web_state/navigation_context.h", - "web_state/page_display_state.h", "web_state/page_display_state.mm", "web_state/ui/crw_web_view_proxy.h", "web_state/ui/crw_web_view_scroll_view_proxy.h", "web_state/web_state.h", "web_state/web_state_delegate.h", "web_state/web_state_delegate_bridge.h", - "web_state/web_state_interface_provider.cc", - "web_state/web_state_interface_provider.h", "web_state/web_state_observer_bridge.h", - "web_state/web_state_policy_decider.h", - "web_state/web_state_policy_decider_bridge.h", "web_state/web_state_user_data.h", - "web_task_traits.cc", - "web_task_traits.h", - "web_thread.h", - "web_thread_delegate.h", - "web_view_creation_util.h", ] libs = [ "WebKit.framework" ] @@ -69,8 +51,8 @@ source_set("public") { # deprecated. source_set("web_state_types") { deps = [ - ":referrer", "//base", + "//ios/web/public/navigation", "//url", ] sources = [ @@ -95,14 +77,9 @@ source_set("user_agent") { configs += [ "//build/config/compiler:enable_arc" ] } -source_set("referrer") { - deps = [ - "//base", - "//url", - ] - +source_set("ui") { sources = [ - "referrer.h", + "web_state/page_display_state.h", ] configs += [ "//build/config/compiler:enable_arc" ] diff --git a/chromium/ios/web/public/deprecated/BUILD.gn b/chromium/ios/web/public/deprecated/BUILD.gn index 02df02d3ae8..92c1e3626ab 100644 --- a/chromium/ios/web/public/deprecated/BUILD.gn +++ b/chromium/ios/web/public/deprecated/BUILD.gn @@ -21,9 +21,33 @@ source_set("deprecated") { "crw_native_content_holder.h", "crw_native_content_provider.h", "global_web_state_observer.h", + "url_verification_constants.h", + ] +} + +# A separate target is needed for util to prevent cyclic dependency, as +# "web_state:web_state_impl_header" depends on ":deprecated" target. +source_set("deprecated_web_util") { + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + ":deprecated", + "//ios/web/public", + "//ios/web/web_state:web_state_impl_header", + "//ios/web/web_state/ui", + ] + sources = [ + "crw_web_controller_util.h", + "crw_web_controller_util.mm", + ] +} + +source_set("deprecated_navigation_util") { + configs += [ "//build/config/compiler:enable_arc" ] + + sources = [ "navigation_item_list.h", "navigation_item_list.mm", - "url_verification_constants.h", ] } @@ -32,8 +56,8 @@ source_set("test_doubles") { deps = [ ":deprecated", + "//ios/web/js_messaging", "//ios/web/public", - "//ios/web/web_state/ui:web_view_js_utils", "//url", ] diff --git a/chromium/ios/web/public/favicon/BUILD.gn b/chromium/ios/web/public/favicon/BUILD.gn new file mode 100644 index 00000000000..517e9fa575c --- /dev/null +++ b/chromium/ios/web/public/favicon/BUILD.gn @@ -0,0 +1,16 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +source_set("favicon") { + configs += [ "//build/config/compiler:enable_arc" ] + deps = [ + "//ui/gfx", + "//ui/gfx/geometry", + "//url", + ] + sources = [ + "favicon_status.h", + "favicon_url.h", + ] +} diff --git a/chromium/ios/web/public/navigation/BUILD.gn b/chromium/ios/web/public/navigation/BUILD.gn new file mode 100644 index 00000000000..573e931a53f --- /dev/null +++ b/chromium/ios/web/public/navigation/BUILD.gn @@ -0,0 +1,27 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +source_set("navigation") { + deps = [ + "//ios/web/public:ui", + "//ios/web/public:user_agent", + "//ios/web/public/deprecated:deprecated_navigation_util", + "//ui/base", + "//url", + ] + + sources = [ + "browser_url_rewriter.h", + "navigation_context.h", + "navigation_item.h", + "navigation_manager.h", + "referrer.h", + "reload_type.h", + "url_schemes.h", + "web_state_policy_decider.h", + "web_state_policy_decider_bridge.h", + ] + + configs += [ "//build/config/compiler:enable_arc" ] +} diff --git a/chromium/ios/web/public/service/BUILD.gn b/chromium/ios/web/public/service/BUILD.gn new file mode 100644 index 00000000000..d92ed99cc9c --- /dev/null +++ b/chromium/ios/web/public/service/BUILD.gn @@ -0,0 +1,29 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//mojo/public/tools/bindings/mojom.gni") + +source_set("service") { + deps = [ + "//base", + "//services/network/public/cpp", + "//services/network/public/mojom", + "//services/service_manager/public/cpp", + "//services/service_manager/public/cpp:cpp_types", + "//services/service_manager/public/mojom", + ] + + sources = [ + "service_manager_connection.h", + "web_state_interface_provider.h", + ] + + configs += [ "//build/config/compiler:enable_arc" ] +} + +mojom("service_names") { + sources = [ + "service_names.mojom", + ] +} diff --git a/chromium/ios/web/public/service_names.mojom b/chromium/ios/web/public/service/service_names.mojom index 25c5a9094f9..25c5a9094f9 100644 --- a/chromium/ios/web/public/service_names.mojom +++ b/chromium/ios/web/public/service/service_names.mojom diff --git a/chromium/ios/web/public/session/BUILD.gn b/chromium/ios/web/public/session/BUILD.gn index 83d5b471784..3b6e0507079 100644 --- a/chromium/ios/web/public/session/BUILD.gn +++ b/chromium/ios/web/public/session/BUILD.gn @@ -7,8 +7,8 @@ source_set("session") { deps = [ "//base", "//ios/web/public", - "//ios/web/public:referrer", "//ios/web/public:user_agent", + "//ios/web/public/navigation", "//net", "//url", ] diff --git a/chromium/ios/web/public/test/BUILD.gn b/chromium/ios/web/public/test/BUILD.gn index 58666c50767..f4e8d7d774e 100644 --- a/chromium/ios/web/public/test/BUILD.gn +++ b/chromium/ios/web/public/test/BUILD.gn @@ -15,6 +15,7 @@ source_set("test") { "//base", "//base/test:test_support", "//ios/web:web", + "//ios/web/js_messaging", "//ios/web/navigation", "//ios/web/navigation:wk_navigation_util", "//ios/web/public/deprecated", @@ -65,10 +66,10 @@ source_set("util") { ":element_selector", "//base", "//base/test:test_support", + "//ios/web/js_messaging", "//ios/web/public:public", "//ios/web/public/deprecated", "//ios/web/web_state:web_state_impl_header", - "//ios/web/web_state/js:script_util", "//ios/web/web_state/ui:ui", "//ios/web/web_view:util", "//testing/gtest", diff --git a/chromium/ios/web/public/test/fakes/BUILD.gn b/chromium/ios/web/public/test/fakes/BUILD.gn index 9b17bb5dde9..431cc072d16 100644 --- a/chromium/ios/web/public/test/fakes/BUILD.gn +++ b/chromium/ios/web/public/test/fakes/BUILD.gn @@ -12,6 +12,7 @@ source_set("fakes") { "//ios/web/js_messaging", "//ios/web/navigation:core", "//ios/web/public/deprecated", + "//ios/web/public/deprecated:deprecated_navigation_util", "//ios/web/public/download", "//ios/web/public/find_in_page", "//ios/web/public/js_messaging", @@ -19,7 +20,6 @@ source_set("fakes") { "//ios/web/public/session", "//ios/web/test:test_constants", "//ios/web/web_state/ui:crw_web_view_navigation_proxy", - "//ios/web/web_state/ui:web_view_js_utils", "//ios/web/webui:webui", "//net:test_support", "//testing/gtest", @@ -47,6 +47,8 @@ source_set("fakes") { "fake_navigation_context.mm", "fake_web_frame.cc", "fake_web_frame.h", + "fake_web_frames_manager.h", + "fake_web_frames_manager.mm", "fake_web_state_policy_decider.h", "fake_web_state_policy_decider.mm", "test_browser_state.cc", diff --git a/chromium/ios/web/public/thread/BUILD.gn b/chromium/ios/web/public/thread/BUILD.gn new file mode 100644 index 00000000000..2e4525a7096 --- /dev/null +++ b/chromium/ios/web/public/thread/BUILD.gn @@ -0,0 +1,15 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +source_set("thread") { + configs += [ "//build/config/compiler:enable_arc" ] + deps = [ + "//base", + ] + sources = [ + "web_task_traits.h", + "web_thread.h", + "web_thread_delegate.h", + ] +} diff --git a/chromium/ios/web/security/BUILD.gn b/chromium/ios/web/security/BUILD.gn index 6505171583e..7ef814c1be7 100644 --- a/chromium/ios/web/security/BUILD.gn +++ b/chromium/ios/web/security/BUILD.gn @@ -10,12 +10,13 @@ source_set("security") { deps = [ "//base", "//ios/web/common", + "//ios/web/common:web_view_creation_util", + "//ios/web/js_messaging", "//ios/web/navigation:core", "//ios/web/navigation:navigation_manager_util", "//ios/web/public", "//ios/web/public/security", "//ios/web/web_state:web_state_impl_header", - "//ios/web/web_state/ui:web_view_js_utils", "//net", "//ui/gfx/geometry", ] diff --git a/chromium/ios/web/service/BUILD.gn b/chromium/ios/web/service/BUILD.gn new file mode 100644 index 00000000000..05b529b97a9 --- /dev/null +++ b/chromium/ios/web/service/BUILD.gn @@ -0,0 +1,43 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +source_set("service") { + deps = [ + "//ios/web/public", + "//ios/web/public/service:service_names", + "//services/network:network_service", + "//services/network/public/mojom", + "//services/service_manager", + "//services/service_manager/public/cpp", + "//services/service_manager/public/mojom", + ] + sources = [ + "service_manager_connection_impl.cc", + "service_manager_connection_impl.h", + "service_manager_context.h", + "service_manager_context.mm", + "web_browser_manifest.h", + "web_browser_manifest.mm", + "web_state_interface_provider.cc", + ] + + configs += [ "//build/config/compiler:enable_arc" ] +} + +source_set("unittests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + deps = [ + ":service", + "//base", + "//base/test:test_support", + "//ios/web/public/test", + "//services/service_manager/public/cpp", + "//testing/gtest", + ] + + sources = [ + "service_manager_connection_impl_unittest.cc", + ] +} diff --git a/chromium/ios/web/shell/BUILD.gn b/chromium/ios/web/shell/BUILD.gn index ec7fd87acce..354d36fef67 100644 --- a/chromium/ios/web/shell/BUILD.gn +++ b/chromium/ios/web/shell/BUILD.gn @@ -71,9 +71,6 @@ source_set("shell") { "//net", "//net:extras", "//services/service_manager/public/cpp", - "//services/test/echo:lib", - "//services/test/echo/public/cpp:manifest", - "//services/test/echo/public/mojom", "//services/test/user_id:lib", "//services/test/user_id/public/cpp:manifest", "//services/test/user_id/public/mojom", diff --git a/chromium/ios/web/shell/test/BUILD.gn b/chromium/ios/web/shell/test/BUILD.gn index 64f2a7082cc..18567be2035 100644 --- a/chromium/ios/web/shell/test/BUILD.gn +++ b/chromium/ios/web/shell/test/BUILD.gn @@ -173,6 +173,7 @@ source_set("eg_test_support+eg2") { deps = [ "//base", "//base/test:test_support", + "//ios/testing:http_server_bundle_data", "//ios/testing:nserror_support", "//ios/testing/earl_grey:eg_test_support+eg2", "//ios/third_party/earl_grey2:test_lib", @@ -231,6 +232,4 @@ ios_eg2_test("ios_web_shell_eg2tests_module") { # Test support libraries. ":eg_tests+eg2", ] - - bundle_deps = [ "//ios/testing:http_server_bundle_data" ] } diff --git a/chromium/ios/web/test/BUILD.gn b/chromium/ios/web/test/BUILD.gn index e4270f5f033..e773ae94f13 100644 --- a/chromium/ios/web/test/BUILD.gn +++ b/chromium/ios/web/test/BUILD.gn @@ -59,6 +59,7 @@ source_set("test_support") { "//base", "//base/test:test_support", "//ios/web", + "//ios/web/common:web_view_creation_util", "//ios/web/navigation:core", "//ios/web/public/test:util", "//ios/web/public/test/fakes", diff --git a/chromium/ios/web/thread/BUILD.gn b/chromium/ios/web/thread/BUILD.gn new file mode 100644 index 00000000000..cafa52d626c --- /dev/null +++ b/chromium/ios/web/thread/BUILD.gn @@ -0,0 +1,16 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//ios/build/config.gni") + +source_set("thread") { + configs += [ "//build/config/compiler:enable_arc" ] + deps = [ + "//ios/web/public", + ] + + sources = [ + "web_task_traits.cc", + ] +} diff --git a/chromium/ios/web/web_state/BUILD.gn b/chromium/ios/web/web_state/BUILD.gn index f44709057e3..8d0dfa9b57a 100644 --- a/chromium/ios/web/web_state/BUILD.gn +++ b/chromium/ios/web/web_state/BUILD.gn @@ -10,6 +10,7 @@ source_set("web_state") { ":web_state_impl_header", "//base", "//ios/web/common", + "//ios/web/js_messaging", "//ios/web/navigation", "//ios/web/navigation:core", "//ios/web/navigation:wk_navigation_util", @@ -22,6 +23,7 @@ source_set("web_state") { "//ios/web/session", "//ios/web/web_state/ui", "//ios/web/web_state/ui:crw_web_view_navigation_proxy", + "//ios/web/web_view:util", "//ios/web/webui", "//net", "//ui/gfx", @@ -49,6 +51,7 @@ source_set("web_state") { source_set("web_state_impl_header") { deps = [ "//base", + "//ios/web/js_messaging", "//ios/web/navigation:core", "//ios/web/public", "//ios/web/public/js_messaging", diff --git a/chromium/ios/web/web_state/js/BUILD.gn b/chromium/ios/web/web_state/js/BUILD.gn index 0d9490c146d..34b00578bcc 100644 --- a/chromium/ios/web/web_state/js/BUILD.gn +++ b/chromium/ios/web/web_state/js/BUILD.gn @@ -6,8 +6,8 @@ import("//ios/build/config.gni") source_set("js") { deps = [ - ":script_util", "//base", + "//ios/web/js_messaging", "//ios/web/public", "//ios/web/public/deprecated", ] @@ -15,22 +15,6 @@ source_set("js") { sources = [ "crw_js_injection_manager.mm", "crw_js_injection_receiver.mm", - "crw_js_window_id_manager.h", - "crw_js_window_id_manager.mm", - ] - - configs += [ "//build/config/compiler:enable_arc" ] -} - -source_set("script_util") { - deps = [ - "//base", - "//ios/web/public", - ] - - sources = [ - "page_script_util.h", - "page_script_util.mm", ] configs += [ "//build/config/compiler:enable_arc" ] diff --git a/chromium/ios/web/web_state/ui/BUILD.gn b/chromium/ios/web/web_state/ui/BUILD.gn index bb46f6b59a6..0b66a6af303 100644 --- a/chromium/ios/web/web_state/ui/BUILD.gn +++ b/chromium/ios/web/web_state/ui/BUILD.gn @@ -8,14 +8,12 @@ source_set("ui") { deps = [ ":crw_context_menu_controller", ":crw_web_view_navigation_proxy", - ":crw_wk_script_message_router", - ":favicon_util", - ":web_view_js_utils", "//base", "//ios/net", "//ios/web:core", "//ios/web/browsing_data", "//ios/web/common", + "//ios/web/favicon", "//ios/web/find_in_page", "//ios/web/js_messaging", "//ios/web/navigation", @@ -48,8 +46,6 @@ source_set("ui") { ] sources = [ - "crw_js_injector.h", - "crw_js_injector.mm", "crw_swipe_recognizer_provider.h", "crw_touch_tracking_recognizer.h", "crw_touch_tracking_recognizer.mm", @@ -57,32 +53,16 @@ source_set("ui") { "crw_web_controller.mm", "crw_web_controller_container_view.h", "crw_web_controller_container_view.mm", + "crw_web_request_controller.h", + "crw_web_request_controller.mm", "crw_web_view_proxy_impl.h", "crw_web_view_proxy_impl.mm", "crw_web_view_scroll_view_proxy.mm", "crw_wk_ui_handler.h", "crw_wk_ui_handler.mm", "crw_wk_ui_handler_delegate.h", - "wk_security_origin_util.h", - "wk_security_origin_util.mm", - ] - - libs = [ "WebKit.framework" ] - - configs += [ "//build/config/compiler:enable_arc" ] -} - -source_set("crw_wk_script_message_router") { - deps = [ - "//base", - "//ios/web/navigation:core", - "//ios/web/navigation:wk_navigation_util", - "//net", - ] - - sources = [ - "crw_wk_script_message_router.h", - "crw_wk_script_message_router.mm", + "js_window_error_manager.h", + "js_window_error_manager.mm", ] libs = [ "WebKit.framework" ] @@ -103,11 +83,12 @@ source_set("crw_web_view_navigation_proxy") { source_set("crw_context_menu_controller") { deps = [ "//base", + "//ios/web/js_messaging", "//ios/web/public", "//ios/web/public/deprecated", "//ios/web/web_state:context_menu", - "//ios/web/web_state/ui:crw_wk_script_message_router", "//ios/web/web_state/ui:wk_web_view_configuration_provider", + "//ui/base", ] sources = [ @@ -122,12 +103,11 @@ source_set("crw_context_menu_controller") { source_set("wk_web_view_configuration_provider") { deps = [ - ":crw_wk_script_message_router", "//base", "//ios/web/common", + "//ios/web/js_messaging", "//ios/web/public", "//ios/web/web_state/js", - "//ios/web/web_state/js:script_util", "//ios/web/webui", ] @@ -141,35 +121,3 @@ source_set("wk_web_view_configuration_provider") { configs += [ "//build/config/compiler:enable_arc" ] } - -source_set("web_view_js_utils") { - deps = [ - "//base", - "//ios/web/public", - ] - - sources = [ - "web_view_js_utils.h", - "web_view_js_utils.mm", - ] - - libs = [ "WebKit.framework" ] - - configs += [ "//build/config/compiler:enable_arc" ] -} - -source_set("favicon_util") { - deps = [ - "//base", - "//ios/web/public", - ] - - sources = [ - "favicon_util.h", - "favicon_util.mm", - ] - - libs = [ "WebKit.framework" ] - - configs += [ "//build/config/compiler:enable_arc" ] -} diff --git a/chromium/ios/web/web_view/BUILD.gn b/chromium/ios/web/web_view/BUILD.gn index e59f0a7c2ab..aca0f14a15f 100644 --- a/chromium/ios/web/web_view/BUILD.gn +++ b/chromium/ios/web/web_view/BUILD.gn @@ -6,8 +6,12 @@ import("//ios/build/config.gni") source_set("util") { sources = [ + "content_type_util.cc", + "content_type_util.h", "error_translation_util.h", "error_translation_util.mm", + "wk_security_origin_util.h", + "wk_security_origin_util.mm", "wk_web_view_util.h", "wk_web_view_util.mm", ] @@ -38,7 +42,9 @@ source_set("unittests") { ] sources = [ + "content_type_util_unittest.cc", "error_translation_util_unittest.mm", + "wk_security_origin_util_unittest.mm", "wk_web_view_util_unittest.mm", ] } diff --git a/chromium/ios/web/webui/BUILD.gn b/chromium/ios/web/webui/BUILD.gn index b86c57f954c..3ae7ea07ebc 100644 --- a/chromium/ios/web/webui/BUILD.gn +++ b/chromium/ios/web/webui/BUILD.gn @@ -10,6 +10,7 @@ source_set("webui") { "//ios/web:resources", "//ios/web:resources_grit", "//ios/web/public", + "//ios/web/public/js_messaging", "//ios/web/public/webui", "//ios/web/web_state:web_state_impl_header", "//mojo/public/cpp/system", diff --git a/chromium/ios/web_view/BUILD.gn b/chromium/ios/web_view/BUILD.gn index 8798a828e65..a548540aacd 100644 --- a/chromium/ios/web_view/BUILD.gn +++ b/chromium/ios/web_view/BUILD.gn @@ -44,6 +44,7 @@ config("config") { # These are defined as vars so they can be shared with different targets below. ios_web_view_public_headers = [ + "public/cwv_download_task.h", "public/cwv_export.h", "public/cwv_favicon.h", "public/cwv_flags.h", @@ -66,7 +67,6 @@ ios_web_view_public_headers = [ "public/cwv_user_script.h", "public/cwv_web_view.h", "public/cwv_web_view_configuration.h", - "public/cwv_download_task.h", ] if (ios_web_view_enable_sync) { ios_web_view_public_headers += [ @@ -101,10 +101,10 @@ ios_web_view_sources = [ "internal/app/application_context.mm", "internal/app/web_view_io_thread.h", "internal/app/web_view_io_thread.mm", - "internal/autofill/web_view_autofill_client_ios.h", - "internal/autofill/web_view_autofill_client_ios.mm", "internal/autofill/web_view_autocomplete_history_manager_factory.h", "internal/autofill/web_view_autocomplete_history_manager_factory.mm", + "internal/autofill/web_view_autofill_client_ios.h", + "internal/autofill/web_view_autofill_client_ios.mm", "internal/autofill/web_view_personal_data_manager_factory.h", "internal/autofill/web_view_personal_data_manager_factory.mm", "internal/autofill/web_view_strike_database_factory.h", @@ -113,6 +113,8 @@ ios_web_view_sources = [ "internal/content_settings/web_view_cookie_settings_factory.mm", "internal/content_settings/web_view_host_content_settings_map_factory.h", "internal/content_settings/web_view_host_content_settings_map_factory.mm", + "internal/cwv_download_task.mm", + "internal/cwv_download_task_internal.h", "internal/cwv_favicon.mm", "internal/cwv_favicon_internal.h", "internal/cwv_flags.mm", @@ -121,6 +123,7 @@ ios_web_view_sources = [ "internal/cwv_html_element_internal.h", "internal/cwv_navigation_action.mm", "internal/cwv_navigation_action_internal.h", + "internal/cwv_navigation_delegate.mm", "internal/cwv_navigation_type.mm", "internal/cwv_navigation_type_internal.h", "internal/cwv_preferences.mm", @@ -131,12 +134,11 @@ ios_web_view_sources = [ "internal/cwv_script_command_internal.h", "internal/cwv_scroll_view.mm", "internal/cwv_scroll_view_internal.h", - "internal/cwv_ssl_status_internal.h", "internal/cwv_ssl_status.mm", + "internal/cwv_ssl_status_internal.h", "internal/cwv_user_content_controller.mm", "internal/cwv_user_content_controller_internal.h", "internal/cwv_user_script.mm", - "internal/cwv_navigation_delegate.mm", "internal/cwv_web_view.mm", "internal/cwv_web_view_configuration.mm", "internal/cwv_web_view_configuration_internal.h", @@ -154,28 +156,28 @@ ios_web_view_sources = [ "internal/passwords/web_view_password_manager_client.mm", "internal/passwords/web_view_password_manager_driver.h", "internal/passwords/web_view_password_manager_driver.mm", - "internal/passwords/web_view_password_manager_internals_service_factory.h", - "internal/passwords/web_view_password_manager_internals_service_factory.mm", + "internal/passwords/web_view_password_manager_log_router_factory.h", + "internal/passwords/web_view_password_manager_log_router_factory.mm", "internal/passwords/web_view_password_store_factory.h", "internal/passwords/web_view_password_store_factory.mm", "internal/pref_names.h", "internal/pref_names.mm", "internal/signin/ios_web_view_signin_client.h", "internal/signin/ios_web_view_signin_client.mm", + "internal/signin/web_view_device_accounts_provider_impl.h", + "internal/signin/web_view_device_accounts_provider_impl.mm", "internal/signin/web_view_identity_manager_factory.h", "internal/signin/web_view_identity_manager_factory.mm", - "internal/signin/web_view_profile_oauth2_token_service_ios_provider_impl.h", - "internal/signin/web_view_profile_oauth2_token_service_ios_provider_impl.mm", "internal/signin/web_view_signin_client_factory.h", "internal/signin/web_view_signin_client_factory.mm", "internal/signin/web_view_signin_error_controller_factory.h", "internal/signin/web_view_signin_error_controller_factory.mm", "internal/sync/web_view_device_info_sync_service_factory.h", "internal/sync/web_view_device_info_sync_service_factory.mm", - "internal/sync/web_view_model_type_store_service_factory.h", - "internal/sync/web_view_model_type_store_service_factory.mm", "internal/sync/web_view_gcm_profile_service_factory.h", "internal/sync/web_view_gcm_profile_service_factory.mm", + "internal/sync/web_view_model_type_store_service_factory.h", + "internal/sync/web_view_model_type_store_service_factory.mm", "internal/sync/web_view_profile_invalidation_provider_factory.h", "internal/sync/web_view_profile_invalidation_provider_factory.mm", "internal/sync/web_view_profile_sync_service_factory.h", @@ -184,8 +186,8 @@ ios_web_view_sources = [ "internal/sync/web_view_sync_client.mm", "internal/translate/cwv_translation_controller.mm", "internal/translate/cwv_translation_controller_internal.h", - "internal/translate/cwv_translation_language_internal.h", "internal/translate/cwv_translation_language.mm", + "internal/translate/cwv_translation_language_internal.h", "internal/translate/cwv_translation_policy.mm", "internal/translate/web_view_translate_accept_languages_factory.h", "internal/translate/web_view_translate_accept_languages_factory.mm", @@ -197,6 +199,8 @@ ios_web_view_sources = [ "internal/translate/web_view_translate_service.mm", "internal/web_view_browser_state.h", "internal/web_view_browser_state.mm", + "internal/web_view_download_manager.h", + "internal/web_view_download_manager.mm", "internal/web_view_early_page_script_provider.h", "internal/web_view_early_page_script_provider.mm", "internal/web_view_global_state_util.h", @@ -217,10 +221,6 @@ ios_web_view_sources = [ "internal/web_view_web_state_policy_decider.mm", "internal/webdata_services/web_view_web_data_service_wrapper_factory.h", "internal/webdata_services/web_view_web_data_service_wrapper_factory.mm", - "internal/web_view_download_manager.h", - "internal/web_view_download_manager.mm", - "internal/cwv_download_task_internal.h", - "internal/cwv_download_task.mm", ] ios_web_view_sources += ios_web_view_public_headers if (ios_web_view_enable_sync) { @@ -247,8 +247,8 @@ if (ios_web_view_enable_autofill) { "internal/autofill/cwv_credit_card_internal.h", "internal/autofill/cwv_credit_card_verifier.mm", "internal/autofill/cwv_credit_card_verifier_internal.h", - "internal/passwords/cwv_password_controller.mm", "internal/passwords/cwv_password_controller.h", + "internal/passwords/cwv_password_controller.mm", ] } @@ -275,18 +275,20 @@ ios_web_view_deps = [ "//components/language/core/browser", "//components/language/core/common", "//components/leveldb_proto", - "//components/net_log", "//services/network:network_service", "//components/password_manager/core/browser", - "//components/password_manager/core/browser/form_parsing:form_parsing", + "//components/password_manager/core/browser:affiliation", "//components/password_manager/core/common", "//components/password_manager/ios", "//components/pref_registry", "//components/prefs", "//components/proxy_config", "//components/signin/core/browser", + "//components/signin/public/webdata", "//components/signin/ios/browser", "//components/signin/ios/browser:active_state_manager", + "//components/signin/public/identity_manager", + "//components/signin/public/identity_manager/ios", "//components/strings:components_strings_grit", "//components/sync", "//components/sync_device_info", @@ -296,6 +298,7 @@ ios_web_view_deps = [ "//components/translate/core/browser", "//components/translate/core/common", "//components/translate/ios/browser", + "//components/url_formatter", "//components/variations/net", "//components/version_info", "//components/version_info:version_string", @@ -314,7 +317,6 @@ ios_web_view_deps = [ "//ios/web/public/js_messaging", "//net", "//net:extras", - "//services/identity/public/cpp", "//services/metrics/public/cpp:metrics_cpp", "//ui/base", "//url", @@ -410,6 +412,7 @@ test("ios_web_view_unittests") { "internal/cwv_preview_element_info_unittest.mm", "internal/cwv_scroll_view_unittest.mm", "internal/cwv_ssl_status_unittest.mm", + "internal/cwv_web_view_configuration_unittest.mm", "internal/signin/cwv_identity_unittest.mm", "internal/sync/cwv_sync_controller_unittest.mm", "internal/translate/cwv_translation_controller_unittest.mm", @@ -429,14 +432,14 @@ test("ios_web_view_unittests") { "//components/autofill/ios/form_util:test_support", "//components/browser_sync:test_support", "//components/prefs:test_support", - "//components/signin/core/browser:internals_test_support", - "//components/signin/ios/browser:test_support", + "//components/signin/public/base:test_support", + "//components/signin/public/identity_manager:test_support", "//components/sync:test_support", + "//ios/web/common:web_view_creation_util", "//ios/web/public/deprecated:test_doubles", "//ios/web/public/js_messaging", "//ios/web/public/security", "//ios/web/public/test", - "//services/identity/public/cpp:test_support", "//testing/gtest", "//third_party/ocmock", ] diff --git a/chromium/ios/web_view/test/BUILD.gn b/chromium/ios/web_view/test/BUILD.gn index 728429da4b1..651859891ab 100644 --- a/chromium/ios/web_view/test/BUILD.gn +++ b/chromium/ios/web_view/test/BUILD.gn @@ -2,8 +2,8 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//ios/build/config.gni") import("//build/config/ios/rules.gni") +import("//ios/build/config.gni") import("//testing/test.gni") source_set("inttests") { @@ -26,6 +26,7 @@ source_set("inttests") { "//base", "//base/test:run_all_unittests", "//base/test:test_support", + "//components/url_formatter", "//ios/web_view:web_view+link", "//net", "//net:test_support", @@ -46,6 +47,8 @@ source_set("test_support") { "//ios/web_view/public/cwv_web_view_configuration.h", "observer.h", "observer.mm", + "test_with_locale_and_resources.cc", + "test_with_locale_and_resources.h", "web_view_test_util.h", "web_view_test_util.mm", ] @@ -53,6 +56,8 @@ source_set("test_support") { deps = [ "//base:base", "//base/test:test_support", + "//testing/gtest", + "//ui/base", ] configs += [ "//build/config/compiler:enable_arc" ] |