diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-12-10 16:19:40 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-12-10 16:01:50 +0000 |
| commit | 51f6c2793adab2d864b3d2b360000ef8db1d3e92 (patch) | |
| tree | 835b3b4446b012c75e80177cef9fbe6972cc7dbe /chromium/ios | |
| parent | 6036726eb981b6c4b42047513b9d3f4ac865daac (diff) | |
| download | qtwebengine-chromium-51f6c2793adab2d864b3d2b360000ef8db1d3e92.tar.gz | |
BASELINE: Update Chromium to 71.0.3578.93
Change-Id: I6a32086c33670e1b033f8b10e6bf1fd4da1d105d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/ios')
110 files changed, 916 insertions, 2713 deletions
diff --git a/chromium/ios/BUILD.gn b/chromium/ios/BUILD.gn index 94c73a68953..f09a7eb2b61 100644 --- a/chromium/ios/BUILD.gn +++ b/chromium/ios/BUILD.gn @@ -4,6 +4,7 @@ assert(!is_component_build, "component build is unsupported on iOS") +import("//build/config/ios/ios_sdk.gni") import("//ios/features.gni") declare_args() { @@ -36,6 +37,8 @@ group("all") { "//components/cronet/ios:cronet_package", ] } else { + assert(xcode_version_int >= 1000, "Xcode 10 is required.") + deps = [ # List all the targets that need to be built on iOS by default. "//ios/chrome/app:chrome", diff --git a/chromium/ios/chrome/app/BUILD.gn b/chromium/ios/chrome/app/BUILD.gn index 06d7ea3f35f..de2ae8112f8 100644 --- a/chromium/ios/chrome/app/BUILD.gn +++ b/chromium/ios/chrome/app/BUILD.gn @@ -61,8 +61,10 @@ source_set("unit_tests") { "//ios/chrome/common/app_group", "//ios/chrome/test:test_support", "//ios/chrome/test/base", - "//ios/public/provider/chrome/browser", + "//ios/public/provider/chrome/browser:browser", + "//ios/public/provider/chrome/browser:test_support", "//ios/public/provider/chrome/browser/distribution", + "//ios/public/provider/chrome/browser/distribution:test_support", "//ios/web/public/test:test", "//testing/gtest", "//third_party/ocmock", @@ -214,17 +216,14 @@ source_set("app_internal") { "//ios/chrome/browser/ui/first_run", "//ios/chrome/browser/ui/history", "//ios/chrome/browser/ui/main", - "//ios/chrome/browser/ui/main:feature_flags", + "//ios/chrome/browser/ui/main:tab_switcher", "//ios/chrome/browser/ui/promos", "//ios/chrome/browser/ui/settings", "//ios/chrome/browser/ui/signin_interaction", - "//ios/chrome/browser/ui/stack_view", "//ios/chrome/browser/ui/tab_grid", "//ios/chrome/browser/ui/tab_grid:tab_grid_ui", - "//ios/chrome/browser/ui/tab_switcher", - "//ios/chrome/browser/ui/tab_switcher:modes", "//ios/chrome/browser/ui/tabs", - "//ios/chrome/browser/ui/toolbar/clean:toolbar_ui", + "//ios/chrome/browser/ui/toolbar:toolbar_ui", "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/ui/webui:webui_internal", @@ -289,7 +288,16 @@ ios_app_bundle("chrome") { bundle_deps = [ "//ios/chrome/app/resources" ] if (!is_chrome_branded || ios_chrome_app_variants == []) { + assert(ios_application_icons_target != "", + "ios_application_icons_target must be defined.") bundle_deps += [ ios_application_icons_target ] + + if (ios_enable_firebase_sdk) { + assert(ios_firebase_resources_target != "", + "ios_firebase_resources_target must be defined if Firebase SDK " + + "is enabled.") + bundle_deps += [ ios_firebase_resources_target ] + } } else { variants = ios_chrome_app_variants } diff --git a/chromium/ios/chrome/browser/BUILD.gn b/chromium/ios/chrome/browser/BUILD.gn index 2efaea23c82..d6b1a486bd5 100644 --- a/chromium/ios/chrome/browser/BUILD.gn +++ b/chromium/ios/chrome/browser/BUILD.gn @@ -87,6 +87,7 @@ source_set("browser") { "//components/flags_ui", "//components/flags_ui:switches", "//components/handoff", + "//components/invalidation/impl:impl", "//components/keyed_service/core", "//components/keyed_service/ios", "//components/metrics", @@ -119,19 +120,20 @@ 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/crash_report:flags", "//ios/chrome/browser/download", "//ios/chrome/browser/drag_and_drop", "//ios/chrome/browser/itunes_urls", "//ios/chrome/browser/mailto:feature_flags", "//ios/chrome/browser/payments:constants", + "//ios/chrome/browser/search_engines:feature_flags", + "//ios/chrome/browser/signin:feature_flags", "//ios/chrome/browser/ssl:feature_flags", "//ios/chrome/browser/sync/glue", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/external_search:feature_flags", "//ios/chrome/browser/ui/fullscreen:feature_flags", - "//ios/chrome/browser/ui/history:feature_flags", - "//ios/chrome/browser/ui/main:feature_flags", "//ios/chrome/browser/ui/omnibox", "//ios/chrome/browser/ui/toolbar/public:feature_flags", "//ios/chrome/browser/ui/toolbar_container:feature_flags", @@ -211,6 +213,7 @@ source_set("browser_impl") { "//ios/web/public/app", "//net", "//rlz/buildflags", + "//services/network:network_service", "//ui/base", ] @@ -239,7 +242,6 @@ source_set("unit_tests") { "crash_loop_detection_util_unittest.mm", "install_time_util_unittest.mm", "installation_notifier_unittest.mm", - "ios_chrome_io_thread_unittest.mm", "notification_promo_unittest.cc", ] deps = [ diff --git a/chromium/ios/chrome/browser/autocomplete/BUILD.gn b/chromium/ios/chrome/browser/autocomplete/BUILD.gn index 27f46967207..fd0a873a1c6 100644 --- a/chromium/ios/chrome/browser/autocomplete/BUILD.gn +++ b/chromium/ios/chrome/browser/autocomplete/BUILD.gn @@ -6,8 +6,8 @@ source_set("autocomplete") { sources = [ "autocomplete_classifier_factory.cc", "autocomplete_classifier_factory.h", - "autocomplete_provider_client_impl.cc", "autocomplete_provider_client_impl.h", + "autocomplete_provider_client_impl.mm", "autocomplete_scheme_classifier_impl.h", "autocomplete_scheme_classifier_impl.mm", "in_memory_url_index_factory.cc", @@ -36,7 +36,9 @@ source_set("autocomplete") { "//ios/chrome/browser/search_engines", "//ios/chrome/browser/signin", "//ios/chrome/browser/sync", + "//ios/chrome/browser/tabs", "//ios/chrome/browser/unified_consent", + "//ios/chrome/browser/web_state_list", "//ios/public/provider/chrome/browser", "//ios/web", "//url", diff --git a/chromium/ios/chrome/browser/autofill/BUILD.gn b/chromium/ios/chrome/browser/autofill/BUILD.gn index a078a385c6a..cccb59aa6ea 100644 --- a/chromium/ios/chrome/browser/autofill/BUILD.gn +++ b/chromium/ios/chrome/browser/autofill/BUILD.gn @@ -7,14 +7,13 @@ source_set("autofill") { sources = [ "address_normalizer_factory.cc", "address_normalizer_factory.h", + "autofill_profile_validator_factory.cc", + "autofill_profile_validator_factory.h", "form_input_accessory_consumer.h", "form_input_accessory_view.h", "form_input_accessory_view.mm", "form_input_accessory_view_controller.h", "form_input_accessory_view_controller.mm", - "form_input_accessory_view_delegate.h", - "form_input_accessory_view_handler.h", - "form_input_accessory_view_handler.mm", "form_input_accessory_view_provider.h", "form_suggestion_controller.h", "form_suggestion_controller.mm", @@ -27,6 +26,8 @@ source_set("autofill") { "form_suggestion_view_client.h", "personal_data_manager_factory.cc", "personal_data_manager_factory.h", + "strike_database_factory.cc", + "strike_database_factory.h", "validation_rules_storage_factory.cc", "validation_rules_storage_factory.h", ] @@ -52,6 +53,7 @@ source_set("autofill") { "//base:i18n", "//components/autofill/core/browser", "//components/autofill/ios/browser", + "//components/autofill/ios/form_util", "//components/keyed_service/core", "//components/keyed_service/ios", "//components/prefs", @@ -59,11 +61,15 @@ source_set("autofill") { "//ios/chrome/app/strings", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/history", "//ios/chrome/browser/passwords:passwords_generation_utils", "//ios/chrome/browser/signin", "//ios/chrome/browser/ui", + "//ios/chrome/browser/ui/autofill/manual_fill", + "//ios/chrome/browser/ui/autofill/manual_fill:manual_fill_ui", "//ios/chrome/browser/ui/image_util", "//ios/web", + "//third_party/leveldatabase", "//third_party/libaddressinput", "//ui/base", "//url", @@ -74,8 +80,17 @@ source_set("autofill") { source_set("autofill_shared") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ + "form_input_accessory_view_delegate.h", + "form_input_accessory_view_handler.h", + "form_input_accessory_view_handler.mm", "form_input_accessory_view_provider.h", ] + deps = [ + "//base", + "//components/autofill/core/browser", + "//components/autofill/ios/browser", + "//ios/chrome/browser/ui", + ] libs = [ "UIKit.framework" ] } @@ -104,6 +119,7 @@ source_set("autofill_internal") { "//ios/chrome/browser/signin", "//ios/chrome/browser/ui/autofill", "//ios/web", + "//third_party/leveldatabase", "//ui/gfx/geometry", "//url", ] @@ -142,6 +158,7 @@ source_set("unit_tests") { "//ios/chrome/browser/ssl", "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/autofill", + "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/settings:test_support", "//ios/chrome/browser/web:test_support", "//ios/chrome/browser/web:web_internal", @@ -149,6 +166,7 @@ source_set("unit_tests") { "//ios/web", "//ios/web/public/test", "//testing/gtest", + "//third_party/leveldatabase", "//third_party/ocmock", "//ui/base:test_support", ] @@ -479,6 +497,7 @@ source_set("eg_tests") { "//base/test:test_support", "//components/autofill/ios/browser:browser", "//ios/chrome/app/strings", + "//ios/chrome/browser/autofill:autofill_shared", "//ios/chrome/browser/ui", "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", diff --git a/chromium/ios/chrome/browser/autofill/automation/BUILD.gn b/chromium/ios/chrome/browser/autofill/automation/BUILD.gn index 4194d05ddef..b2ae807952e 100644 --- a/chromium/ios/chrome/browser/autofill/automation/BUILD.gn +++ b/chromium/ios/chrome/browser/autofill/automation/BUILD.gn @@ -14,8 +14,11 @@ source_set("eg_tests") { deps = [ "//base", + "//components/autofill/core/browser:browser", + "//components/autofill/ios/browser:browser", "//components/strings", "//ios/chrome/app/strings", + "//ios/chrome/browser/autofill:autofill", "//ios/chrome/browser/infobars", "//ios/chrome/browser/ui:ui_util", "//ios/chrome/browser/ui/infobars:test_support", diff --git a/chromium/ios/chrome/browser/autofill/manual_fill/BUILD.gn b/chromium/ios/chrome/browser/autofill/manual_fill/BUILD.gn index 33264bd81a7..a15c0c7bcf1 100644 --- a/chromium/ios/chrome/browser/autofill/manual_fill/BUILD.gn +++ b/chromium/ios/chrome/browser/autofill/manual_fill/BUILD.gn @@ -14,7 +14,6 @@ source_set("manual_fill") { "//components/autofill/core/common:common", "//components/keyed_service/core:core", "//components/password_manager/core/browser:browser", - "//ios/chrome/browser/autofill:autofill_shared", "//ios/chrome/browser/browser_state:browser_state", "//ios/chrome/browser/passwords:passwords", ] diff --git a/chromium/ios/chrome/browser/browser_state/BUILD.gn b/chromium/ios/chrome/browser/browser_state/BUILD.gn index 73c35364110..2c8f350cbc4 100644 --- a/chromium/ios/chrome/browser/browser_state/BUILD.gn +++ b/chromium/ios/chrome/browser/browser_state/BUILD.gn @@ -68,7 +68,6 @@ source_set("browser_state_impl") { "//components/metrics", "//components/net_log", "//components/password_manager/core/browser", - "//components/password_manager/sync/browser", "//components/pref_registry", "//components/prefs", "//components/proxy_config", diff --git a/chromium/ios/chrome/browser/context_menu/BUILD.gn b/chromium/ios/chrome/browser/context_menu/BUILD.gn index f676b4a11c8..a49caaa9042 100644 --- a/chromium/ios/chrome/browser/context_menu/BUILD.gn +++ b/chromium/ios/chrome/browser/context_menu/BUILD.gn @@ -15,6 +15,8 @@ source_set("eg_tests") { "//ios/chrome/browser/ui", "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", + "//ios/public/provider/chrome/browser", + "//ios/public/provider/chrome/browser/ui", "//ios/testing/earl_grey:earl_grey_support", "//ios/third_party/earl_grey:earl_grey+link", "//ios/web:earl_grey_test_support", diff --git a/chromium/ios/chrome/browser/crash_report/BUILD.gn b/chromium/ios/chrome/browser/crash_report/BUILD.gn index 6babb98568d..261f4fc5936 100644 --- a/chromium/ios/chrome/browser/crash_report/BUILD.gn +++ b/chromium/ios/chrome/browser/crash_report/BUILD.gn @@ -17,6 +17,7 @@ source_set("crash_report") { configs += [ "//build/config/compiler:enable_arc" ] deps = [ + ":flags", "//base", "//components/crash/core/common", "//components/upload_list", @@ -26,6 +27,16 @@ source_set("crash_report") { ] } +source_set("flags") { + sources = [ + "crash_report_flags.cc", + "crash_report_flags.h", + ] + deps = [ + "//base", + ] +} + source_set("crash_report_internal") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ diff --git a/chromium/ios/chrome/browser/feature_engagement/BUILD.gn b/chromium/ios/chrome/browser/feature_engagement/BUILD.gn index bd858e68872..4628e7b638f 100644 --- a/chromium/ios/chrome/browser/feature_engagement/BUILD.gn +++ b/chromium/ios/chrome/browser/feature_engagement/BUILD.gn @@ -44,10 +44,7 @@ source_set("eg_tests") { "//ios/chrome/browser/ui:ui_util", "//ios/chrome/browser/ui/popup_menu:constants", "//ios/chrome/browser/ui/tab_grid:egtest_support", - "//ios/chrome/browser/ui/tab_switcher:egtest_support", - "//ios/chrome/browser/ui/tab_switcher:modes", "//ios/chrome/browser/ui/table_view", - "//ios/chrome/browser/ui/tools_menu/public", "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", "//ios/testing/earl_grey:earl_grey_support", diff --git a/chromium/ios/chrome/browser/find_in_page/BUILD.gn b/chromium/ios/chrome/browser/find_in_page/BUILD.gn index 88e20e3dc3a..6325147305b 100644 --- a/chromium/ios/chrome/browser/find_in_page/BUILD.gn +++ b/chromium/ios/chrome/browser/find_in_page/BUILD.gn @@ -19,8 +19,10 @@ source_set("find_in_page") { deps = [ ":injected_js", "//base", + "//ios/chrome/browser/metrics:ukm_url_recorder", "//ios/chrome/browser/web", "//ios/web", + "//services/metrics/public/cpp:ukm_builders", ] libs = [ "CoreGraphics.framework" ] } @@ -37,6 +39,7 @@ source_set("unit_tests") { testonly = true configs += [ "//build/config/compiler:enable_arc" ] sources = [ + "find_in_page_controller_unittest.mm", "find_in_page_js_unittest.mm", "find_tab_helper_unittest.mm", "js_findinpage_manager_unittest.mm", @@ -45,7 +48,11 @@ source_set("unit_tests") { ":find_in_page", "//base", "//base/test:test_support", + "//components/ukm:test_support", + "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/metrics:ukm_url_recorder", "//ios/chrome/browser/web:test_support", + "//ios/chrome/browser/web:web_internal", "//ios/web", "//ios/web/public/test", "//ios/web/public/test/fakes", diff --git a/chromium/ios/chrome/browser/gcm/BUILD.gn b/chromium/ios/chrome/browser/gcm/BUILD.gn index bf3fab90326..1fe93424c67 100644 --- a/chromium/ios/chrome/browser/gcm/BUILD.gn +++ b/chromium/ios/chrome/browser/gcm/BUILD.gn @@ -12,6 +12,7 @@ source_set("gcm") { "//components/gcm_driver", "//components/keyed_service/ios", "//components/signin/core/browser", + "//ios/chrome/browser", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/signin", "//ios/chrome/common", diff --git a/chromium/ios/chrome/browser/google/BUILD.gn b/chromium/ios/chrome/browser/google/BUILD.gn index b629ee4e8dd..b8056885e0b 100644 --- a/chromium/ios/chrome/browser/google/BUILD.gn +++ b/chromium/ios/chrome/browser/google/BUILD.gn @@ -17,6 +17,7 @@ source_set("google") { "//components/google/core/browser", "//components/keyed_service/ios", "//components/prefs", + "//ios/chrome/browser", "//ios/chrome/browser/browser_state", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/distribution", diff --git a/chromium/ios/chrome/browser/infobars/BUILD.gn b/chromium/ios/chrome/browser/infobars/BUILD.gn index 8a5e24003fa..11a7459f761 100644 --- a/chromium/ios/chrome/browser/infobars/BUILD.gn +++ b/chromium/ios/chrome/browser/infobars/BUILD.gn @@ -29,7 +29,7 @@ source_set("infobars") { deps = [ "//base", "//components/translate/core/browser", - "//ios/chrome/browser/ui/infobars", + "//ios/chrome/browser/ui/infobars:infobars_ui", "//ios/chrome/common", "//ios/web", "//ui/base", diff --git a/chromium/ios/chrome/browser/invalidation/BUILD.gn b/chromium/ios/chrome/browser/invalidation/BUILD.gn index 34fb66975ec..0ac4f066bad 100644 --- a/chromium/ios/chrome/browser/invalidation/BUILD.gn +++ b/chromium/ios/chrome/browser/invalidation/BUILD.gn @@ -5,8 +5,8 @@ source_set("invalidation") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ - "ios_chrome_profile_invalidation_provider_factory.h", - "ios_chrome_profile_invalidation_provider_factory.mm", + "ios_chrome_deprecated_profile_invalidation_provider_factory.h", + "ios_chrome_deprecated_profile_invalidation_provider_factory.mm", ] deps = [ "//base", @@ -16,6 +16,7 @@ source_set("invalidation") { "//components/pref_registry", "//components/prefs", "//components/signin/core/browser", + "//ios/chrome/browser", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/gcm", "//ios/chrome/browser/signin", diff --git a/chromium/ios/chrome/browser/metrics/BUILD.gn b/chromium/ios/chrome/browser/metrics/BUILD.gn index 2100a63dab3..1d2d9eab22d 100644 --- a/chromium/ios/chrome/browser/metrics/BUILD.gn +++ b/chromium/ios/chrome/browser/metrics/BUILD.gn @@ -2,6 +2,22 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +source_set("ukm_url_recorder") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "ukm_url_recorder.h", + "ukm_url_recorder.mm", + ] + public_deps = [ + "//services/metrics/public/cpp:metrics_cpp", + ] + deps = [ + "//base", + "//ios/web", + "//url", + ] +} + source_set("metrics") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ @@ -20,8 +36,9 @@ source_set("metrics") { "previous_session_info.h", "previous_session_info.mm", "previous_session_info_private.h", - "ukm_url_recorder.h", - "ukm_url_recorder.mm", + ] + public_deps = [ + ":ukm_url_recorder", ] deps = [ "//base", @@ -173,14 +190,11 @@ source_set("eg_tests") { "//ios/chrome/browser/ui/authentication", "//ios/chrome/browser/ui/authentication:authentication_ui", "//ios/chrome/browser/ui/authentication:eg_test_support", + "//ios/chrome/browser/ui/popup_menu:constants", "//ios/chrome/browser/ui/settings", "//ios/chrome/browser/ui/tab_grid:egtest_support", - "//ios/chrome/browser/ui/tab_switcher:egtest_support", - "//ios/chrome/browser/ui/tab_switcher:modes", "//ios/chrome/browser/ui/toolbar/buttons", - "//ios/chrome/browser/ui/toolbar/legacy", "//ios/chrome/browser/ui/toolbar/public", - "//ios/chrome/browser/ui/tools_menu/public", "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", "//ios/public/provider/chrome/browser/signin:test_support", @@ -206,10 +220,8 @@ source_set("test_support") { "//ios/chrome/browser/tabs", "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/main", + "//ios/chrome/browser/ui/popup_menu:constants", "//ios/chrome/browser/ui/tab_grid:egtest_support", - "//ios/chrome/browser/ui/tab_switcher:egtest_support", - "//ios/chrome/browser/ui/tab_switcher:modes", - "//ios/chrome/browser/ui/tools_menu/public", "//ios/chrome/browser/web_state_list", "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", diff --git a/chromium/ios/chrome/browser/net/BUILD.gn b/chromium/ios/chrome/browser/net/BUILD.gn index 2aa9e4b2862..73205ddcdee 100644 --- a/chromium/ios/chrome/browser/net/BUILD.gn +++ b/chromium/ios/chrome/browser/net/BUILD.gn @@ -69,8 +69,7 @@ source_set("unit_tests") { "//ios/net", "//ios/net:test_support", "//ios/web/public/test", - "//net", - "//net:test_support", + "//services/network:test_support", "//testing/gtest", ] } diff --git a/chromium/ios/chrome/browser/omaha/BUILD.gn b/chromium/ios/chrome/browser/omaha/BUILD.gn index 956c5f0bd65..becd3ec4c3b 100644 --- a/chromium/ios/chrome/browser/omaha/BUILD.gn +++ b/chromium/ios/chrome/browser/omaha/BUILD.gn @@ -51,6 +51,7 @@ source_set("unit_tests") { "//ios/web", "//ios/web/public/test", "//net:test_support", + "//services/network:test_support", "//testing/gtest", ] } diff --git a/chromium/ios/chrome/browser/passwords/BUILD.gn b/chromium/ios/chrome/browser/passwords/BUILD.gn index 2f3e320aad9..3b8dfc6656a 100644 --- a/chromium/ios/chrome/browser/passwords/BUILD.gn +++ b/chromium/ios/chrome/browser/passwords/BUILD.gn @@ -25,6 +25,8 @@ source_set("passwords") { "ios_chrome_save_password_infobar_delegate.mm", "ios_chrome_update_password_infobar_delegate.h", "ios_chrome_update_password_infobar_delegate.mm", + "ios_password_infobar_controller.h", + "ios_password_infobar_controller.mm", "js_credential_manager.h", "js_credential_manager.mm", "notify_auto_signin_view_controller.h", @@ -58,7 +60,6 @@ source_set("passwords") { "//components/password_manager/core/browser/form_parsing", "//components/password_manager/core/common", "//components/password_manager/ios", - "//components/password_manager/sync/browser", "//components/prefs", "//components/security_state/core", "//components/signin/core/browser", @@ -71,13 +72,14 @@ source_set("passwords") { "//ios/chrome/browser", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/infobars", + "//ios/chrome/browser/metrics:ukm_url_recorder", "//ios/chrome/browser/signin", "//ios/chrome/browser/ssl", "//ios/chrome/browser/sync/glue", "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/elements", - "//ios/chrome/browser/ui/infobars", + "//ios/chrome/browser/ui/infobars:infobars_ui", "//ios/chrome/browser/web", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/ui", diff --git a/chromium/ios/chrome/browser/prefs/BUILD.gn b/chromium/ios/chrome/browser/prefs/BUILD.gn index e3e3a6bdc2f..9f414accff2 100644 --- a/chromium/ios/chrome/browser/prefs/BUILD.gn +++ b/chromium/ios/chrome/browser/prefs/BUILD.gn @@ -53,6 +53,7 @@ source_set("browser_prefs") { "//components/signin/core/browser", "//components/strings", "//components/sync", + "//components/sync_sessions", "//components/translate/core/browser", "//components/translate/core/common", "//components/unified_consent", diff --git a/chromium/ios/chrome/browser/reading_list/BUILD.gn b/chromium/ios/chrome/browser/reading_list/BUILD.gn index 241ebb48076..aa81ae9af57 100644 --- a/chromium/ios/chrome/browser/reading_list/BUILD.gn +++ b/chromium/ios/chrome/browser/reading_list/BUILD.gn @@ -98,6 +98,7 @@ source_set("unit_tests") { "//ios/web/public/test", "//ios/web/public/test/fakes", "//net", + "//services/network:test_support", "//testing/gtest", "//url", ] diff --git a/chromium/ios/chrome/browser/search_engines/BUILD.gn b/chromium/ios/chrome/browser/search_engines/BUILD.gn index 15326790e19..e6593a10e16 100644 --- a/chromium/ios/chrome/browser/search_engines/BUILD.gn +++ b/chromium/ios/chrome/browser/search_engines/BUILD.gn @@ -5,6 +5,17 @@ import("//build/config/features.gni") import("//rlz/buildflags/buildflags.gni") +source_set("feature_flags") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "feature_flags.cc", + "feature_flags.h", + ] + deps = [ + "//base", + ] +} + source_set("search_engines") { sources = [ "search_engine_observer_bridge.h", diff --git a/chromium/ios/chrome/browser/signin/BUILD.gn b/chromium/ios/chrome/browser/signin/BUILD.gn index 16bb6f0e7a6..d023bde3bba 100644 --- a/chromium/ios/chrome/browser/signin/BUILD.gn +++ b/chromium/ios/chrome/browser/signin/BUILD.gn @@ -52,6 +52,7 @@ source_set("signin") { "signin_util.mm", ] deps = [ + ":feature_flags", "//base", "//components/browser_sync", "//components/content_settings/core/browser", @@ -85,6 +86,17 @@ source_set("signin") { ] } +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/snapshots/BUILD.gn b/chromium/ios/chrome/browser/snapshots/BUILD.gn index 30263114eb7..a3e380a4def 100644 --- a/chromium/ios/chrome/browser/snapshots/BUILD.gn +++ b/chromium/ios/chrome/browser/snapshots/BUILD.gn @@ -40,7 +40,10 @@ source_set("snapshots") { "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/web:tab_id_tab_helper", "//ios/chrome/browser/web_state_list", + "//ios/public/provider/chrome/browser", + "//ios/public/provider/chrome/browser/ui", "//ios/web/public", + "//ui/gfx", ] libs = [ "QuartzCore.framework", diff --git a/chromium/ios/chrome/browser/sync/BUILD.gn b/chromium/ios/chrome/browser/sync/BUILD.gn index c55af33b21b..bd154f8411f 100644 --- a/chromium/ios/chrome/browser/sync/BUILD.gn +++ b/chromium/ios/chrome/browser/sync/BUILD.gn @@ -21,6 +21,8 @@ source_set("sync") { "model_type_store_service_factory.h", "profile_sync_service_factory.cc", "profile_sync_service_factory.h", + "session_sync_service_factory.cc", + "session_sync_service_factory.h", "sync_observer_bridge.h", "sync_observer_bridge.mm", "sync_setup_service.cc", @@ -42,7 +44,6 @@ source_set("sync") { "//components/keyed_service/ios", "//components/network_time", "//components/password_manager/core/browser", - "//components/password_manager/sync/browser", "//components/pref_registry", "//components/prefs", "//components/reading_list/core", @@ -121,12 +122,14 @@ source_set("unit_tests") { testonly = true sources = [ "profile_sync_service_factory_unittest.cc", + "session_sync_service_factory_unittest.cc", ] deps = [ ":sync", "//base", "//components/browser_sync", "//components/sync", + "//ios/chrome/browser", "//ios/chrome/browser/browser_state:test_support", "//ios/web/public/test", "//testing/gtest", diff --git a/chromium/ios/chrome/browser/tabs/BUILD.gn b/chromium/ios/chrome/browser/tabs/BUILD.gn index 8f9528ccdf2..c1ff9556cf1 100644 --- a/chromium/ios/chrome/browser/tabs/BUILD.gn +++ b/chromium/ios/chrome/browser/tabs/BUILD.gn @@ -118,7 +118,6 @@ source_set("tabs_internal") { "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/overscroll_actions", - "//ios/chrome/browser/ui/toolbar", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/voice", "//ios/chrome/browser/web", diff --git a/chromium/ios/chrome/browser/translate/BUILD.gn b/chromium/ios/chrome/browser/translate/BUILD.gn index 7f443d5043c..34e1241a6a7 100644 --- a/chromium/ios/chrome/browser/translate/BUILD.gn +++ b/chromium/ios/chrome/browser/translate/BUILD.gn @@ -50,7 +50,7 @@ source_set("translate") { "//ios/chrome/browser/infobars", "//ios/chrome/browser/language", "//ios/chrome/browser/sync", - "//ios/chrome/browser/ui/infobars", + "//ios/chrome/browser/ui/infobars:infobars_ui", "//ios/chrome/browser/ui/util", "//ios/web", "//third_party/metrics_proto", diff --git a/chromium/ios/chrome/browser/ui/BUILD.gn b/chromium/ios/chrome/browser/ui/BUILD.gn index 134f0702372..5481e6ecae9 100644 --- a/chromium/ios/chrome/browser/ui/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/BUILD.gn @@ -141,7 +141,6 @@ source_set("unit_tests") { "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/ntp:ntp_controller", - "//ios/chrome/browser/ui/toolbar", "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/toolbar/test", "//ios/chrome/browser/web:web_internal", @@ -156,6 +155,7 @@ source_set("unit_tests") { "//ios/web/public/test/fakes", "//net", "//net:test_support", + "//services/network:test_support", "//testing/gmock", "//testing/gtest", "//third_party/ocmock", @@ -348,6 +348,7 @@ source_set("ui_internal") { "//ios/chrome/browser/ui/authentication", "//ios/chrome/browser/ui/authentication/consent_bump", "//ios/chrome/browser/ui/autofill:autofill", + "//ios/chrome/browser/ui/autofill/manual_fill", "//ios/chrome/browser/ui/bookmarks", "//ios/chrome/browser/ui/browser_container", "//ios/chrome/browser/ui/browser_container:ui", @@ -367,17 +368,18 @@ source_set("ui_internal") { "//ios/chrome/browser/ui/fullscreen:feature_flags", "//ios/chrome/browser/ui/fullscreen:ui", "//ios/chrome/browser/ui/history", - "//ios/chrome/browser/ui/history_popup:coordinator", - "//ios/chrome/browser/ui/history_popup/requirements", "//ios/chrome/browser/ui/image_util", + "//ios/chrome/browser/ui/infobars", + "//ios/chrome/browser/ui/infobars:public", "//ios/chrome/browser/ui/keyboard", - "//ios/chrome/browser/ui/main:feature_flags", + "//ios/chrome/browser/ui/location_bar:toolbar_model_delegate", + "//ios/chrome/browser/ui/main:tab_switcher", "//ios/chrome/browser/ui/main_content:main_content_ui", "//ios/chrome/browser/ui/main_content:main_content_ui_broadcasting_util", "//ios/chrome/browser/ui/ntp", "//ios/chrome/browser/ui/ntp:ntp_controller", "//ios/chrome/browser/ui/ntp:ntp_internal", - "//ios/chrome/browser/ui/ntp/recent_tabs", + "//ios/chrome/browser/ui/ntp:util", "//ios/chrome/browser/ui/omnibox:omnibox_internal", "//ios/chrome/browser/ui/overscroll_actions", "//ios/chrome/browser/ui/page_info:coordinator", @@ -394,26 +396,18 @@ source_set("ui_internal") { "//ios/chrome/browser/ui/settings/sync_utils", "//ios/chrome/browser/ui/signin_interaction/public", "//ios/chrome/browser/ui/snackbar", - "//ios/chrome/browser/ui/stack_view", "//ios/chrome/browser/ui/static_content", - "//ios/chrome/browser/ui/tab_switcher", "//ios/chrome/browser/ui/tabs", "//ios/chrome/browser/ui/tabs:coordinator", "//ios/chrome/browser/ui/tabs/requirements", + "//ios/chrome/browser/ui/toolbar", "//ios/chrome/browser/ui/toolbar:toolbar_ui", - "//ios/chrome/browser/ui/toolbar:toolbar_ui_broadcasting_util", - "//ios/chrome/browser/ui/toolbar/adaptive", - "//ios/chrome/browser/ui/toolbar/adaptive:adaptive_ui", "//ios/chrome/browser/ui/toolbar/buttons", - "//ios/chrome/browser/ui/toolbar/clean:toolbar", - "//ios/chrome/browser/ui/toolbar/clean:toolbar_ui", - "//ios/chrome/browser/ui/toolbar/legacy", + "//ios/chrome/browser/ui/toolbar/fullscreen", + "//ios/chrome/browser/ui/toolbar/fullscreen:fullscreen_broadcasting_util", "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/toolbar/public:feature_flags", "//ios/chrome/browser/ui/toolbar_container:feature_flags", - "//ios/chrome/browser/ui/tools_menu", - "//ios/chrome/browser/ui/tools_menu:configuration", - "//ios/chrome/browser/ui/tools_menu/public", "//ios/chrome/browser/ui/translate", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/ui/voice", @@ -445,16 +439,12 @@ source_set("ui_internal") { public_deps = [ ":external_files", "//ios/chrome/browser/ui/side_swipe", - "//ios/chrome/browser/ui/toolbar", ] allow_circular_includes_from = [ "//ios/chrome/browser/ui/ntp:ntp_internal", "//ios/chrome/browser/ui/overscroll_actions", "//ios/chrome/browser/ui/settings", - "//ios/chrome/browser/ui/stack_view", - "//ios/chrome/browser/ui/tab_switcher", "//ios/chrome/browser/ui/tabs:coordinator", - "//ios/chrome/browser/ui/toolbar", "//ios/chrome/browser/web:web_internal", ] libs = [ @@ -509,7 +499,6 @@ source_set("eg_tests") { "//ios/chrome/browser/ui/ntp:ntp_controller", "//ios/chrome/browser/ui/popup_menu:constants", "//ios/chrome/browser/ui/table_view", - "//ios/chrome/browser/ui/tools_menu/public", "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", "//ios/third_party/earl_grey:earl_grey+link", @@ -542,9 +531,10 @@ source_set("perf_tests") { "//ios/chrome/browser/store_kit", "//ios/chrome/browser/tabs", "//ios/chrome/browser/tabs:tabs_internal", + "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/location_bar:toolbar_model_delegate", "//ios/chrome/browser/ui/omnibox:omnibox_internal", "//ios/chrome/browser/ui/toolbar", - "//ios/chrome/browser/ui/toolbar/clean:toolbar", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web_state_list", "//ios/chrome/browser/web_state_list:test_support", diff --git a/chromium/ios/chrome/browser/ui/autofill/BUILD.gn b/chromium/ios/chrome/browser/ui/autofill/BUILD.gn index 0ca9d564c9c..7a5fbcbf757 100644 --- a/chromium/ios/chrome/browser/ui/autofill/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/autofill/BUILD.gn @@ -26,12 +26,14 @@ source_set("autofill") { "//components/browser_sync", "//components/infobars/core", "//components/keyed_service/core", + "//components/leveldb_proto", "//components/password_manager/core/browser", "//components/prefs", "//components/strings", "//google_apis", "//ios/chrome/browser", "//ios/chrome/browser/autofill", + "//ios/chrome/browser/autofill:autofill_shared", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/infobars", "//ios/chrome/browser/metrics", @@ -41,6 +43,8 @@ source_set("autofill") { "//ios/chrome/browser/sync", "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/autofill/cells", + "//ios/chrome/browser/ui/autofill/manual_fill:manual_fill", + "//ios/chrome/browser/ui/autofill/manual_fill:manual_fill_ui", "//ios/chrome/browser/ui/collection_view/cells", "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", @@ -80,9 +84,7 @@ source_set("autofill_ui") { "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/image_util", - "//ios/chrome/browser/ui/infobars", - "//ios/chrome/browser/ui/infobars/resources:infobar_close", - "//ios/chrome/browser/ui/infobars/resources:infobar_shadow", + "//ios/chrome/browser/ui/infobars:infobars_ui", "//ios/chrome/browser/ui/util", "//ios/chrome/common", "//ios/third_party/material_components_ios", @@ -98,11 +100,14 @@ source_set("eg_tests") { testonly = true sources = [ "save_card_infobar_egtest.mm", + "save_profile_egtest.mm", ] deps = [ ":autofill_ui", "//components/autofill/core/browser", "//components/autofill/ios/browser:test_support", + "//components/strings:components_strings_grit", + "//ios/chrome/browser/autofill", "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", "//ios/web/public/test/http_server", 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 da9617ce5f3..ad9f099ca70 100644 --- a/chromium/ios/chrome/browser/ui/autofill/manual_fill/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/autofill/manual_fill/BUILD.gn @@ -8,15 +8,33 @@ source_set("manual_fill") { sources = [ "credential_password_form.h", "credential_password_form.mm", + "form_observer_helper.h", + "form_observer_helper.mm", + "manual_fill_injection_handler.h", + "manual_fill_injection_handler.mm", + "password_coordinator.h", + "password_coordinator.mm", + "password_mediator.h", + "password_mediator.mm", ] deps = [ "//base", "//components/autofill/core/common", + "//components/autofill/ios/browser", + "//components/autofill/ios/form_util", + "//components/keyed_service/core:core", "//components/password_manager/core/browser", + "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser/autofill:autofill_shared", "//ios/chrome/browser/autofill/manual_fill:manual_fill", + "//ios/chrome/browser/passwords", "//ios/chrome/browser/ui/autofill/manual_fill:manual_fill_ui", - "//net:net", - "//url:url", + "//ios/chrome/browser/ui/coordinators:chrome_coordinators", + "//ios/chrome/browser/ui/list_model:list_model", + "//ios/chrome/browser/ui/table_view:table_view", + "//ios/chrome/browser/web_state_list:web_state_list", + "//ios/web/public:public", + "//ui/base:base", ] libs = [ "UIKit.framework" ] configs += [ "//build/config/compiler:enable_arc" ] @@ -28,11 +46,17 @@ source_set("manual_fill_ui") { "action_cell.mm", "credential.h", "credential.mm", + "keyboard_observer_helper.h", + "keyboard_observer_helper.mm", "manual_fill_accessory_view_controller.h", "manual_fill_accessory_view_controller.mm", "manual_fill_content_delegate.h", "manual_fill_password_cell.h", "manual_fill_password_cell.mm", + "password_consumer.h", + "password_list_delegate.h", + "password_view_controller.h", + "password_view_controller.mm", "uicolor_manualfill.h", "uicolor_manualfill.mm", ] @@ -43,8 +67,12 @@ source_set("manual_fill_ui") { "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser/autofill/manual_fill:manual_fill", "//ios/chrome/browser/ui/autofill/manual_fill/resources:addresses", + "//ios/chrome/browser/ui/list_model:list_model", + "//ios/chrome/browser/ui/table_view:styler", + "//ios/chrome/browser/ui/table_view:table_view", "//ios/chrome/common/ui_util:ui_util", "//net:net", + "//third_party/material_design_icons:ic_account_circle", "//third_party/material_design_icons:ic_credit_card", "//third_party/material_design_icons:ic_keyboard", "//third_party/material_design_icons:ic_vpn_key", @@ -60,13 +88,47 @@ source_set("unit_tests") { sources = [ "credential_password_form_unittest.mm", "credential_unittest.mm", + "form_observer_helper_unittest.mm", ] deps = [ ":manual_fill", ":manual_fill_ui", "//base:base", "//components/autofill/core/common:common", + "//components/autofill/ios/form_util:form_util", + "//components/autofill/ios/form_util:test_support", + "//ios/chrome/browser/web_state_list:test_support", + "//ios/chrome/browser/web_state_list:web_state_list", + "//ios/web/public/test/fakes:fakes", "//testing/gtest:gtest", + "//third_party/ocmock:ocmock", "//url:url", ] } + +source_set("eg_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ + "keyboard_observer_egtest.mm", + "password_view_controller_egtest.mm", + ] + deps = [ + ":manual_fill", + ":manual_fill_ui", + "//base", + "//base/test:test_support", + "//components/autofill/core/common", + "//components/keyed_service/core", + "//components/password_manager/core/browser", + "//ios/chrome/browser/passwords", + "//ios/chrome/browser/ui: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/earl_grey:earl_grey+link", + "//ios/web:earl_grey_test_support", + "//ios/web/public/test/http_server", + "//third_party/ocmock:ocmock", + ] +} diff --git a/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn index 31cd9e470ec..5494e165d87 100644 --- a/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn @@ -46,30 +46,11 @@ source_set("bookmarks") { ] deps = [ ":bookmarks_ui", - "resources:bookmark_bar_innershadow", "resources:bookmark_bar_shadow", - "resources:bookmark_black_delete", - "resources:bookmark_black_edit", - "resources:bookmark_black_move", - "resources:bookmark_black_select", "resources:bookmark_blue_check", "resources:bookmark_blue_folder", "resources:bookmark_blue_new_folder", "resources:bookmark_empty_star", - "resources:bookmark_gray_back", - "resources:bookmark_gray_check", - "resources:bookmark_gray_close", - "resources:bookmark_gray_edit", - "resources:bookmark_gray_folder", - "resources:bookmark_gray_folder_new", - "resources:bookmark_gray_menu", - "resources:bookmark_gray_new_folder", - "resources:bookmark_gray_star_large", - "resources:bookmark_more", - "resources:bookmark_white_close", - "resources:bookmark_white_delete", - "resources:bookmark_white_edit", - "resources:bookmark_white_move", "//base", "//base:i18n", "//components/bookmarks/browser", @@ -105,7 +86,6 @@ source_set("bookmarks") { "//ios/chrome/browser/ui/image_util", "//ios/chrome/browser/ui/keyboard", "//ios/chrome/browser/ui/list_model", - "//ios/chrome/browser/ui/main:feature_flags", "//ios/chrome/browser/ui/material_components", "//ios/chrome/browser/ui/ntp", "//ios/chrome/browser/ui/signin_interaction/public", @@ -190,10 +170,9 @@ source_set("eg_tests") { "//ios/chrome/browser/ui/bookmarks:bookmarks", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/popup_menu:constants", + "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/toolbar/buttons", - "//ios/chrome/browser/ui/toolbar/legacy", "//ios/chrome/browser/ui/toolbar/public", - "//ios/chrome/browser/ui/tools_menu/public", "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", "//ios/public/provider/chrome/browser/signin:test_support", diff --git a/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn index f5b4fa49c02..8a7ace18668 100644 --- a/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn @@ -12,8 +12,6 @@ source_set("cells") { "bookmark_home_promo_item.mm", "bookmark_parent_folder_item.h", "bookmark_parent_folder_item.mm", - "bookmark_table_cell.h", - "bookmark_table_cell.mm", "bookmark_table_cell_title_edit_delegate.h", "bookmark_table_cell_title_editing.h", "bookmark_table_signin_promo_cell.h", diff --git a/chromium/ios/chrome/browser/ui/bookmarks/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/resources/BUILD.gn index b8b2c0e108a..4acf3900e83 100644 --- a/chromium/ios/chrome/browser/ui/bookmarks/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/bookmarks/resources/BUILD.gn @@ -4,15 +4,6 @@ import("//build/config/ios/asset_catalog.gni") -imageset("bookmark_bar_innershadow") { - sources = [ - "bookmark_bar_innershadow.imageset/Contents.json", - "bookmark_bar_innershadow.imageset/bookmark_bar_innershadow.png", - "bookmark_bar_innershadow.imageset/bookmark_bar_innershadow@2x.png", - "bookmark_bar_innershadow.imageset/bookmark_bar_innershadow@3x.png", - ] -} - imageset("bookmark_bar_shadow") { sources = [ "bookmark_bar_shadow.imageset/Contents.json", @@ -22,42 +13,6 @@ imageset("bookmark_bar_shadow") { ] } -imageset("bookmark_black_delete") { - sources = [ - "bookmark_black_delete.imageset/Contents.json", - "bookmark_black_delete.imageset/bookmark_black_delete.png", - "bookmark_black_delete.imageset/bookmark_black_delete@2x.png", - "bookmark_black_delete.imageset/bookmark_black_delete@3x.png", - ] -} - -imageset("bookmark_black_edit") { - sources = [ - "bookmark_black_edit.imageset/Contents.json", - "bookmark_black_edit.imageset/bookmark_black_edit.png", - "bookmark_black_edit.imageset/bookmark_black_edit@2x.png", - "bookmark_black_edit.imageset/bookmark_black_edit@3x.png", - ] -} - -imageset("bookmark_black_move") { - sources = [ - "bookmark_black_move.imageset/Contents.json", - "bookmark_black_move.imageset/bookmark_black_move.png", - "bookmark_black_move.imageset/bookmark_black_move@2x.png", - "bookmark_black_move.imageset/bookmark_black_move@3x.png", - ] -} - -imageset("bookmark_black_select") { - sources = [ - "bookmark_black_select.imageset/Contents.json", - "bookmark_black_select.imageset/bookmark_black_select.png", - "bookmark_black_select.imageset/bookmark_black_select@2x.png", - "bookmark_black_select.imageset/bookmark_black_select@3x.png", - ] -} - imageset("bookmark_blue_check") { sources = [ "bookmark_blue_check.imageset/Contents.json", @@ -93,129 +48,3 @@ imageset("bookmark_empty_star") { "bookmark_empty_star.imageset/bookmark_empty_star@3x.png", ] } - -imageset("bookmark_gray_back") { - sources = [ - "bookmark_gray_back.imageset/Contents.json", - "bookmark_gray_back.imageset/bookmark_gray_back.png", - "bookmark_gray_back.imageset/bookmark_gray_back@2x.png", - "bookmark_gray_back.imageset/bookmark_gray_back@3x.png", - ] -} - -imageset("bookmark_gray_check") { - sources = [ - "bookmark_gray_check.imageset/Contents.json", - "bookmark_gray_check.imageset/bookmark_gray_check.png", - "bookmark_gray_check.imageset/bookmark_gray_check@2x.png", - "bookmark_gray_check.imageset/bookmark_gray_check@3x.png", - ] -} - -imageset("bookmark_gray_close") { - sources = [ - "bookmark_gray_close.imageset/Contents.json", - "bookmark_gray_close.imageset/bookmark_gray_close.png", - "bookmark_gray_close.imageset/bookmark_gray_close@2x.png", - "bookmark_gray_close.imageset/bookmark_gray_close@3x.png", - ] -} - -imageset("bookmark_gray_edit") { - sources = [ - "bookmark_gray_edit.imageset/Contents.json", - "bookmark_gray_edit.imageset/bookmark_gray_edit.png", - "bookmark_gray_edit.imageset/bookmark_gray_edit@2x.png", - "bookmark_gray_edit.imageset/bookmark_gray_edit@3x.png", - ] -} - -imageset("bookmark_gray_folder") { - sources = [ - "bookmark_gray_folder.imageset/Contents.json", - "bookmark_gray_folder.imageset/bookmark_gray_folder.png", - "bookmark_gray_folder.imageset/bookmark_gray_folder@2x.png", - "bookmark_gray_folder.imageset/bookmark_gray_folder@3x.png", - ] -} - -imageset("bookmark_gray_folder_new") { - sources = [ - "bookmark_gray_folder_new.imageset/Contents.json", - "bookmark_gray_folder_new.imageset/bookmark_gray_folder_new.png", - "bookmark_gray_folder_new.imageset/bookmark_gray_folder_new@2x.png", - "bookmark_gray_folder_new.imageset/bookmark_gray_folder_new@3x.png", - ] -} - -imageset("bookmark_gray_menu") { - sources = [ - "bookmark_gray_menu.imageset/Contents.json", - "bookmark_gray_menu.imageset/bookmark_gray_menu.png", - "bookmark_gray_menu.imageset/bookmark_gray_menu@2x.png", - "bookmark_gray_menu.imageset/bookmark_gray_menu@3x.png", - ] -} - -imageset("bookmark_gray_new_folder") { - sources = [ - "bookmark_gray_new_folder.imageset/Contents.json", - "bookmark_gray_new_folder.imageset/bookmark_gray_new_folder.png", - "bookmark_gray_new_folder.imageset/bookmark_gray_new_folder@2x.png", - "bookmark_gray_new_folder.imageset/bookmark_gray_new_folder@3x.png", - ] -} - -imageset("bookmark_gray_star_large") { - sources = [ - "bookmark_gray_star_large.imageset/Contents.json", - "bookmark_gray_star_large.imageset/bookmark_gray_star_large.png", - "bookmark_gray_star_large.imageset/bookmark_gray_star_large@2x.png", - "bookmark_gray_star_large.imageset/bookmark_gray_star_large@3x.png", - ] -} - -imageset("bookmark_more") { - sources = [ - "bookmark_more.imageset/Contents.json", - "bookmark_more.imageset/bookmark_more.png", - "bookmark_more.imageset/bookmark_more@2x.png", - "bookmark_more.imageset/bookmark_more@3x.png", - ] -} - -imageset("bookmark_white_close") { - sources = [ - "bookmark_white_close.imageset/Contents.json", - "bookmark_white_close.imageset/bookmark_white_close.png", - "bookmark_white_close.imageset/bookmark_white_close@2x.png", - "bookmark_white_close.imageset/bookmark_white_close@3x.png", - ] -} - -imageset("bookmark_white_delete") { - sources = [ - "bookmark_white_delete.imageset/Contents.json", - "bookmark_white_delete.imageset/bookmark_white_delete.png", - "bookmark_white_delete.imageset/bookmark_white_delete@2x.png", - "bookmark_white_delete.imageset/bookmark_white_delete@3x.png", - ] -} - -imageset("bookmark_white_edit") { - sources = [ - "bookmark_white_edit.imageset/Contents.json", - "bookmark_white_edit.imageset/bookmark_white_edit.png", - "bookmark_white_edit.imageset/bookmark_white_edit@2x.png", - "bookmark_white_edit.imageset/bookmark_white_edit@3x.png", - ] -} - -imageset("bookmark_white_move") { - sources = [ - "bookmark_white_move.imageset/Contents.json", - "bookmark_white_move.imageset/bookmark_white_move.png", - "bookmark_white_move.imageset/bookmark_white_move@2x.png", - "bookmark_white_move.imageset/bookmark_white_move@3x.png", - ] -} diff --git a/chromium/ios/chrome/browser/ui/commands/BUILD.gn b/chromium/ios/chrome/browser/ui/commands/BUILD.gn index 4095484fa05..df6a0a60be8 100644 --- a/chromium/ios/chrome/browser/ui/commands/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/commands/BUILD.gn @@ -12,7 +12,6 @@ source_set("commands") { "command_dispatcher.h", "command_dispatcher.mm", "external_search_commands.h", - "history_popup_commands.h", "load_query_commands.h", "omnibox_suggestion_commands.h", "open_new_tab_command.h", @@ -27,7 +26,6 @@ source_set("commands") { "show_signin_command.mm", "snackbar_commands.h", "toolbar_commands.h", - "tools_menu_commands.h", ] deps = [ "//base", diff --git a/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn b/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn index fd5089c84fd..c58e8edeac7 100644 --- a/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn @@ -59,16 +59,11 @@ source_set("content_suggestions") { "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/favicon", "//ios/chrome/browser/ui/ntp", - "//ios/chrome/browser/ui/ntp:ntp_header", "//ios/chrome/browser/ui/ntp:ntp_internal", "//ios/chrome/browser/ui/overscroll_actions", "//ios/chrome/browser/ui/reading_list", "//ios/chrome/browser/ui/settings/utils:utils", - "//ios/chrome/browser/ui/toolbar", "//ios/chrome/browser/ui/toolbar:toolbar_ui", - "//ios/chrome/browser/ui/toolbar/adaptive:adaptive_ui", - "//ios/chrome/browser/ui/toolbar/buttons", - "//ios/chrome/browser/ui/toolbar/clean:toolbar", "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web_state_list", @@ -125,10 +120,8 @@ source_set("content_suggestions_ui") { "//ios/chrome/browser/ui/content_suggestions/identifier", "//ios/chrome/browser/ui/list_model", "//ios/chrome/browser/ui/ntp", - "//ios/chrome/browser/ui/ntp:ntp_header", "//ios/chrome/browser/ui/overscroll_actions", - "//ios/chrome/browser/ui/toolbar:toolbar_ui", - "//ios/chrome/browser/ui/toolbar/buttons:buttons", + "//ios/chrome/browser/ui/toolbar/buttons", "//ios/chrome/browser/ui/util:util", "//ios/chrome/common/favicon", "//ios/web/public", @@ -169,6 +162,7 @@ source_set("content_suggestions_ui_util") { "//ios/chrome/browser/ui/ntp", "//ios/chrome/browser/ui/toolbar/public", "//ios/third_party/material_components_ios", + "//ios/web/public", "//ui/base", ] configs += [ "//build/config/compiler:enable_arc" ] diff --git a/chromium/ios/chrome/browser/ui/dialogs/BUILD.gn b/chromium/ios/chrome/browser/ui/dialogs/BUILD.gn index ee1693c508c..6e48d9d9ae7 100644 --- a/chromium/ios/chrome/browser/ui/dialogs/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/dialogs/BUILD.gn @@ -93,7 +93,6 @@ source_set("eg_tests") { "//components/strings", "//ios/chrome/app/strings", "//ios/chrome/browser/ui", - "//ios/chrome/browser/ui/tools_menu/public", "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", "//ios/testing/earl_grey:earl_grey_support", diff --git a/chromium/ios/chrome/browser/ui/download/BUILD.gn b/chromium/ios/chrome/browser/ui/download/BUILD.gn index 62507e26d96..5c310dca78e 100644 --- a/chromium/ios/chrome/browser/ui/download/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/download/BUILD.gn @@ -26,6 +26,7 @@ source_set("download") { "resources:background_compact", "resources:background_regular", "resources:done_badge", + "resources:download_close", "resources:error_badge", "//base", "//components/infobars/core", diff --git a/chromium/ios/chrome/browser/ui/download/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/download/resources/BUILD.gn index 251aa8e777a..1114401547b 100644 --- a/chromium/ios/chrome/browser/ui/download/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/download/resources/BUILD.gn @@ -30,7 +30,14 @@ imageset("done_badge") { "done_badge.imageset/done_badge@3x.png", ] } - +imageset("download_close") { + sources = [ + "download_close.imageset/Contents.json", + "download_close.imageset/download_close.png", + "download_close.imageset/download_close@2x.png", + "download_close.imageset/download_close@3x.png", + ] +} imageset("error_badge") { sources = [ "error_badge.imageset/Contents.json", diff --git a/chromium/ios/chrome/browser/ui/elements/BUILD.gn b/chromium/ios/chrome/browser/ui/elements/BUILD.gn index 3b2a5c4ea73..1c5c65c2812 100644 --- a/chromium/ios/chrome/browser/ui/elements/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/elements/BUILD.gn @@ -25,6 +25,7 @@ source_set("unit_tests") { testonly = true sources = [ "activity_overlay_coordinator_unittest.mm", + "chrome_activity_overlay_coordinator_unittest.mm", "selector_coordinator_unittest.mm", "selector_picker_view_controller_unittest.mm", ] @@ -45,6 +46,10 @@ source_set("elements_internal") { "activity_overlay_coordinator.mm", "activity_overlay_view_controller.h", "activity_overlay_view_controller.mm", + "chrome_activity_overlay_coordinator.h", + "chrome_activity_overlay_coordinator.mm", + "chrome_activity_overlay_view_controller.h", + "chrome_activity_overlay_view_controller.mm", ] deps = [ "//base", diff --git a/chromium/ios/chrome/browser/ui/find_bar/BUILD.gn b/chromium/ios/chrome/browser/ui/find_bar/BUILD.gn index 42e83cff627..758a7149ec9 100644 --- a/chromium/ios/chrome/browser/ui/find_bar/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/find_bar/BUILD.gn @@ -9,31 +9,12 @@ source_set("find_bar") { "find_bar_constants.mm", "find_bar_controller_ios.h", "find_bar_controller_ios.mm", - "find_bar_touch_forwarding_view.h", - "find_bar_touch_forwarding_view.mm", - "find_bar_ui_element.h", "find_bar_view.h", "find_bar_view.mm", - "legacy_find_bar_view.h", - "legacy_find_bar_view.mm", ] deps = [ - "resources:find_bg", - "resources:find_close", - "resources:find_close_incognito", - "resources:find_close_pressed", "resources:find_next", - "resources:find_next_disabled", - "resources:find_next_disabled_incognito", - "resources:find_next_incognito", - "resources:find_next_pressed", - "resources:find_next_pressed_incognito", "resources:find_prev", - "resources:find_prev_disabled", - "resources:find_prev_disabled_incognito", - "resources:find_prev_incognito", - "resources:find_prev_pressed", - "resources:find_prev_pressed_incognito", "//base", "//base:i18n", "//components/strings", @@ -65,7 +46,6 @@ source_set("eg_tests") { "//ios/chrome/app/strings", "//ios/chrome/browser/find_in_page", "//ios/chrome/browser/ui/popup_menu:constants", - "//ios/chrome/browser/ui/tools_menu/public", "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", "//ios/web/public/test/http_server", diff --git a/chromium/ios/chrome/browser/ui/find_bar/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/find_bar/resources/BUILD.gn index fc738bfea34..aa77c57e7da 100644 --- a/chromium/ios/chrome/browser/ui/find_bar/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/find_bar/resources/BUILD.gn @@ -4,50 +4,6 @@ import("//build/config/ios/asset_catalog.gni") -imageset("find_prev_disabled_incognito") { - sources = [ - "find_prev_disabled_incognito.imageset/Contents.json", - "find_prev_disabled_incognito.imageset/find_prev_disabled_incognito.png", - "find_prev_disabled_incognito.imageset/find_prev_disabled_incognito@2x.png", - "find_prev_disabled_incognito.imageset/find_prev_disabled_incognito@3x.png", - ] -} - -imageset("find_bg") { - sources = [ - "find_bg.imageset/Contents.json", - "find_bg.imageset/find_bg@2x~ipad.png", - "find_bg.imageset/find_bg~ipad.png", - ] -} - -imageset("find_next_incognito") { - sources = [ - "find_next_incognito.imageset/Contents.json", - "find_next_incognito.imageset/find_next_incognito.png", - "find_next_incognito.imageset/find_next_incognito@2x.png", - "find_next_incognito.imageset/find_next_incognito@3x.png", - ] -} - -imageset("find_prev_pressed_incognito") { - sources = [ - "find_prev_pressed_incognito.imageset/Contents.json", - "find_prev_pressed_incognito.imageset/find_prev_pressed_incognito.png", - "find_prev_pressed_incognito.imageset/find_prev_pressed_incognito@2x.png", - "find_prev_pressed_incognito.imageset/find_prev_pressed_incognito@3x.png", - ] -} - -imageset("find_prev_disabled") { - sources = [ - "find_prev_disabled.imageset/Contents.json", - "find_prev_disabled.imageset/find_prev_disabled.png", - "find_prev_disabled.imageset/find_prev_disabled@2x.png", - "find_prev_disabled.imageset/find_prev_disabled@3x.png", - ] -} - imageset("find_prev") { sources = [ "find_prev.imageset/Contents.json", @@ -57,78 +13,6 @@ imageset("find_prev") { ] } -imageset("find_prev_incognito") { - sources = [ - "find_prev_incognito.imageset/Contents.json", - "find_prev_incognito.imageset/find_prev_incognito.png", - "find_prev_incognito.imageset/find_prev_incognito@2x.png", - "find_prev_incognito.imageset/find_prev_incognito@3x.png", - ] -} - -imageset("find_close") { - sources = [ - "find_close.imageset/Contents.json", - "find_close.imageset/find_close.png", - "find_close.imageset/find_close@2x.png", - "find_close.imageset/find_close@3x.png", - ] -} - -imageset("find_close_incognito") { - sources = [ - "find_close_incognito.imageset/Contents.json", - "find_close_incognito.imageset/find_close_incognito.png", - "find_close_incognito.imageset/find_close_incognito@2x.png", - "find_close_incognito.imageset/find_close_incognito@3x.png", - ] -} - -imageset("find_prev_pressed") { - sources = [ - "find_prev_pressed.imageset/Contents.json", - "find_prev_pressed.imageset/find_prev_pressed.png", - "find_prev_pressed.imageset/find_prev_pressed@2x.png", - "find_prev_pressed.imageset/find_prev_pressed@3x.png", - ] -} - -imageset("find_close_pressed") { - sources = [ - "find_close_pressed.imageset/Contents.json", - "find_close_pressed.imageset/find_close_pressed.png", - "find_close_pressed.imageset/find_close_pressed@2x.png", - "find_close_pressed.imageset/find_close_pressed@3x.png", - ] -} - -imageset("find_next_disabled") { - sources = [ - "find_next_disabled.imageset/Contents.json", - "find_next_disabled.imageset/find_next_disabled.png", - "find_next_disabled.imageset/find_next_disabled@2x.png", - "find_next_disabled.imageset/find_next_disabled@3x.png", - ] -} - -imageset("find_next_disabled_incognito") { - sources = [ - "find_next_disabled_incognito.imageset/Contents.json", - "find_next_disabled_incognito.imageset/find_next_disabled_incognito.png", - "find_next_disabled_incognito.imageset/find_next_disabled_incognito@2x.png", - "find_next_disabled_incognito.imageset/find_next_disabled_incognito@3x.png", - ] -} - -imageset("find_next_pressed_incognito") { - sources = [ - "find_next_pressed_incognito.imageset/Contents.json", - "find_next_pressed_incognito.imageset/find_next_pressed_incognito.png", - "find_next_pressed_incognito.imageset/find_next_pressed_incognito@2x.png", - "find_next_pressed_incognito.imageset/find_next_pressed_incognito@3x.png", - ] -} - imageset("find_next") { sources = [ "find_next.imageset/Contents.json", @@ -137,12 +21,3 @@ imageset("find_next") { "find_next.imageset/find_next@3x.png", ] } - -imageset("find_next_pressed") { - sources = [ - "find_next_pressed.imageset/Contents.json", - "find_next_pressed.imageset/find_next_pressed.png", - "find_next_pressed.imageset/find_next_pressed@2x.png", - "find_next_pressed.imageset/find_next_pressed@3x.png", - ] -} diff --git a/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn b/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn index 7d8af46a0c4..c94fa843d31 100644 --- a/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn @@ -90,6 +90,7 @@ source_set("internal") { ":ui", "//base", "//components/keyed_service/ios", + "//ios/chrome/browser", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/ui:ui_util", "//ios/chrome/browser/ui/broadcaster", diff --git a/chromium/ios/chrome/browser/ui/history/BUILD.gn b/chromium/ios/chrome/browser/ui/history/BUILD.gn index e6cca714735..6c4753c883d 100644 --- a/chromium/ios/chrome/browser/ui/history/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/history/BUILD.gn @@ -5,80 +5,29 @@ source_set("history") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ - "clear_browsing_bar.h", - "clear_browsing_bar.mm", - "favicon_view.h", - "favicon_view.mm", - "favicon_view_provider.h", - "favicon_view_provider.mm", "history_coordinator.h", "history_coordinator.mm", "history_mediator.h", "history_mediator.mm", - "history_panel_view_controller.h", - "history_panel_view_controller.mm", - "history_search_view.h", - "history_search_view.mm", - "history_search_view_controller.h", - "history_search_view_controller.mm", "ios_browsing_history_driver.h", "ios_browsing_history_driver.mm", - "legacy_history_collection_view_controller.h", - "legacy_history_collection_view_controller.mm", - "legacy_history_entries_status_item.h", - "legacy_history_entries_status_item.mm", - "legacy_history_entry_item.h", - "legacy_history_entry_item.mm", ] deps = [ ":clear_browsing_data", - ":feature_flags", ":history_ui", "//base", - "//base:i18n", "//components/browser_sync", "//components/browsing_data/core", - "//components/favicon/core", - "//components/favicon_base", "//components/history/core/browser", "//components/keyed_service/core", - "//components/prefs", - "//components/query_parser", - "//components/strings", - "//components/sync/protocol", - "//components/url_formatter", - "//ios/chrome/app/strings", - "//ios/chrome/browser", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/favicon", "//ios/chrome/browser/history", - "//ios/chrome/browser/metrics:metrics_internal", - "//ios/chrome/browser/signin", "//ios/chrome/browser/sync", "//ios/chrome/browser/ui", - "//ios/chrome/browser/ui/collection_view", - "//ios/chrome/browser/ui/colors", - "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/context_menu", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", - "//ios/chrome/browser/ui/icons", - "//ios/chrome/browser/ui/keyboard", - "//ios/chrome/browser/ui/list_model", - "//ios/chrome/browser/ui/material_components", - "//ios/chrome/browser/ui/ntp/recent_tabs/views", - "//ios/chrome/browser/ui/popup_menu", - "//ios/chrome/browser/ui/settings", "//ios/chrome/browser/ui/table_view", - "//ios/chrome/browser/ui/table_view/cells", - "//ios/chrome/browser/ui/util", - "//ios/chrome/common", - "//ios/third_party/material_components_ios", - "//ios/third_party/material_roboto_font_loader_ios", - "//ios/web", - "//net", - "//skia", - "//ui/base", - "//url", ] libs = [ "MobileCoreServices.framework", @@ -161,81 +110,22 @@ source_set("clear_browsing_data") { ] } -source_set("feature_flags") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "features.cc", - "features.h", - ] - deps = [ - "//base", - ] -} - source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ - "favicon_view_provider_unittest.mm", - "history_collection_view_controller_unittest.mm", "history_entry_inserter_unittest.mm", - "history_search_view_controller_unittest.mm", - "legacy_history_entries_status_item_unittest.mm", - "legacy_history_entry_item_unittest.mm", ] deps = [ - ":history", ":history_ui", - ":resources_unit_tests", "//base", "//base/test:test_support", - "//components/browser_sync", - "//components/favicon/core", - "//components/favicon/core/test:test_support", - "//components/favicon_base", "//components/history/core/browser", - "//components/keyed_service/core", - "//components/sessions", - "//components/strings", - "//ios/chrome/app/strings", - "//ios/chrome/browser", - "//ios/chrome/browser/browser_state:test_support", - "//ios/chrome/browser/history", - "//ios/chrome/browser/signin", - "//ios/chrome/browser/signin:test_support", - "//ios/chrome/browser/sync:sync", - "//ios/chrome/browser/sync:test_support", "//ios/chrome/browser/ui", - "//ios/chrome/browser/ui:feature_flags", - "//ios/chrome/browser/ui/collection_view", "//ios/chrome/browser/ui/list_model", - "//ios/chrome/browser/ui/util", - "//ios/chrome/common", "//ios/chrome/test:test_support", - "//ios/web", - "//ios/web/public/test", - "//skia", - "//testing/gmock", "//testing/gtest", "//third_party/ocmock", - "//ui/base", - "//ui/gfx", - "//url", - ] -} - -bundle_data("resources_unit_tests") { - visibility = [ - ":unit_tests", - ":unit_tests_arc", - ] - testonly = true - sources = [ - "//ios/chrome/test/data/favicon/test_favicon.png", - ] - outputs = [ - "{{bundle_resources_dir}}/" + - "ios/chrome/test/data/favicon/{{source_file_part}}", ] } @@ -259,10 +149,10 @@ source_set("eg_tests") { "//ios/chrome/browser/ui:ui", "//ios/chrome/browser/ui/authentication:authentication_ui", "//ios/chrome/browser/ui/authentication:eg_test_support", + "//ios/chrome/browser/ui/popup_menu:constants", "//ios/chrome/browser/ui/settings", + "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/table_view/cells", - "//ios/chrome/browser/ui/tools_menu", - "//ios/chrome/browser/ui/tools_menu/public", "//ios/chrome/browser/ui/util", "//ios/chrome/common", "//ios/chrome/test/app:test_support", diff --git a/chromium/ios/chrome/browser/ui/history_popup/BUILD.gn b/chromium/ios/chrome/browser/ui/history_popup/BUILD.gn deleted file mode 100644 index 52a01d36ab9..00000000000 --- a/chromium/ios/chrome/browser/ui/history_popup/BUILD.gn +++ /dev/null @@ -1,87 +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("history_popup") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "tab_history_cell.h", - "tab_history_cell.mm", - "tab_history_popup_controller.h", - "tab_history_popup_controller.mm", - "tab_history_view_controller.h", - "tab_history_view_controller.mm", - ] - deps = [ - "//base", - "//ios/chrome/browser/ui", - "//ios/chrome/browser/ui/commands", - "//ios/chrome/browser/ui/favicon/resources:default_favicon", - "//ios/chrome/browser/ui/popup_menu:constants", - "//ios/chrome/browser/ui/popup_menu:popup_menu_ui", - "//ios/chrome/browser/ui/util", - "//ios/chrome/common", - "//ios/third_party/material_components_ios", - "//ios/web", - "//ui/gfx", - "//url", - ] -} - -source_set("coordinator") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "tab_history_legacy_coordinator.h", - "tab_history_legacy_coordinator.mm", - ] - deps = [ - ":history_popup", - "//base", - "//ios/chrome/browser", - "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui:ui_util", - "//ios/chrome/browser/ui/commands", - "//ios/chrome/browser/ui/coordinators:chrome_coordinators", - "//ios/chrome/browser/ui/fullscreen", - "//ios/chrome/browser/ui/fullscreen:coordinators", - "//ios/chrome/browser/ui/history_popup/requirements", - "//ios/chrome/browser/ui/toolbar/public:feature_flags", - "//ios/chrome/browser/ui/util", - ] -} - -source_set("unit_tests") { - configs += [ "//build/config/compiler:enable_arc" ] - testonly = true - sources = [ - "tab_history_popup_controller_unittest.mm", - ] - deps = [ - ":history_popup", - "//components/sessions", - "//ios/chrome/browser/ui", - "//ios/chrome/browser/ui/util", - "//ios/web", - "//testing/gmock", - "//testing/gtest", - "//third_party/ocmock", - "//ui/gfx", - ] -} - -source_set("eg_tests") { - configs += [ "//build/config/compiler:enable_arc" ] - testonly = true - sources = [ - "tab_history_popup_controller_egtest.mm", - ] - deps = [ - ":history_popup", - "//base", - "//components/strings", - "//ios/chrome/test/app:test_support", - "//ios/chrome/test/earl_grey:test_support", - "//ios/web/public/test", - "//ios/web/public/test/http_server", - ] -} diff --git a/chromium/ios/chrome/browser/ui/history_popup/requirements/BUILD.gn b/chromium/ios/chrome/browser/ui/history_popup/requirements/BUILD.gn deleted file mode 100644 index 1d41b56c2f3..00000000000 --- a/chromium/ios/chrome/browser/ui/history_popup/requirements/BUILD.gn +++ /dev/null @@ -1,13 +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("requirements") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "tab_history_constants.h", - "tab_history_constants.mm", - "tab_history_presentation.h", - "tab_history_ui_updater.h", - ] -} diff --git a/chromium/ios/chrome/browser/ui/infobars/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/BUILD.gn index d04797a01fe..13790bd0ed2 100644 --- a/chromium/ios/chrome/browser/ui/infobars/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/infobars/BUILD.gn @@ -5,6 +5,26 @@ source_set("infobars") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ + "infobar_coordinator.h", + "infobar_coordinator.mm", + ] + deps = [ + ":public", + "//base", + "//ios/chrome/browser/infobars", + "//ios/chrome/browser/ui/coordinators:chrome_coordinators", + ] +} + +source_set("public") { + sources = [ + "infobar_positioner.h", + ] +} + +source_set("infobars_ui") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ "confirm_infobar_view.h", "confirm_infobar_view.mm", "infobar_constants.h", @@ -13,10 +33,8 @@ source_set("infobars") { "infobar_view_sizing_delegate.h", ] deps = [ - "resources:infobar_close", "resources:infobar_downloading", "resources:infobar_popup_blocker", - "resources:infobar_shadow", "resources:infobar_warning", "//base", "//base:i18n", @@ -47,7 +65,7 @@ source_set("unit_tests") { "confirm_infobar_view_unittest.mm", ] deps = [ - ":infobars", + ":infobars_ui", "//testing/gtest", ] } diff --git a/chromium/ios/chrome/browser/ui/infobars/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/resources/BUILD.gn index c060f758840..282f2767b8c 100644 --- a/chromium/ios/chrome/browser/ui/infobars/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/infobars/resources/BUILD.gn @@ -22,23 +22,6 @@ imageset("infobar_downloading") { ] } -imageset("infobar_shadow") { - sources = [ - "infobar_shadow.imageset/Contents.json", - "infobar_shadow.imageset/infobar_shadow.png", - "infobar_shadow.imageset/infobar_shadow@2x.png", - ] -} - -imageset("infobar_close") { - sources = [ - "infobar_close.imageset/Contents.json", - "infobar_close.imageset/infobar_close.png", - "infobar_close.imageset/infobar_close@2x.png", - "infobar_close.imageset/infobar_close@3x.png", - ] -} - imageset("infobar_popup_blocker") { sources = [ "infobar_popup_blocker.imageset/Contents.json", diff --git a/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn b/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn index 067db7ca686..9c4239f5459 100644 --- a/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn @@ -11,13 +11,6 @@ source_set("location_bar") { "location_bar_coordinator.h", "location_bar_coordinator.mm", "location_bar_generic_coordinator.h", - "location_bar_legacy_consumer.h", - "location_bar_legacy_coordinator.h", - "location_bar_legacy_coordinator.mm", - "location_bar_legacy_mediator.h", - "location_bar_legacy_mediator.mm", - "location_bar_legacy_view.h", - "location_bar_legacy_view.mm", "location_bar_mediator.h", "location_bar_mediator.mm", "location_bar_steady_view.h", @@ -91,6 +84,27 @@ source_set("location_bar") { [ "//ios/chrome/browser/ui/omnibox:omnibox_internal" ] } +source_set("toolbar_model_delegate") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "toolbar_model_delegate_ios.h", + "toolbar_model_delegate_ios.mm", + ] + deps = [ + "//base", + "//components/omnibox/browser", + "//components/prefs", + "//components/toolbar", + "//ios/chrome/browser", + "//ios/chrome/browser/autocomplete", + "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/ssl", + "//ios/chrome/browser/web_state_list", + "//ios/web/public", + ] + libs = [ "UIKit.framework" ] +} + source_set("constants") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ @@ -108,7 +122,6 @@ source_set("unit_tests") { testonly = true sources = [ "location_bar_coordinator_unittest.mm", - "location_bar_mediator_unittest.mm", ] deps = [ ":location_bar", @@ -122,7 +135,7 @@ source_set("unit_tests") { "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/search_engines", "//ios/chrome/browser/ui/commands", - "//ios/chrome/browser/ui/toolbar/clean:toolbar", + "//ios/chrome/browser/ui/toolbar", "//ios/chrome/browser/ui/toolbar/test", "//ios/chrome/browser/web_state_list", "//ios/chrome/browser/web_state_list:test_support", diff --git a/chromium/ios/chrome/browser/ui/main/BUILD.gn b/chromium/ios/chrome/browser/ui/main/BUILD.gn index 2d529a2cf8d..24da1369196 100644 --- a/chromium/ios/chrome/browser/ui/main/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/main/BUILD.gn @@ -10,16 +10,10 @@ source_set("main") { "browser_view_wrangler.mm", "bvc_container_view_controller.h", "bvc_container_view_controller.mm", - "main_containing_view_controller.h", - "main_containing_view_controller.mm", - "main_coordinator.h", - "main_coordinator.mm", - "main_presenting_view_controller.h", - "main_presenting_view_controller.mm", "view_controller_swapping.h", ] deps = [ - ":feature_flags", + ":tab_switcher", "//base", "//ios/chrome/app/resources:launchscreen_xib", "//ios/chrome/browser", @@ -31,8 +25,6 @@ source_set("main") { "//ios/chrome/browser/sessions:serialisation", "//ios/chrome/browser/tabs", "//ios/chrome/browser/tabs:tabs_internal", - "//ios/chrome/browser/ui/main/transitions", - "//ios/chrome/browser/ui/tab_switcher", "//ios/public/provider/chrome/browser", ] public_deps = [ @@ -41,14 +33,17 @@ source_set("main") { libs = [ "UIKit.framework" ] } -source_set("feature_flags") { +source_set("tab_switcher") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ - "main_feature_flags.cc", - "main_feature_flags.h", + "tab_switcher.h", ] deps = [ "//base", + "//ios/chrome/browser/ui", + "//ios/chrome/browser/ui/commands", + "//ui/base", + "//url", ] } @@ -57,13 +52,10 @@ source_set("unit_tests") { testonly = true sources = [ "browser_view_wrangler_unittest.mm", - "main_containing_view_controller_unittest.mm", - "main_coordinator_unittest.mm", - "main_presenting_view_controller_unittest.mm", ] deps = [ ":main", - ":test_support", + ":tab_switcher", "//base", "//base/test:test_support", "//components/bookmarks/test", @@ -71,23 +63,8 @@ source_set("unit_tests") { "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/tabs", "//ios/chrome/browser/ui:ui_internal", - "//ios/chrome/browser/ui/tab_switcher", "//ios/chrome/test:block_cleanup_test", "//ios/web/public/test", "//testing/gtest", ] } - -source_set("test_support") { - configs += [ "//build/config/compiler:enable_arc" ] - testonly = true - sources = [ - "main_view_controller_test.h", - "main_view_controller_test.mm", - ] - deps = [ - "//base", - "//ios/chrome/browser/ui/tab_switcher", - "//ios/chrome/test:test_support", - ] -} diff --git a/chromium/ios/chrome/browser/ui/main/transitions/BUILD.gn b/chromium/ios/chrome/browser/ui/main/transitions/BUILD.gn deleted file mode 100644 index 9b3184a8cf0..00000000000 --- a/chromium/ios/chrome/browser/ui/main/transitions/BUILD.gn +++ /dev/null @@ -1,18 +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("transitions") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "bvc_container_to_tab_switcher_animator.h", - "bvc_container_to_tab_switcher_animator.mm", - "tab_switcher_to_bvc_container_animator.h", - "tab_switcher_to_bvc_container_animator.mm", - ] - deps = [ - "//base", - "//ios/chrome/browser/ui/tab_switcher", - ] - libs = [ "UIKit.framework" ] -} diff --git a/chromium/ios/chrome/browser/ui/material_components/BUILD.gn b/chromium/ios/chrome/browser/ui/material_components/BUILD.gn index a26ab6016ef..1c2163bdc29 100644 --- a/chromium/ios/chrome/browser/ui/material_components/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/material_components/BUILD.gn @@ -7,7 +7,6 @@ source_set("material_components") { sources = [ "activity_indicator.h", "activity_indicator.mm", - "app_bar_presenting.h", "app_bar_view_controller_presenting.h", "chrome_app_bar_view_controller.h", "chrome_app_bar_view_controller.m", diff --git a/chromium/ios/chrome/browser/ui/ntp/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp/BUILD.gn index a4da2cb9409..bb1de5feb04 100644 --- a/chromium/ios/chrome/browser/ui/ntp/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/ntp/BUILD.gn @@ -7,7 +7,6 @@ source_set("ntp") { "new_tab_page_controller_delegate.h", "new_tab_page_header_constants.h", "new_tab_page_header_constants.mm", - "new_tab_page_panel_protocol.h", ] configs += [ "//build/config/compiler:enable_arc" ] deps = [ @@ -15,40 +14,6 @@ source_set("ntp") { ] } -source_set("ntp_header") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "new_tab_page_header_view.h", - "new_tab_page_header_view.mm", - "new_tab_page_toolbar_controller.h", - "new_tab_page_toolbar_controller.mm", - "ntp_header_view_adapter.h", - ] - deps = [ - ":ntp", - "//base", - "//components/ntp_tiles", - "//components/strings", - "//components/toolbar", - "//ios/chrome/app/theme", - "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui", - "//ios/chrome/browser/ui/commands", - "//ios/chrome/browser/ui/content_suggestions:content_suggestions_ui_util", - "//ios/chrome/browser/ui/image_util", - "//ios/chrome/browser/ui/toolbar", - "//ios/chrome/browser/ui/toolbar:resource_macros", - "//ios/chrome/browser/ui/toolbar:toolbar_ui", - "//ios/chrome/browser/ui/toolbar/clean:toolbar_ui", - "//ios/chrome/browser/ui/toolbar/legacy", - "//ios/chrome/browser/ui/toolbar/public", - "//ios/chrome/browser/ui/toolbar/public:feature_flags", - "//ios/chrome/common", - "//ios/chrome/common/favicon", - "//ui/base", - ] -} - source_set("ntp_controller") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ @@ -76,9 +41,6 @@ source_set("ntp_controller") { "//ios/chrome/browser/ui/content_suggestions", "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant", "//ios/chrome/browser/ui/content_suggestions:content_suggestions_ui_util", - "//ios/chrome/browser/ui/ntp/recent_tabs", - "//ios/chrome/browser/ui/toolbar", - "//ios/chrome/browser/ui/toolbar:toolbar_ui", "//ios/public/provider/chrome/browser/voice", "//ui/base", ] @@ -105,50 +67,14 @@ source_set("ntp_internal") { "incognito_view_controller.mm", "metrics.h", "metrics.mm", - "new_tab_page_bar.h", - "new_tab_page_bar.mm", - "new_tab_page_bar_button.h", - "new_tab_page_bar_button.mm", - "new_tab_page_bar_item.h", - "new_tab_page_bar_item.mm", - "new_tab_page_panel_protocol.mm", - "new_tab_page_view.h", - "new_tab_page_view.mm", "notification_promo_whats_new.h", "notification_promo_whats_new.mm", "ntp_tile_saver.h", "ntp_tile_saver.mm", ] - public_deps = [ - ":ntp_header", - ] deps = [ ":ntp", - "resources:bookmarks_bar_bg", - "resources:bookmarks_bar_bg_pressed", - "resources:bookmarks_bar_breadcrumb", - "resources:bookmarks_bar_edit", - "resources:bookmarks_bar_edit_moreshadow", - "resources:bookmarks_bar_edit_pressed", - "resources:bookmarks_bar_edit_pressed_moreshadow", - "resources:bookmarks_bar_left", - "resources:bookmarks_button_bg", - "resources:bookmarks_button_border", - "resources:disclosure_open", "resources:incognito_icon", - "resources:incognito_legacy_icon", - "resources:ntp_bookmarks", - "resources:ntp_bottom_bar_shadow", - "resources:ntp_delete_button", - "resources:ntp_google_search_box", - "resources:ntp_incognito", - "resources:ntp_mv_placeholder_bg", - "resources:ntp_mv_recentbar", - "resources:ntp_mv_recentpress", - "resources:ntp_mv_search", - "resources:ntp_mv_thumbnail_container", - "resources:ntp_mv_thumbnail_empty", - "resources:ntp_mv_welcome_favicon", "resources:ntp_opentabs", "resources:ntp_opentabs_clock", "resources:ntp_opentabs_header", @@ -194,7 +120,6 @@ source_set("ntp_internal") { "//ios/chrome/browser/ui/context_menu", "//ios/chrome/browser/ui/favicon", "//ios/chrome/browser/ui/overscroll_actions", - "//ios/chrome/browser/ui/toolbar", "//ios/chrome/browser/ui/toolbar/buttons", "//ios/chrome/browser/web_state_list", "//ios/chrome/common", @@ -225,8 +150,6 @@ source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ - "new_tab_page_bar_unittest.mm", - "new_tab_page_controller_unittest.mm", "notification_promo_whats_new_unittest.mm", "ntp_tile_saver_unittest.mm", ] diff --git a/chromium/ios/chrome/browser/ui/ntp/recent_tabs/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp/recent_tabs/BUILD.gn deleted file mode 100644 index 718e9cf2aef..00000000000 --- a/chromium/ios/chrome/browser/ui/ntp/recent_tabs/BUILD.gn +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 2016 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("recent_tabs") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "closed_tabs_observer_bridge.h", - "closed_tabs_observer_bridge.mm", - "legacy_recent_tabs_table_coordinator.h", - "legacy_recent_tabs_table_coordinator.mm", - "legacy_recent_tabs_table_view_controller.h", - "legacy_recent_tabs_table_view_controller.mm", - "legacy_recent_tabs_table_view_controller_delegate.h", - "recent_tabs_constants.h", - "recent_tabs_constants.mm", - "recent_tabs_handset_coordinator.h", - "recent_tabs_handset_coordinator.mm", - "recent_tabs_handset_view_controller.h", - "recent_tabs_handset_view_controller.mm", - "recent_tabs_table_consumer.h", - "sessions_sync_user_state.h", - "synced_sessions.h", - "synced_sessions.mm", - ] - deps = [ - "//base", - "//components/browser_sync", - "//components/sessions", - "//components/strings", - "//components/sync", - "//ios/chrome/app/strings", - "//ios/chrome/app/theme", - "//ios/chrome/browser", - "//ios/chrome/browser/browser_state", - "//ios/chrome/browser/metrics:metrics_internal", - "//ios/chrome/browser/sessions", - "//ios/chrome/browser/sync", - "//ios/chrome/browser/ui", - "//ios/chrome/browser/ui/authentication", - "//ios/chrome/browser/ui/authentication:authentication_ui", - "//ios/chrome/browser/ui/commands", - "//ios/chrome/browser/ui/context_menu", - "//ios/chrome/browser/ui/coordinators:chrome_coordinators", - "//ios/chrome/browser/ui/keyboard", - "//ios/chrome/browser/ui/ntp", - "//ios/chrome/browser/ui/ntp/recent_tabs/views", - "//ios/chrome/browser/ui/settings/sync_utils", - "//ios/chrome/browser/ui/signin_interaction/public", - "//ios/chrome/browser/ui/table_view", - "//ios/chrome/browser/ui/util", - "//ios/web", - "//ui/base", - "//url", - ] - public_deps = [ - "//components/sync_sessions", - ] - allow_circular_includes_from = - [ "//ios/chrome/browser/ui/ntp/recent_tabs/views" ] - libs = [ "UIKit.framework" ] -} - -source_set("unit_tests") { - configs += [ "//build/config/compiler:enable_arc" ] - testonly = true - sources = [ - "recent_tabs_table_coordinator_unittest.mm", - ] - deps = [ - ":recent_tabs", - "//base", - "//components/browser_sync", - "//components/browser_sync:test_support", - "//components/signin/core/browser", - "//components/sync_sessions", - "//ios/chrome/browser/browser_state:test_support", - "//ios/chrome/browser/signin", - "//ios/chrome/browser/sync", - "//ios/chrome/browser/sync:test_support", - "//ios/chrome/browser/ui:feature_flags", - "//ios/chrome/browser/ui/ntp:ntp_internal", - "//ios/chrome/test:test_support", - "//ios/web/public/test", - "//testing/gtest", - "//third_party/ocmock", - ] -} - -source_set("eg_tests") { - configs += [ "//build/config/compiler:enable_arc" ] - testonly = true - sources = [ - "recent_tabs_table_egtest.mm", - ] - deps = [ - "//base/test:test_support", - "//components/strings", - "//ios/chrome/app/strings", - "//ios/chrome/browser/ui", - "//ios/chrome/browser/ui/authentication:eg_test_support", - "//ios/chrome/browser/ui/history:history_ui", - "//ios/chrome/browser/ui/ntp/recent_tabs", - "//ios/chrome/browser/ui/table_view", - "//ios/chrome/test/app:test_support", - "//ios/chrome/test/earl_grey:test_support", - "//ios/public/provider/chrome/browser/signin:test_support", - "//ios/third_party/earl_grey:earl_grey+link", - "//ios/web/public/test/http_server", - "//ui/base", - ] - libs = [ "XCTest.framework" ] -} diff --git a/chromium/ios/chrome/browser/ui/ntp/recent_tabs/views/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp/recent_tabs/views/BUILD.gn deleted file mode 100644 index 2804b4ade33..00000000000 --- a/chromium/ios/chrome/browser/ui/ntp/recent_tabs/views/BUILD.gn +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 2016 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("views") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "disclosure_view.h", - "disclosure_view.mm", - "generic_section_header_view.h", - "generic_section_header_view.mm", - "header_of_collapsable_section_protocol.h", - "panel_bar_view.h", - "panel_bar_view.mm", - "session_section_header_view.h", - "session_section_header_view.mm", - "session_tab_data_view.h", - "session_tab_data_view.mm", - "show_full_history_view.h", - "show_full_history_view.mm", - "signed_in_sync_in_progress_view.h", - "signed_in_sync_in_progress_view.mm", - "signed_in_sync_off_view.h", - "signed_in_sync_off_view.mm", - "signed_in_sync_on_no_sessions_view.h", - "signed_in_sync_on_no_sessions_view.mm", - "spacers_view.h", - "spacers_view.mm", - "views_utils.h", - "views_utils.mm", - ] - deps = [ - "//base", - "//components/resources", - "//components/sessions", - "//components/strings", - "//ios/chrome/app/strings", - "//ios/chrome/browser/favicon", - "//ios/chrome/browser/ui", - "//ios/chrome/browser/ui/commands", - "//ios/chrome/browser/ui/fancy_ui", - "//ios/chrome/browser/ui/material_components", - "//ios/chrome/browser/ui/settings/sync_utils", - "//ios/chrome/browser/ui/tab_switcher:utils", - "//ios/chrome/common/favicon", - "//ios/third_party/material_components_ios", - "//ios/third_party/material_roboto_font_loader_ios", - "//ui/base", - ] - libs = [ "UIKit.framework" ] -} diff --git a/chromium/ios/chrome/browser/ui/ntp/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp/resources/BUILD.gn index 520cc5ca6ce..7ba5c17947d 100644 --- a/chromium/ios/chrome/browser/ui/ntp/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/ntp/resources/BUILD.gn @@ -4,15 +4,6 @@ import("//build/config/ios/asset_catalog.gni") -imageset("ntp_mv_thumbnail_container") { - sources = [ - "ntp_mv_thumbnail_container.imageset/Contents.json", - "ntp_mv_thumbnail_container.imageset/ntp_mv_thumbnail_container.png", - "ntp_mv_thumbnail_container.imageset/ntp_mv_thumbnail_container@2x.png", - "ntp_mv_thumbnail_container.imageset/ntp_mv_thumbnail_container@3x.png", - ] -} - imageset("ntp_opentabs_last_row_h") { sources = [ "ntp_opentabs_last_row_h.imageset/Contents.json", @@ -55,51 +46,6 @@ imageset("ntp_opentabs") { ] } -imageset("ntp_bookmarks") { - sources = [ - "ntp_bookmarks.imageset/Contents.json", - "ntp_bookmarks.imageset/ntp_bookmarks.png", - "ntp_bookmarks.imageset/ntp_bookmarks@2x.png", - "ntp_bookmarks.imageset/ntp_bookmarks@3x.png", - ] -} - -imageset("bookmarks_button_border") { - sources = [ - "bookmarks_button_border.imageset/Contents.json", - "bookmarks_button_border.imageset/bookmarks_button_border.png", - "bookmarks_button_border.imageset/bookmarks_button_border@2x.png", - ] -} - -imageset("bookmarks_bar_edit_pressed_moreshadow") { - sources = [ - "bookmarks_bar_edit_pressed_moreshadow.imageset/Contents.json", - "bookmarks_bar_edit_pressed_moreshadow.imageset/bookmarks_bar_edit_pressed_moreshadow.png", - "bookmarks_bar_edit_pressed_moreshadow.imageset/bookmarks_bar_edit_pressed_moreshadow@2x.png", - ] -} - -imageset("bookmarks_bar_edit_pressed") { - sources = [ - "bookmarks_bar_edit_pressed.imageset/Contents.json", - "bookmarks_bar_edit_pressed.imageset/bookmarks_bar_edit_pressed.png", - "bookmarks_bar_edit_pressed.imageset/bookmarks_bar_edit_pressed@2x.png", - "bookmarks_bar_edit_pressed.imageset/bookmarks_bar_edit_pressed@2x~ipad.png", - "bookmarks_bar_edit_pressed.imageset/bookmarks_bar_edit_pressed~ipad.png", - ] -} - -imageset("bookmarks_bar_breadcrumb") { - sources = [ - "bookmarks_bar_breadcrumb.imageset/Contents.json", - "bookmarks_bar_breadcrumb.imageset/bookmarks_bar_breadcrumb.png", - "bookmarks_bar_breadcrumb.imageset/bookmarks_bar_breadcrumb@2x.png", - "bookmarks_bar_breadcrumb.imageset/bookmarks_bar_breadcrumb@2x~ipad.png", - "bookmarks_bar_breadcrumb.imageset/bookmarks_bar_breadcrumb~ipad.png", - ] -} - imageset("ntp_opentabs_header") { sources = [ "ntp_opentabs_header.imageset/Contents.json", @@ -108,22 +54,6 @@ imageset("ntp_opentabs_header") { ] } -imageset("bookmarks_bar_edit_moreshadow") { - sources = [ - "bookmarks_bar_edit_moreshadow.imageset/Contents.json", - "bookmarks_bar_edit_moreshadow.imageset/bookmarks_bar_edit_moreshadow.png", - "bookmarks_bar_edit_moreshadow.imageset/bookmarks_bar_edit_moreshadow@2x.png", - ] -} - -imageset("ntp_delete_button") { - sources = [ - "ntp_delete_button.imageset/Contents.json", - "ntp_delete_button.imageset/ntp_delete_button.png", - "ntp_delete_button.imageset/ntp_delete_button@2x.png", - ] -} - imageset("ntp_opentabs_phone") { sources = [ "ntp_opentabs_phone.imageset/Contents.json", @@ -133,22 +63,6 @@ imageset("ntp_opentabs_phone") { ] } -imageset("ntp_mv_recentpress") { - sources = [ - "ntp_mv_recentpress.imageset/Contents.json", - "ntp_mv_recentpress.imageset/ntp_mv_recentpress@2x~ipad.png", - "ntp_mv_recentpress.imageset/ntp_mv_recentpress~ipad.png", - ] -} - -imageset("bookmarks_bar_left") { - sources = [ - "bookmarks_bar_left.imageset/Contents.json", - "bookmarks_bar_left.imageset/bookmarks_bar_left@2x~ipad.png", - "bookmarks_bar_left.imageset/bookmarks_bar_left~ipad.png", - ] -} - imageset("ntp_opentabs_list_item_h") { sources = [ "ntp_opentabs_list_item_h.imageset/Contents.json", @@ -165,24 +79,6 @@ imageset("ntp_opentabs_list_item") { ] } -imageset("disclosure_open") { - sources = [ - "disclosure_open.imageset/Contents.json", - "disclosure_open.imageset/disclosure_open.png", - "disclosure_open.imageset/disclosure_open@2x.png", - ] -} - -imageset("bookmarks_bar_edit") { - sources = [ - "bookmarks_bar_edit.imageset/Contents.json", - "bookmarks_bar_edit.imageset/bookmarks_bar_edit.png", - "bookmarks_bar_edit.imageset/bookmarks_bar_edit@2x.png", - "bookmarks_bar_edit.imageset/bookmarks_bar_edit@2x~ipad.png", - "bookmarks_bar_edit.imageset/bookmarks_bar_edit~ipad.png", - ] -} - imageset("incognito_icon") { sources = [ "incognito_icon.imageset/Contents.json", @@ -192,15 +88,6 @@ imageset("incognito_icon") { ] } -imageset("incognito_legacy_icon") { - sources = [ - "incognito_legacy_icon.imageset/Contents.json", - "incognito_legacy_icon.imageset/incognito_legacy_icon.png", - "incognito_legacy_icon.imageset/incognito_legacy_icon@2x.png", - "incognito_legacy_icon.imageset/incognito_legacy_icon@3x.png", - ] -} - imageset("ntp_opentabs_recent_arrow") { sources = [ "ntp_opentabs_recent_arrow.imageset/Contents.json", @@ -210,33 +97,6 @@ imageset("ntp_opentabs_recent_arrow") { ] } -imageset("bookmarks_bar_bg") { - sources = [ - "bookmarks_bar_bg.imageset/Contents.json", - "bookmarks_bar_bg.imageset/bookmarks_bar_bg.png", - "bookmarks_bar_bg.imageset/bookmarks_bar_bg@2x.png", - "bookmarks_bar_bg.imageset/bookmarks_bar_bg@2x~ipad.png", - "bookmarks_bar_bg.imageset/bookmarks_bar_bg~ipad.png", - ] -} - -imageset("ntp_google_search_box") { - sources = [ - "ntp_google_search_box.imageset/Contents.json", - "ntp_google_search_box.imageset/ntp_google_search_box.png", - "ntp_google_search_box.imageset/ntp_google_search_box@2x.png", - "ntp_google_search_box.imageset/ntp_google_search_box@3x.png", - ] -} - -imageset("ntp_bottom_bar_shadow") { - sources = [ - "ntp_bottom_bar_shadow.imageset/Contents.json", - "ntp_bottom_bar_shadow.imageset/ntp_bottom_bar_shadow.png", - "ntp_bottom_bar_shadow.imageset/ntp_bottom_bar_shadow@2x.png", - ] -} - imageset("ntp_opentabs_laptop") { sources = [ "ntp_opentabs_laptop.imageset/Contents.json", @@ -246,39 +106,6 @@ imageset("ntp_opentabs_laptop") { ] } -imageset("ntp_mv_recentbar") { - sources = [ - "ntp_mv_recentbar.imageset/Contents.json", - "ntp_mv_recentbar.imageset/ntp_mv_recentbar@2x~ipad.png", - "ntp_mv_recentbar.imageset/ntp_mv_recentbar~ipad.png", - ] -} - -imageset("bookmarks_button_bg") { - sources = [ - "bookmarks_button_bg.imageset/Contents.json", - "bookmarks_button_bg.imageset/bookmarks_button_bg.png", - "bookmarks_button_bg.imageset/bookmarks_button_bg@2x.png", - ] -} - -imageset("ntp_mv_search") { - sources = [ - "ntp_mv_search.imageset/Contents.json", - "ntp_mv_search.imageset/ntp_mv_search.png", - "ntp_mv_search.imageset/ntp_mv_search@2x.png", - ] -} - -imageset("ntp_mv_placeholder_bg") { - sources = [ - "ntp_mv_placeholder_bg.imageset/Contents.json", - "ntp_mv_placeholder_bg.imageset/ntp_mv_placeholder_bg.png", - "ntp_mv_placeholder_bg.imageset/ntp_mv_placeholder_bg@2x.png", - "ntp_mv_placeholder_bg.imageset/ntp_mv_placeholder_bg@3x.png", - ] -} - imageset("ntp_recently_closed") { sources = [ "ntp_recently_closed.imageset/Contents.json", @@ -287,37 +114,3 @@ imageset("ntp_recently_closed") { "ntp_recently_closed.imageset/ntp_recently_closed@3x.png", ] } - -imageset("ntp_mv_thumbnail_empty") { - sources = [ - "ntp_mv_thumbnail_empty.imageset/Contents.json", - "ntp_mv_thumbnail_empty.imageset/ntp_mv_thumbnail_empty.png", - "ntp_mv_thumbnail_empty.imageset/ntp_mv_thumbnail_empty@2x.png", - "ntp_mv_thumbnail_empty.imageset/ntp_mv_thumbnail_empty@2x~ipad.png", - "ntp_mv_thumbnail_empty.imageset/ntp_mv_thumbnail_empty~ipad.png", - ] -} - -imageset("ntp_incognito") { - sources = [ - "ntp_incognito.imageset/Contents.json", - "ntp_incognito.imageset/ntp_incognito.png", - "ntp_incognito.imageset/ntp_incognito@2x.png", - ] -} - -imageset("ntp_mv_welcome_favicon") { - sources = [ - "ntp_mv_welcome_favicon.imageset/Contents.json", - "ntp_mv_welcome_favicon.imageset/ntp_mv_welcome_favicon.png", - "ntp_mv_welcome_favicon.imageset/ntp_mv_welcome_favicon@2x.png", - ] -} - -imageset("bookmarks_bar_bg_pressed") { - sources = [ - "bookmarks_bar_bg_pressed.imageset/Contents.json", - "bookmarks_bar_bg_pressed.imageset/bookmarks_bar_bg_pressed@2x~ipad.png", - "bookmarks_bar_bg_pressed.imageset/bookmarks_bar_bg_pressed~ipad.png", - ] -} diff --git a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn index 5c29bb15190..0480acb411a 100644 --- a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn @@ -6,8 +6,6 @@ source_set("omnibox") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ - "location_bar_controller.cc", - "location_bar_controller.h", "location_bar_delegate.h", "omnibox_left_image_consumer.h", "web_omnibox_edit_controller.cc", @@ -61,15 +59,7 @@ source_set("omnibox_internal") { "autocomplete_suggestion.h", "chrome_omnibox_client_ios.h", "chrome_omnibox_client_ios.mm", - "clipping_mask_view.h", - "clipping_mask_view.mm", - "clipping_textfield.h", - "clipping_textfield.mm", - "clipping_textfield_container.h", - "clipping_textfield_container.mm", "image_retriever.h", - "location_bar_controller_impl.h", - "location_bar_controller_impl.mm", "omnibox_consumer.h", "omnibox_container_view.h", "omnibox_container_view.mm", @@ -162,7 +152,6 @@ source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ - "clipping_textfield_container_unittest.mm", "omnibox_text_field_ios_unittest.mm", ] deps = [ diff --git a/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn index 6bed79b8423..d92c3c5f349 100644 --- a/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn @@ -6,9 +6,6 @@ source_set("popup") { sources = [ "omnibox_popup_coordinator.h", "omnibox_popup_coordinator.mm", - "omnibox_popup_generic_presenter.h", - "omnibox_popup_legacy_presenter.h", - "omnibox_popup_legacy_presenter.mm", "omnibox_popup_mediator.h", "omnibox_popup_mediator.mm", "omnibox_popup_positioner.h", @@ -32,12 +29,15 @@ source_set("popup") { "//ios/chrome/browser/ui:ui", "//ios/chrome/browser/ui:ui_util", "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/ntp:util", "//ios/chrome/browser/ui/omnibox:omnibox_popup_shared", "//ios/chrome/browser/ui/omnibox:omnibox_util", + "//ios/chrome/browser/ui/omnibox/popup/shortcuts", "//ios/chrome/browser/ui/toolbar/buttons", "//ios/chrome/browser/ui/toolbar/public:feature_flags", "//ios/chrome/browser/ui/toolbar/public:public", "//ios/chrome/browser/ui/util:util", + "//ios/chrome/browser/web_state_list:web_state_list", "//ios/web/public:public", "//net", ] @@ -64,3 +64,19 @@ source_set("popup_internal") { ] configs += [ "//build/config/compiler:enable_arc" ] } + +source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ + "omnibox_popup_view_controller_unittest.mm", + ] + deps = [ + ":popup", + "//base", + "//ios/chrome/app/strings", + "//ios/chrome/browser", + "//testing/gtest", + "//ui/base", + ] +} diff --git a/chromium/ios/chrome/browser/ui/omnibox/popup/shortcuts/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/popup/shortcuts/BUILD.gn new file mode 100644 index 00000000000..394534a3b05 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/omnibox/popup/shortcuts/BUILD.gn @@ -0,0 +1,34 @@ +# Copyright 2018 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("shortcuts") { + sources = [ + "shortcuts_coordinator.h", + "shortcuts_coordinator.mm", + "shortcuts_view_controller.h", + "shortcuts_view_controller.mm", + ] + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + "//ios/chrome/browser/ui/coordinators:chrome_coordinators", + ] +} + +source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ + "shortcuts_coordinator_unittest.mm", + "shortcuts_view_controller_unittest.mm", + ] + deps = [ + ":shortcuts", + "//base", + "//ios/chrome/app/strings", + "//ios/chrome/browser", + "//testing/gtest", + "//ui/base", + ] +} diff --git a/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn b/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn index c5369590d32..91c2cdfa6f2 100644 --- a/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn @@ -28,14 +28,14 @@ source_set("overscroll_actions") { "//ios/chrome/browser/ui:notifications", "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant", "//ios/chrome/browser/ui/fullscreen", - "//ios/chrome/browser/ui/history_popup/requirements", + "//ios/chrome/browser/ui/fullscreen:feature_flags", "//ios/chrome/browser/ui/page_info:coordinator", "//ios/chrome/browser/ui/static_content", - "//ios/chrome/browser/ui/toolbar/legacy", "//ios/chrome/browser/ui/toolbar/public", - "//ios/chrome/browser/ui/tools_menu/public", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/ui/voice", + "//ios/public/provider/chrome/browser", + "//ios/public/provider/chrome/browser/ui", "//ios/web", "//ui/base", "//ui/gfx", diff --git a/chromium/ios/chrome/browser/ui/payments/BUILD.gn b/chromium/ios/chrome/browser/ui/payments/BUILD.gn index be5b4c624a2..64aa0fd3028 100644 --- a/chromium/ios/chrome/browser/ui/payments/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/payments/BUILD.gn @@ -90,7 +90,6 @@ source_set("payments") { "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/icons", "//ios/chrome/browser/ui/payments/cells", - "//ios/third_party/material_components_ios", "//ios/third_party/material_roboto_font_loader_ios", "//ios/web", "//third_party/libaddressinput", @@ -268,7 +267,7 @@ source_set("eg_tests") { "//ios/chrome/browser/payments", "//ios/chrome/browser/ui/autofill", "//ios/chrome/browser/ui/payments/cells", - "//ios/chrome/browser/ui/tools_menu/public", + "//ios/chrome/browser/ui/popup_menu:constants", "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", "//ios/testing/earl_grey:earl_grey_support", diff --git a/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn index c4a8d8af1b1..e86f6bff1dc 100644 --- a/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn @@ -33,7 +33,6 @@ source_set("popup_menu") { "//ios/chrome/browser/ui/popup_menu/public", "//ios/chrome/browser/ui/presenters", "//ios/chrome/browser/ui/reading_list", - "//ios/chrome/browser/ui/tools_menu/public", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web_state_list", "//ios/public/provider/chrome/browser", @@ -48,21 +47,16 @@ source_set("popup_menu_ui") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ "popup_menu_consumer.h", - "popup_menu_controller.h", - "popup_menu_controller.mm", "popup_menu_presenter.h", "popup_menu_presenter.mm", "popup_menu_table_view_controller.h", "popup_menu_table_view_controller.mm", "popup_menu_table_view_controller_commands.h", - "popup_menu_view.h", - "popup_menu_view.mm", "popup_menu_view_controller.h", "popup_menu_view_controller.mm", ] deps = [ ":constants", - "resources:popup_background", "resources:popup_menu_add_bookmark", "resources:popup_menu_bookmarks", "resources:popup_menu_close_tab", @@ -144,3 +138,25 @@ source_set("unit_tests") { ] configs += [ "//build/config/compiler:enable_arc" ] } + +source_set("eg_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ + "popup_menu_egtest.mm", + "request_desktop_mobile_site_egtest.mm", + ] + deps = [ + "//base", + "//components/strings", + "//ios/chrome/app/strings", + "//ios/chrome/browser/ui:ui_internal", + "//ios/chrome/browser/ui:ui_util", + "//ios/chrome/browser/ui/popup_menu:constants", + "//ios/chrome/test/app:test_support", + "//ios/chrome/test/earl_grey:test_support", + "//ios/web/public/test", + "//ios/web/public/test/http_server", + "//ui/base", + ] +} 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 8c534fb8719..e152c0cf9e5 100644 --- a/chromium/ios/chrome/browser/ui/popup_menu/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/popup_menu/resources/BUILD.gn @@ -103,15 +103,6 @@ imageset("popup_menu_settings") { ] } -imageset("popup_background") { - sources = [ - "popup_background.imageset/Contents.json", - "popup_background.imageset/popup_background.png", - "popup_background.imageset/popup_background@2x.png", - "popup_background.imageset/popup_background@3x.png", - ] -} - imageset("popup_menu_new_incognito_tab") { sources = [ "popup_menu_new_incognito_tab.imageset/Contents.json", diff --git a/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn b/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn index debaa4ff200..2bfefd9b49d 100644 --- a/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn @@ -90,7 +90,6 @@ source_set("eg_tests") { "//ios/chrome/browser/ui/location_bar", "//ios/chrome/browser/ui/omnibox", "//ios/chrome/browser/ui/toolbar", - "//ios/chrome/browser/ui/toolbar/clean:toolbar", "//ios/chrome/browser/ui/toolbar/public:feature_flags", "//ios/chrome/test/app:test_support", "//ios/chrome/test/base", diff --git a/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn b/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn index c60bf4445ad..f56c4d5cfea 100644 --- a/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn @@ -4,12 +4,8 @@ source_set("reading_list") { sources = [ - "legacy_reading_list_coordinator.h", - "legacy_reading_list_coordinator.mm", "offline_page_native_content.h", "offline_page_native_content.mm", - "reading_list_collection_view_item.h", - "reading_list_collection_view_item.mm", "reading_list_coordinator.h", "reading_list_coordinator.mm", "reading_list_list_item.h", @@ -33,6 +29,7 @@ source_set("reading_list") { ] deps = [ ":reading_list_ui", + "resources:distillation_fail_new", "//base", "//components/favicon/core", "//components/feature_engagement", @@ -80,18 +77,8 @@ source_set("reading_list_ui") { "empty_reading_list_background_view.mm", "empty_reading_list_message_util.h", "empty_reading_list_message_util.mm", - "legacy_reading_list_toolbar.h", - "legacy_reading_list_toolbar.mm", - "legacy_reading_list_toolbar_button.h", - "legacy_reading_list_toolbar_button.mm", - "legacy_reading_list_view_controller.h", - "legacy_reading_list_view_controller.mm", "number_badge_view.h", "number_badge_view.mm", - "reading_list_collection_view_cell.h", - "reading_list_collection_view_cell.mm", - "reading_list_collection_view_controller.h", - "reading_list_collection_view_controller.mm", "reading_list_data_sink.h", "reading_list_data_source.h", "reading_list_list_item_accessibility_delegate.h", @@ -110,13 +97,9 @@ source_set("reading_list_ui") { "text_badge_view.mm", ] deps = [ - "resources:distillation_fail", - "resources:distillation_success", "resources:reading_list_empty_state", "resources:reading_list_empty_state_new", - "resources:reading_list_share_icon", "resources:reading_list_side_swipe", - "resources:reading_list_toolbar_icon", "resources:reading_list_tools_icon", "//base", "//base:i18n", @@ -126,8 +109,6 @@ source_set("reading_list_ui") { "//ios/chrome/browser", "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/alert_coordinator", - "//ios/chrome/browser/ui/collection_view/cells", - "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/keyboard", "//ios/chrome/browser/ui/list_model", "//ios/chrome/browser/ui/material_components", @@ -137,15 +118,10 @@ source_set("reading_list_ui") { "//ios/chrome/browser/ui/util", "//ios/chrome/common", "//ios/chrome/common/favicon", - "//ios/third_party/material_components_ios", - "//ios/third_party/material_roboto_font_loader_ios", "//ui/base", "//ui/strings:ui_strings_grit", "//url", ] - public_deps = [ - "//ios/chrome/browser/ui/collection_view", - ] libs = [ "UIKit.framework" ] } @@ -153,9 +129,7 @@ source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ - "legacy_reading_list_coordinator_unittest.mm", "offline_page_native_content_unittest.mm", - "reading_list_collection_view_controller_unittest.mm", "reading_list_list_item_factory_unittest.mm", "reading_list_mediator_unittest.mm", "text_badge_view_unittest.mm", @@ -210,7 +184,6 @@ source_set("eg_tests") { "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/table_view:views", "//ios/chrome/browser/ui/table_view/cells", - "//ios/chrome/browser/ui/tools_menu/public", "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", "//ios/testing/earl_grey:earl_grey_support", diff --git a/chromium/ios/chrome/browser/ui/reading_list/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/reading_list/resources/BUILD.gn index f21f50bdf83..ade93f74741 100644 --- a/chromium/ios/chrome/browser/ui/reading_list/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/reading_list/resources/BUILD.gn @@ -4,15 +4,6 @@ import("//build/config/ios/asset_catalog.gni") -imageset("distillation_fail") { - sources = [ - "distillation_fail.imageset/Contents.json", - "distillation_fail.imageset/distillation_fail.png", - "distillation_fail.imageset/distillation_fail@2x.png", - "distillation_fail.imageset/distillation_fail@3x.png", - ] -} - imageset("distillation_fail_new") { sources = [ "distillation_fail_new.imageset/Contents.json", @@ -22,15 +13,6 @@ imageset("distillation_fail_new") { ] } -imageset("distillation_success") { - sources = [ - "distillation_success.imageset/Contents.json", - "distillation_success.imageset/distillation_success.png", - "distillation_success.imageset/distillation_success@2x.png", - "distillation_success.imageset/distillation_success@3x.png", - ] -} - imageset("reading_list_empty_state") { sources = [ "reading_list_empty_state.imageset/Contents.json", @@ -49,15 +31,6 @@ imageset("reading_list_empty_state_new") { ] } -imageset("reading_list_share_icon") { - sources = [ - "reading_list_share_icon.imageset/Contents.json", - "reading_list_share_icon.imageset/reading_list_share_icon.png", - "reading_list_share_icon.imageset/reading_list_share_icon@2x.png", - "reading_list_share_icon.imageset/reading_list_share_icon@3x.png", - ] -} - imageset("reading_list_side_swipe") { sources = [ "reading_list_side_swipe.imageset/Contents.json", @@ -67,15 +40,6 @@ imageset("reading_list_side_swipe") { ] } -imageset("reading_list_toolbar_icon") { - sources = [ - "reading_list_toolbar_icon.imageset/Contents.json", - "reading_list_toolbar_icon.imageset/reading_list_toolbar_icon.png", - "reading_list_toolbar_icon.imageset/reading_list_toolbar_icon@2x.png", - "reading_list_toolbar_icon.imageset/reading_list_toolbar_icon@3x.png", - ] -} - imageset("reading_list_tools_icon") { sources = [ "reading_list_tools_icon.imageset/Contents.json", diff --git a/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn b/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn index 2dc93461ee6..3db11af87d7 100644 --- a/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn @@ -5,6 +5,8 @@ source_set("recent_tabs") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ + "closed_tabs_observer_bridge.h", + "closed_tabs_observer_bridge.mm", "recent_tabs_coordinator.h", "recent_tabs_coordinator.mm", "recent_tabs_mediator.h", @@ -25,22 +27,31 @@ source_set("recent_tabs") { "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/ntp", - "//ios/chrome/browser/ui/ntp/recent_tabs", "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/util", "//ui/base", ] - allow_circular_includes_from = [ "//ios/chrome/browser/ui/ntp/recent_tabs" ] + public_deps = [ + "//components/sync_sessions", + ] } source_set("recent_tabs_ui") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ + "recent_tabs_constants.h", + "recent_tabs_constants.mm", + "recent_tabs_consumer.h", "recent_tabs_image_data_source.h", + "recent_tabs_presentation_delegate.h", "recent_tabs_table_view_controller.h", "recent_tabs_table_view_controller.mm", + "recent_tabs_table_view_controller_delegate.h", "recent_tabs_transitioning_delegate.h", "recent_tabs_transitioning_delegate.mm", + "sessions_sync_user_state.h", + "synced_sessions.h", + "synced_sessions.mm", ] deps = [ "//base", @@ -58,7 +69,6 @@ source_set("recent_tabs_ui") { "//ios/chrome/browser/ui/authentication:authentication_ui", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/context_menu", - "//ios/chrome/browser/ui/ntp/recent_tabs", "//ios/chrome/browser/ui/settings/sync_utils", "//ios/chrome/browser/ui/signin_interaction/public", "//ios/chrome/browser/ui/table_view", @@ -67,4 +77,58 @@ source_set("recent_tabs_ui") { "//ios/chrome/common/favicon", "//ui/base", ] + public_deps = [ + "//components/sync_sessions", + ] +} + +source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ + "recent_tabs_coordinator_unittest.mm", + ] + deps = [ + ":recent_tabs", + ":recent_tabs_ui", + "//base", + "//components/browser_sync", + "//components/browser_sync:test_support", + "//components/signin/core/browser", + "//components/sync_sessions", + "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/signin", + "//ios/chrome/browser/sync", + "//ios/chrome/browser/sync:test_support", + "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/test:test_support", + "//ios/web/public/test", + "//testing/gtest", + "//third_party/ocmock", + ] +} + +source_set("eg_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ + "recent_tabs_egtest.mm", + ] + deps = [ + ":recent_tabs_ui", + "//base/test:test_support", + "//components/strings", + "//ios/chrome/app/strings", + "//ios/chrome/browser/ui", + "//ios/chrome/browser/ui/authentication:eg_test_support", + "//ios/chrome/browser/ui/history:history_ui", + "//ios/chrome/browser/ui/table_view", + "//ios/chrome/test/app:test_support", + "//ios/chrome/test/earl_grey:test_support", + "//ios/public/provider/chrome/browser/signin:test_support", + "//ios/third_party/earl_grey:earl_grey+link", + "//ios/web/public/test/http_server", + "//ui/base", + ] + libs = [ "XCTest.framework" ] } diff --git a/chromium/ios/chrome/browser/ui/sad_tab/BUILD.gn b/chromium/ios/chrome/browser/ui/sad_tab/BUILD.gn index 53b065c620e..a87cbcb542b 100644 --- a/chromium/ios/chrome/browser/ui/sad_tab/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/sad_tab/BUILD.gn @@ -55,7 +55,7 @@ source_set("eg_tests") { "//base", "//components/strings", "//ios/chrome/app/strings", - "//ios/chrome/browser/ui/tools_menu/public", + "//ios/chrome/browser/ui/popup_menu:constants", "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", "//ios/testing/earl_grey:earl_grey_support", diff --git a/chromium/ios/chrome/browser/ui/settings/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/BUILD.gn index 8ee4ca73684..f63c2823ec9 100644 --- a/chromium/ios/chrome/browser/ui/settings/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/BUILD.gn @@ -9,6 +9,8 @@ source_set("settings") { "about_chrome_collection_view_controller.mm", "accounts_collection_view_controller.h", "accounts_collection_view_controller.mm", + "alpha_animated_collection_view_flow_layout.h", + "alpha_animated_collection_view_flow_layout.mm", "autofill_credit_card_collection_view_controller.h", "autofill_credit_card_collection_view_controller.mm", "autofill_credit_card_edit_collection_view_controller.h", @@ -42,6 +44,8 @@ source_set("settings") { "content_settings_collection_view_controller.mm", "dataplan_usage_collection_view_controller.h", "dataplan_usage_collection_view_controller.mm", + "google_services_navigation_coordinator.h", + "google_services_navigation_coordinator.mm", "google_services_settings_consumer.h", "google_services_settings_coordinator.h", "google_services_settings_coordinator.mm", @@ -177,6 +181,7 @@ source_set("settings") { "//ios/chrome/browser/ui/content_suggestions/cells", "//ios/chrome/browser/ui/content_suggestions/cells:cells_ui", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", + "//ios/chrome/browser/ui/elements:elements_internal", "//ios/chrome/browser/ui/icons", "//ios/chrome/browser/ui/keyboard", "//ios/chrome/browser/ui/list_model", @@ -204,6 +209,7 @@ source_set("settings") { "//ios/third_party/material_components_ios", "//ios/third_party/material_roboto_font_loader_ios", "//net", + "//services/identity/public/cpp", "//ui/base", "//url", ] @@ -409,7 +415,6 @@ source_set("eg_tests") { "//ios/chrome/browser/ui/authentication:authentication_ui", "//ios/chrome/browser/ui/authentication:eg_test_support", "//ios/chrome/browser/ui/settings:test_support", - "//ios/chrome/browser/ui/tools_menu/public", "//ios/chrome/browser/ui/util:util", "//ios/chrome/test:test_support", "//ios/chrome/test/app:test_support", diff --git a/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn index 28da409ae5f..680f868a645 100644 --- a/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn @@ -30,6 +30,8 @@ source_set("cells") { "settings_collapsible_item.mm", "settings_detail_item.h", "settings_detail_item.mm", + "settings_image_detail_text_item.h", + "settings_image_detail_text_item.mm", "settings_search_item.h", "settings_search_item.mm", "settings_switch_item.h", @@ -50,7 +52,6 @@ source_set("cells") { "//components/autofill/core/browser", "//components/strings", "//ios/chrome/app/strings", - "//ios/chrome/browser", "//ios/chrome/browser/browsing_data", "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/collection_view/cells", 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 cf80416949b..a9a7087a588 100644 --- a/chromium/ios/chrome/browser/ui/settings/sync_utils/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/sync_utils/BUILD.gn @@ -55,8 +55,6 @@ source_set("eg_tests") { "//ios/chrome/browser/ui/authentication:authentication_ui", "//ios/chrome/browser/ui/authentication:eg_test_support", "//ios/chrome/browser/ui/settings", - "//ios/chrome/browser/ui/tools_menu", - "//ios/chrome/browser/ui/tools_menu/public", "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", "//ios/public/provider/chrome/browser/signin:test_support", diff --git a/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn b/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn index 5261ca7b29d..fe993d96fee 100644 --- a/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn @@ -40,9 +40,6 @@ source_set("side_swipe") { "//ui/base", "//url", ] - public_deps = [ - "//ios/chrome/browser/infobars", - ] libs = [ "UIKit.framework" ] } @@ -56,7 +53,6 @@ source_set("unit_tests") { ":side_swipe", "//base", "//ios/chrome/browser/browser_state:test_support", - "//ios/chrome/browser/ui/toolbar", "//ios/web/public/test", "//testing/gtest", "//third_party/ocmock", @@ -75,7 +71,7 @@ source_set("eg_tests") { "//base", "//ios/chrome/browser", "//ios/chrome/browser/ui:ui_util", - "//ios/chrome/browser/ui/toolbar/adaptive:adaptive_ui", + "//ios/chrome/browser/ui/toolbar:toolbar_ui", "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", "//ios/testing/earl_grey:earl_grey_support", diff --git a/chromium/ios/chrome/browser/ui/stack_view/BUILD.gn b/chromium/ios/chrome/browser/ui/stack_view/BUILD.gn deleted file mode 100644 index 03a5617387c..00000000000 --- a/chromium/ios/chrome/browser/ui/stack_view/BUILD.gn +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright 2016 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("stack_view") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "card_set.h", - "card_set.mm", - "card_stack_layout_manager.h", - "card_stack_layout_manager.mm", - "card_stack_pinch_gesture_recognizer.h", - "card_stack_pinch_gesture_recognizer.mm", - "card_view.h", - "card_view.mm", - "close_button.h", - "close_button.mm", - "new_tab_button.h", - "new_tab_button.mm", - "page_animation_util.h", - "page_animation_util.mm", - "stack_card.h", - "stack_card.mm", - "stack_view_controller.h", - "stack_view_controller.mm", - "stack_view_controller_private.h", - "stack_view_toolbar_controller.h", - "stack_view_toolbar_controller.mm", - "title_label.h", - "title_label.mm", - ] - deps = [ - "resources:border_frame_bottom", - "resources:border_frame_incognito_bottom", - "resources:border_frame_incognito_left", - "resources:border_frame_incognito_right", - "resources:border_frame_incognito_top", - "resources:border_frame_left", - "resources:border_frame_right", - "resources:border_frame_top", - "resources:card_close_button", - "resources:card_close_button_incognito", - "resources:card_close_button_pressed", - "resources:card_frame_shadow", - "resources:stack_view_background_noise", - "//base", - "//components/favicon/ios", - "//components/feature_engagement", - "//components/strings", - "//ios/chrome/app/strings", - "//ios/chrome/browser", - "//ios/chrome/browser/feature_engagement", - "//ios/chrome/browser/snapshots", - "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui", - "//ios/chrome/browser/ui/commands", - "//ios/chrome/browser/ui/favicon/resources:default_favicon", - "//ios/chrome/browser/ui/image_util", - "//ios/chrome/browser/ui/keyboard", - "//ios/chrome/browser/ui/main:feature_flags", - "//ios/chrome/browser/ui/ntp", - "//ios/chrome/browser/ui/ntp:ntp_internal", - "//ios/chrome/browser/ui/tab_switcher", - "//ios/chrome/browser/ui/toolbar", - "//ios/chrome/browser/ui/toolbar:toolbar_ui", - "//ios/chrome/browser/ui/toolbar/buttons", - "//ios/chrome/browser/ui/toolbar/legacy", - "//ios/chrome/browser/ui/toolbar/public", - "//ios/chrome/browser/ui/toolbar/public:feature_flags", - "//ios/chrome/browser/ui/tools_menu", - "//ios/chrome/browser/ui/tools_menu:configuration", - "//ios/chrome/browser/ui/tools_menu/public", - "//ios/chrome/browser/web_state_list", - "//ios/chrome/common", - "//ios/third_party/material_components_ios", - "//ios/web/public", - "//net", - "//ui/base", - "//ui/gfx", - ] - libs = [ - "CoreGraphics.framework", - "QuartzCore.framework", - "UIKit.framework", - ] -} - -source_set("unit_tests") { - configs += [ "//build/config/compiler:enable_arc" ] - testonly = true - sources = [ - "card_set_unittest.mm", - "card_stack_layout_manager_unittest.mm", - "stack_card_unittest.mm", - "stack_view_controller_unittest.mm", - ] - deps = [ - ":stack_view", - "//base", - "//ios/chrome/browser/browser_state", - "//ios/chrome/browser/browser_state:test_support", - "//ios/chrome/browser/snapshots", - "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui", - "//ios/chrome/browser/ui/main:feature_flags", - "//ios/chrome/browser/web", - "//ios/chrome/browser/web_state_list", - "//ios/chrome/browser/web_state_list:test_support", - "//ios/chrome/test:test_support", - "//ios/testing:ocmock_support", - "//ios/web/public/test:test", - "//ios/web/public/test/fakes", - "//testing/gtest", - "//third_party/ocmock", - ] -} - -source_set("eg_tests") { - configs += [ "//build/config/compiler:enable_arc" ] - testonly = true - sources = [ - "stack_view_egtest.mm", - ] - deps = [ - ":stack_view", - "//base", - "//base/test:test_support", - "//ios/chrome/browser", - "//ios/chrome/browser/browser_state", - "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui:ui_internal", - "//ios/chrome/browser/ui/tab_switcher:modes", - "//ios/chrome/browser/ui/toolbar/buttons", - "//ios/chrome/browser/ui/toolbar/legacy", - "//ios/chrome/browser/ui/toolbar/public", - "//ios/chrome/browser/ui/tools_menu/public", - "//ios/chrome/test/app:test_support", - "//ios/chrome/test/earl_grey:test_support", - "//ios/testing/earl_grey:earl_grey_support", - "//ios/web/public/test/http_server", - ] - libs = [ "XCTest.framework" ] -} diff --git a/chromium/ios/chrome/browser/ui/stack_view/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/stack_view/resources/BUILD.gn deleted file mode 100644 index 2505017de12..00000000000 --- a/chromium/ios/chrome/browser/ui/stack_view/resources/BUILD.gn +++ /dev/null @@ -1,124 +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. - -import("//build/config/ios/asset_catalog.gni") - -imageset("border_frame_bottom") { - sources = [ - "border_frame_bottom.imageset/Contents.json", - "border_frame_bottom.imageset/border_frame_bottom.png", - "border_frame_bottom.imageset/border_frame_bottom@2x.png", - "border_frame_bottom.imageset/border_frame_bottom@3x.png", - ] -} - -imageset("border_frame_incognito_bottom") { - sources = [ - "border_frame_incognito_bottom.imageset/Contents.json", - "border_frame_incognito_bottom.imageset/border_frame_incognito_bottom.png", - "border_frame_incognito_bottom.imageset/border_frame_incognito_bottom@2x.png", - "border_frame_incognito_bottom.imageset/border_frame_incognito_bottom@3x.png", - ] -} - -imageset("border_frame_incognito_left") { - sources = [ - "border_frame_incognito_left.imageset/Contents.json", - "border_frame_incognito_left.imageset/border_frame_incognito_left.png", - "border_frame_incognito_left.imageset/border_frame_incognito_left@2x.png", - "border_frame_incognito_left.imageset/border_frame_incognito_left@3x.png", - ] -} - -imageset("border_frame_incognito_right") { - sources = [ - "border_frame_incognito_right.imageset/Contents.json", - "border_frame_incognito_right.imageset/border_frame_incognito_right.png", - "border_frame_incognito_right.imageset/border_frame_incognito_right@2x.png", - "border_frame_incognito_right.imageset/border_frame_incognito_right@3x.png", - ] -} - -imageset("border_frame_incognito_top") { - sources = [ - "border_frame_incognito_top.imageset/Contents.json", - "border_frame_incognito_top.imageset/border_frame_incognito_top.png", - "border_frame_incognito_top.imageset/border_frame_incognito_top@2x.png", - "border_frame_incognito_top.imageset/border_frame_incognito_top@3x.png", - ] -} - -imageset("border_frame_left") { - sources = [ - "border_frame_left.imageset/Contents.json", - "border_frame_left.imageset/border_frame_left.png", - "border_frame_left.imageset/border_frame_left@2x.png", - "border_frame_left.imageset/border_frame_left@3x.png", - ] -} - -imageset("border_frame_right") { - sources = [ - "border_frame_right.imageset/Contents.json", - "border_frame_right.imageset/border_frame_right.png", - "border_frame_right.imageset/border_frame_right@2x.png", - "border_frame_right.imageset/border_frame_right@3x.png", - ] -} - -imageset("border_frame_top") { - sources = [ - "border_frame_top.imageset/Contents.json", - "border_frame_top.imageset/border_frame_top.png", - "border_frame_top.imageset/border_frame_top@2x.png", - "border_frame_top.imageset/border_frame_top@3x.png", - ] -} - -imageset("card_close_button") { - sources = [ - "card_close_button.imageset/Contents.json", - "card_close_button.imageset/card_close_button.png", - "card_close_button.imageset/card_close_button@2x.png", - "card_close_button.imageset/card_close_button@3x.png", - ] -} - -imageset("card_close_button_incognito") { - sources = [ - "card_close_button_incognito.imageset/Contents.json", - "card_close_button_incognito.imageset/card_close_button_incognito.png", - "card_close_button_incognito.imageset/card_close_button_incognito@2x.png", - "card_close_button_incognito.imageset/card_close_button_incognito@3x.png", - ] -} - -imageset("card_close_button_pressed") { - sources = [ - "card_close_button_pressed.imageset/Contents.json", - "card_close_button_pressed.imageset/card_close_button_pressed.png", - "card_close_button_pressed.imageset/card_close_button_pressed@2x.png", - "card_close_button_pressed.imageset/card_close_button_pressed@3x.png", - ] -} - -imageset("card_frame_shadow") { - sources = [ - "card_frame_shadow.imageset/Contents.json", - "card_frame_shadow.imageset/card_frame_shadow.png", - "card_frame_shadow.imageset/card_frame_shadow@2x.png", - "card_frame_shadow.imageset/card_frame_shadow@3x.png", - ] -} - -imageset("stack_view_background_noise") { - sources = [ - "stack_view_background_noise.imageset/Contents.json", - "stack_view_background_noise.imageset/stack_view_background_noise.jpg", - "stack_view_background_noise.imageset/stack_view_background_noise@2x.jpg", - "stack_view_background_noise.imageset/stack_view_background_noise@2x~ipad.jpg", - "stack_view_background_noise.imageset/stack_view_background_noise@3x.jpg", - "stack_view_background_noise.imageset/stack_view_background_noise~ipad.jpg", - ] -} diff --git a/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn index f4f2c9f86ec..5b494f97ceb 100644 --- a/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn @@ -23,6 +23,7 @@ source_set("tab_grid") { "grid:grid_ui", "//base", "//components/favicon/ios", + "//components/sessions", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/sessions", @@ -35,9 +36,9 @@ source_set("tab_grid") { "//ios/chrome/browser/ui/history", "//ios/chrome/browser/ui/history/public", "//ios/chrome/browser/ui/main", + "//ios/chrome/browser/ui/main:tab_switcher", "//ios/chrome/browser/ui/recent_tabs", "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui", - "//ios/chrome/browser/ui/tab_switcher", "//ios/chrome/browser/web", "//ios/chrome/browser/web_state_list", "//ios/chrome/browser/web_state_list/web_usage_enabler", @@ -80,6 +81,7 @@ source_set("tab_grid_ui") { "//base:i18n", "//ios/chrome/app/strings", "//ios/chrome/browser", + "//ios/chrome/browser/crash_report", "//ios/chrome/browser/ui:ui_util", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui", @@ -107,7 +109,7 @@ source_set("unit_tests") { "//ios/chrome/browser", "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui/tab_switcher", + "//ios/chrome/browser/ui/main:tab_switcher", "//ios/chrome/browser/web", "//ios/chrome/browser/web:test_support", "//ios/chrome/browser/web_state_list", @@ -135,8 +137,7 @@ source_set("egtest_support") { "//base/test:test_support", "//ios/chrome/app/strings", "//ios/chrome/browser/ui:ui_util", - "//ios/chrome/browser/ui/ntp/recent_tabs", - "//ios/chrome/browser/ui/tools_menu/public", + "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui", "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", "//ios/third_party/earl_grey:earl_grey+link", @@ -149,11 +150,16 @@ source_set("eg_tests") { testonly = true sources = [ "tab_grid_egtest.mm", + "tab_grid_transition_egtest.mm", ] deps = [ ":egtest_support", + "//ios/chrome/app:app_internal", + "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser/tabs:tabs", "//ios/chrome/browser/ui/tab_grid:tab_grid_ui", + "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", "//ios/web/public/test/http_server", ] diff --git a/chromium/ios/chrome/browser/ui/tab_switcher/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_switcher/BUILD.gn deleted file mode 100644 index 4c6b2255dd4..00000000000 --- a/chromium/ios/chrome/browser/ui/tab_switcher/BUILD.gn +++ /dev/null @@ -1,224 +0,0 @@ -# Copyright 2016 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("tab_switcher") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "tab_model_snapshot.h", - "tab_model_snapshot.mm", - "tab_switcher.h", - "tab_switcher_button.h", - "tab_switcher_button.mm", - "tab_switcher_cache.h", - "tab_switcher_cache.mm", - "tab_switcher_controller.h", - "tab_switcher_controller.mm", - "tab_switcher_header_cell.h", - "tab_switcher_header_cell.mm", - "tab_switcher_header_view.h", - "tab_switcher_header_view.mm", - "tab_switcher_model.h", - "tab_switcher_model.mm", - "tab_switcher_model_private.h", - "tab_switcher_panel_cell.h", - "tab_switcher_panel_cell.mm", - "tab_switcher_panel_collection_view_layout.h", - "tab_switcher_panel_collection_view_layout.mm", - "tab_switcher_panel_controller.h", - "tab_switcher_panel_controller.mm", - "tab_switcher_panel_overlay_view.h", - "tab_switcher_panel_overlay_view.mm", - "tab_switcher_panel_view.h", - "tab_switcher_panel_view.mm", - "tab_switcher_session_cell_data.h", - "tab_switcher_session_cell_data.mm", - "tab_switcher_session_changes.h", - "tab_switcher_session_changes.mm", - "tab_switcher_transition_context.h", - "tab_switcher_transition_context.mm", - "tab_switcher_view.h", - "tab_switcher_view.mm", - ] - deps = [ - ":utils", - "resources:tabswitcher_full_history", - "resources:tabswitcher_incognito", - "resources:tabswitcher_laptop", - "resources:tabswitcher_menu", - "resources:tabswitcher_new_tab", - "resources:tabswitcher_new_tab_fab", - "resources:tabswitcher_open_tabs", - "resources:tabswitcher_other_devices", - "resources:tabswitcher_overflow_arrow", - "resources:tabswitcher_phone", - "resources:tabswitcher_recently_closed", - "resources:tabswitcher_tab_switcher_button", - "resources:tabswitcher_tab_switcher_count_button", - "resources:tabswitcher_tab_switcher_count_button_pressed", - "resources:tabswitcher_tablet", - "//base", - "//components/browser_sync", - "//components/favicon/ios", - "//components/sessions", - "//components/signin/core/browser", - "//components/sync", - "//components/sync_sessions", - "//ios/chrome/app/strings", - "//ios/chrome/app/theme", - "//ios/chrome/browser", - "//ios/chrome/browser/browser_state", - "//ios/chrome/browser/favicon", - "//ios/chrome/browser/feature_engagement", - "//ios/chrome/browser/metrics:metrics_internal", - "//ios/chrome/browser/sessions", - "//ios/chrome/browser/sessions:serialisation", - "//ios/chrome/browser/signin", - "//ios/chrome/browser/snapshots", - "//ios/chrome/browser/sync", - "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui", - "//ios/chrome/browser/ui/authentication", - "//ios/chrome/browser/ui/authentication:authentication_ui", - "//ios/chrome/browser/ui/colors", - "//ios/chrome/browser/ui/commands", - "//ios/chrome/browser/ui/image_util", - "//ios/chrome/browser/ui/keyboard", - "//ios/chrome/browser/ui/material_components", - "//ios/chrome/browser/ui/ntp/recent_tabs/views", - "//ios/chrome/browser/ui/settings/sync_utils", - "//ios/chrome/browser/ui/signin_interaction/public", - "//ios/chrome/browser/ui/tabs/requirements", - "//ios/chrome/browser/ui/toolbar:toolbar_ui", - "//ios/chrome/browser/web", - "//ios/chrome/browser/web_state_list", - "//ios/chrome/common:ios_app_bundle_id_prefix_buildflags", - "//ios/chrome/common/favicon", - "//ios/public/provider/chrome/browser", - "//ios/third_party/material_components_ios", - "//ios/third_party/material_roboto_font_loader_ios", - "//ios/third_party/material_text_accessibility_ios", - "//ios/web", - "//ui/base", - "//ui/gfx", - "//url", - ] - public_deps = [ - "//ios/chrome/browser/ui/ntp/recent_tabs", - ] - libs = [ - "QuartzCore.framework", - "UIKit.framework", - ] -} - -source_set("modes") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "tab_switcher_mode.h", - "tab_switcher_mode.mm", - ] - deps = [ - "//base", - "//ios/chrome/browser/ui", - ] -} - -source_set("utils") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "tab_switcher_utils.h", - "tab_switcher_utils.mm", - ] - deps = [ - "//base", - "//components/browser_sync", - "//components/sync", - "//components/sync_sessions", - "//ios/chrome/app/strings", - "//ios/chrome/app/theme", - "//ios/chrome/browser/browser_state", - "//ios/chrome/browser/favicon", - "//ios/chrome/browser/sync", - "//ios/chrome/browser/ui", - "//ios/chrome/common/favicon", - "//ui/base", - ] -} - -source_set("egtest_support") { - testonly = true - sources = [ - "tab_switcher_egtest_util.h", - "tab_switcher_egtest_util.mm", - ] - - configs += [ "//build/config/compiler:enable_arc" ] - - deps = [ - "//base", - "//base/test:test_support", - "//ios/chrome/app/strings", - "//ios/chrome/browser/ui/tools_menu/public", - "//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("unit_tests") { - configs += [ "//build/config/compiler:enable_arc" ] - testonly = true - sources = [ - "tab_model_snapshot_unittest.mm", - "tab_switcher_model_unittest.mm", - "tab_switcher_utils_unittest.mm", - ] - deps = [ - ":tab_switcher", - ":utils", - "//base", - "//ios/chrome/browser/browser_state:test_support", - "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui/ntp/recent_tabs", - "//ios/chrome/browser/web_state_list", - "//ios/chrome/browser/web_state_list:test_support", - "//ios/web/public/test/fakes", - "//testing/gtest", - "//third_party/ocmock", - ] -} - -source_set("eg_tests") { - configs += [ "//build/config/compiler:enable_arc" ] - testonly = true - sources = [ - "tab_switcher_controller_egtest.mm", - "tab_switcher_transition_egtest.mm", - ] - deps = [ - ":egtest_support", - ":modes", - ":tab_switcher", - "//base", - "//base/test:test_support", - "//ios/chrome/app:app_internal", - "//ios/chrome/app/strings", - "//ios/chrome/browser", - "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui", - "//ios/chrome/browser/ui/authentication:eg_test_support", - "//ios/chrome/browser/ui/tab_grid:egtest_support", - "//ios/chrome/test/app:test_support", - "//ios/chrome/test/earl_grey:test_support", - "//ios/public/provider/chrome/browser/signin:test_support", - "//ios/third_party/earl_grey:earl_grey+link", - "//ios/web/public/test/http_server", - "//ui/base", - ] - libs = [ - "UIKit.framework", - "XCTest.framework", - ] -} diff --git a/chromium/ios/chrome/browser/ui/tab_switcher/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_switcher/resources/BUILD.gn deleted file mode 100644 index 62c0b85d0ea..00000000000 --- a/chromium/ios/chrome/browser/ui/tab_switcher/resources/BUILD.gn +++ /dev/null @@ -1,138 +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. - -import("//build/config/ios/asset_catalog.gni") - -imageset("tabswitcher_full_history") { - sources = [ - "tabswitcher_full_history.imageset/Contents.json", - "tabswitcher_full_history.imageset/tabswitcher_full_history.png", - "tabswitcher_full_history.imageset/tabswitcher_full_history@2x.png", - "tabswitcher_full_history.imageset/tabswitcher_full_history@3x.png", - ] -} - -imageset("tabswitcher_incognito") { - sources = [ - "tabswitcher_incognito.imageset/Contents.json", - "tabswitcher_incognito.imageset/tabswitcher_incognito.png", - "tabswitcher_incognito.imageset/tabswitcher_incognito@2x.png", - "tabswitcher_incognito.imageset/tabswitcher_incognito@3x.png", - ] -} - -imageset("tabswitcher_laptop") { - sources = [ - "tabswitcher_laptop.imageset/Contents.json", - "tabswitcher_laptop.imageset/tabswitcher_laptop.png", - "tabswitcher_laptop.imageset/tabswitcher_laptop@2x.png", - "tabswitcher_laptop.imageset/tabswitcher_laptop@3x.png", - ] -} - -imageset("tabswitcher_menu") { - sources = [ - "tabswitcher_menu.imageset/Contents.json", - "tabswitcher_menu.imageset/tabswitcher_menu.png", - "tabswitcher_menu.imageset/tabswitcher_menu@2x.png", - "tabswitcher_menu.imageset/tabswitcher_menu@3x.png", - ] -} - -imageset("tabswitcher_new_tab") { - sources = [ - "tabswitcher_new_tab.imageset/Contents.json", - "tabswitcher_new_tab.imageset/tabswitcher_new_tab.png", - "tabswitcher_new_tab.imageset/tabswitcher_new_tab@2x.png", - "tabswitcher_new_tab.imageset/tabswitcher_new_tab@3x.png", - ] -} - -imageset("tabswitcher_new_tab_fab") { - sources = [ - "tabswitcher_new_tab_fab.imageset/Contents.json", - "tabswitcher_new_tab_fab.imageset/tabswitcher_new_tab_fab.png", - "tabswitcher_new_tab_fab.imageset/tabswitcher_new_tab_fab@2x.png", - "tabswitcher_new_tab_fab.imageset/tabswitcher_new_tab_fab@3x.png", - ] -} - -imageset("tabswitcher_open_tabs") { - sources = [ - "tabswitcher_open_tabs.imageset/Contents.json", - "tabswitcher_open_tabs.imageset/tabswitcher_open_tabs.png", - "tabswitcher_open_tabs.imageset/tabswitcher_open_tabs@2x.png", - "tabswitcher_open_tabs.imageset/tabswitcher_open_tabs@3x.png", - ] -} - -imageset("tabswitcher_other_devices") { - sources = [ - "tabswitcher_other_devices.imageset/Contents.json", - "tabswitcher_other_devices.imageset/tabswitcher_other_devices.png", - "tabswitcher_other_devices.imageset/tabswitcher_other_devices@2x.png", - "tabswitcher_other_devices.imageset/tabswitcher_other_devices@3x.png", - ] -} - -imageset("tabswitcher_overflow_arrow") { - sources = [ - "tabswitcher_overflow_arrow.imageset/Contents.json", - "tabswitcher_overflow_arrow.imageset/tabswitcher_overflow_arrow.png", - "tabswitcher_overflow_arrow.imageset/tabswitcher_overflow_arrow@2x.png", - "tabswitcher_overflow_arrow.imageset/tabswitcher_overflow_arrow@3x.png", - ] -} - -imageset("tabswitcher_phone") { - sources = [ - "tabswitcher_phone.imageset/Contents.json", - "tabswitcher_phone.imageset/tabswitcher_phone.png", - "tabswitcher_phone.imageset/tabswitcher_phone@2x.png", - "tabswitcher_phone.imageset/tabswitcher_phone@3x.png", - ] -} - -imageset("tabswitcher_recently_closed") { - sources = [ - "tabswitcher_recently_closed.imageset/Contents.json", - "tabswitcher_recently_closed.imageset/tabswitcher_recently_closed.png", - "tabswitcher_recently_closed.imageset/tabswitcher_recently_closed@2x.png", - "tabswitcher_recently_closed.imageset/tabswitcher_recently_closed@3x.png", - ] -} - -imageset("tabswitcher_tab_switcher_button") { - sources = [ - "tabswitcher_tab_switcher_button.imageset/Contents.json", - "tabswitcher_tab_switcher_button.imageset/tabswitcher_tab_switcher_button.png", - "tabswitcher_tab_switcher_button.imageset/tabswitcher_tab_switcher_button@2x.png", - "tabswitcher_tab_switcher_button.imageset/tabswitcher_tab_switcher_button@3x.png", - ] -} - -imageset("tabswitcher_tab_switcher_count_button") { - sources = [ - "tabswitcher_tab_switcher_count_button.imageset/Contents.json", - "tabswitcher_tab_switcher_count_button.imageset/tabswitcher_tab_switcher_count_button.png", - "tabswitcher_tab_switcher_count_button.imageset/tabswitcher_tab_switcher_count_button@2x.png", - ] -} - -imageset("tabswitcher_tab_switcher_count_button_pressed") { - sources = [ - "tabswitcher_tab_switcher_count_button_pressed.imageset/Contents.json", - "tabswitcher_tab_switcher_count_button_pressed.imageset/tabswitcher_tab_switcher_count_button_pressed.png", - "tabswitcher_tab_switcher_count_button_pressed.imageset/tabswitcher_tab_switcher_count_button_pressed@2x.png", - ] -} - -imageset("tabswitcher_tablet") { - sources = [ - "tabswitcher_tablet.imageset/Contents.json", - "tabswitcher_tablet.imageset/tabswitcher_tablet.png", - "tabswitcher_tablet.imageset/tabswitcher_tablet@2x.png", - "tabswitcher_tablet.imageset/tabswitcher_tablet@3x.png", - ] -} diff --git a/chromium/ios/chrome/browser/ui/tabs/BUILD.gn b/chromium/ios/chrome/browser/ui/tabs/BUILD.gn index 665bec39fef..cebee0bf906 100644 --- a/chromium/ios/chrome/browser/ui/tabs/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/tabs/BUILD.gn @@ -28,25 +28,15 @@ source_set("tabs") { deps = [ "resources:open_new_tab_background", "resources:tabstrip_background_tab", - "resources:tabstrip_background_tab_legacy", "resources:tabstrip_foreground_tab", - "resources:tabstrip_foreground_tab_legacy", "resources:tabstrip_incognito_background_tab", - "resources:tabstrip_incognito_background_tab_legacy", "resources:tabstrip_incognito_foreground_tab", - "resources:tabstrip_incognito_foreground_tab_legacy", "resources:tabstrip_new_tab", "resources:tabstrip_new_tab_incognito", - "resources:tabstrip_new_tab_incognito_legacy", "resources:tabstrip_new_tab_incognito_pressed", - "resources:tabstrip_new_tab_incognito_pressed_legacy", - "resources:tabstrip_new_tab_legacy", "resources:tabstrip_new_tab_pressed", - "resources:tabstrip_new_tab_pressed_legacy", - "resources:tabstrip_tab_close_incognito_legacy", - "resources:tabstrip_tab_close_incognito_pressed_legacy", - "resources:tabstrip_tab_close_legacy", - "resources:tabstrip_tab_close_pressed_legacy", + "resources:tabstrip_tab_switcher_count_button", + "resources:tabstrip_tab_switcher_count_button_pressed", "resources:tabstrip_toggle_button_gradient", "//base", "//base:i18n", diff --git a/chromium/ios/chrome/browser/ui/tabs/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/tabs/resources/BUILD.gn index 7ea8180be92..db1e1bd38ea 100644 --- a/chromium/ios/chrome/browser/ui/tabs/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/tabs/resources/BUILD.gn @@ -45,38 +45,6 @@ imageset("tabstrip_incognito_foreground_tab") { ] } -imageset("tabstrip_background_tab_legacy") { - sources = [ - "tabstrip_background_tab_legacy.imageset/Contents.json", - "tabstrip_background_tab_legacy.imageset/tabstrip_background_tab_legacy@2x~ipad.png", - "tabstrip_background_tab_legacy.imageset/tabstrip_background_tab_legacy~ipad.png", - ] -} - -imageset("tabstrip_foreground_tab_legacy") { - sources = [ - "tabstrip_foreground_tab_legacy.imageset/Contents.json", - "tabstrip_foreground_tab_legacy.imageset/tabstrip_foreground_tab_legacy@2x~ipad.png", - "tabstrip_foreground_tab_legacy.imageset/tabstrip_foreground_tab_legacy~ipad.png", - ] -} - -imageset("tabstrip_incognito_background_tab_legacy") { - sources = [ - "tabstrip_incognito_background_tab_legacy.imageset/Contents.json", - "tabstrip_incognito_background_tab_legacy.imageset/tabstrip_incognito_background_tab_legacy@2x~ipad.png", - "tabstrip_incognito_background_tab_legacy.imageset/tabstrip_incognito_background_tab_legacy~ipad.png", - ] -} - -imageset("tabstrip_incognito_foreground_tab_legacy") { - sources = [ - "tabstrip_incognito_foreground_tab_legacy.imageset/Contents.json", - "tabstrip_incognito_foreground_tab_legacy.imageset/tabstrip_incognito_foreground_tab_legacy@2x~ipad.png", - "tabstrip_incognito_foreground_tab_legacy.imageset/tabstrip_incognito_foreground_tab_legacy~ipad.png", - ] -} - imageset("tabstrip_new_tab") { sources = [ "tabstrip_new_tab.imageset/Contents.json", @@ -109,67 +77,19 @@ imageset("tabstrip_new_tab_pressed") { ] } -imageset("tabstrip_new_tab_legacy") { - sources = [ - "tabstrip_new_tab_legacy.imageset/Contents.json", - "tabstrip_new_tab_legacy.imageset/tabstrip_new_tab_legacy@2x~ipad.png", - "tabstrip_new_tab_legacy.imageset/tabstrip_new_tab_legacy~ipad.png", - ] -} - -imageset("tabstrip_new_tab_incognito_legacy") { - sources = [ - "tabstrip_new_tab_incognito_legacy.imageset/Contents.json", - "tabstrip_new_tab_incognito_legacy.imageset/tabstrip_new_tab_incognito_legacy@2x~ipad.png", - "tabstrip_new_tab_incognito_legacy.imageset/tabstrip_new_tab_incognito_legacy~ipad.png", - ] -} - -imageset("tabstrip_new_tab_incognito_pressed_legacy") { - sources = [ - "tabstrip_new_tab_incognito_pressed_legacy.imageset/Contents.json", - "tabstrip_new_tab_incognito_pressed_legacy.imageset/tabstrip_new_tab_incognito_pressed_legacy@2x~ipad.png", - "tabstrip_new_tab_incognito_pressed_legacy.imageset/tabstrip_new_tab_incognito_pressed_legacy~ipad.png", - ] -} - -imageset("tabstrip_new_tab_pressed_legacy") { - sources = [ - "tabstrip_new_tab_pressed_legacy.imageset/Contents.json", - "tabstrip_new_tab_pressed_legacy.imageset/tabstrip_new_tab_pressed_legacy@2x~ipad.png", - "tabstrip_new_tab_pressed_legacy.imageset/tabstrip_new_tab_pressed_legacy~ipad.png", - ] -} - -imageset("tabstrip_tab_close_legacy") { - sources = [ - "tabstrip_tab_close_legacy.imageset/Contents.json", - "tabstrip_tab_close_legacy.imageset/tabstrip_tab_close_legacy@2x~ipad.png", - "tabstrip_tab_close_legacy.imageset/tabstrip_tab_close_legacy~ipad.png", - ] -} - -imageset("tabstrip_tab_close_incognito_legacy") { - sources = [ - "tabstrip_tab_close_incognito_legacy.imageset/Contents.json", - "tabstrip_tab_close_incognito_legacy.imageset/tabstrip_tab_close_incognito_legacy@2x~ipad.png", - "tabstrip_tab_close_incognito_legacy.imageset/tabstrip_tab_close_incognito_legacy~ipad.png", - ] -} - -imageset("tabstrip_tab_close_incognito_pressed_legacy") { +imageset("tabstrip_tab_switcher_count_button") { sources = [ - "tabstrip_tab_close_incognito_pressed_legacy.imageset/Contents.json", - "tabstrip_tab_close_incognito_pressed_legacy.imageset/tabstrip_tab_close_incognito_pressed_legacy@2x~ipad.png", - "tabstrip_tab_close_incognito_pressed_legacy.imageset/tabstrip_tab_close_incognito_pressed_legacy~ipad.png", + "tabstrip_tab_switcher_count_button.imageset/Contents.json", + "tabstrip_tab_switcher_count_button.imageset/tabstrip_tab_switcher_count_button.png", + "tabstrip_tab_switcher_count_button.imageset/tabstrip_tab_switcher_count_button@2x.png", ] } -imageset("tabstrip_tab_close_pressed_legacy") { +imageset("tabstrip_tab_switcher_count_button_pressed") { sources = [ - "tabstrip_tab_close_pressed_legacy.imageset/Contents.json", - "tabstrip_tab_close_pressed_legacy.imageset/tabstrip_tab_close_pressed_legacy@2x~ipad.png", - "tabstrip_tab_close_pressed_legacy.imageset/tabstrip_tab_close_pressed_legacy~ipad.png", + "tabstrip_tab_switcher_count_button_pressed.imageset/Contents.json", + "tabstrip_tab_switcher_count_button_pressed.imageset/tabstrip_tab_switcher_count_button_pressed.png", + "tabstrip_tab_switcher_count_button_pressed.imageset/tabstrip_tab_switcher_count_button_pressed@2x.png", ] } diff --git a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn index fb086f66a68..89379b91034 100644 --- a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn @@ -1,154 +1,182 @@ -# Copyright 2016 The Chromium Authors. All rights reserved. +# 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("toolbar") { - configs += [ "//build/config/compiler:enable_arc" ] sources = [ - "toolbar_model_delegate_ios.h", - "toolbar_model_delegate_ios.mm", + "adaptive_toolbar_coordinator+subclassing.h", + "adaptive_toolbar_coordinator.h", + "adaptive_toolbar_coordinator.mm", + "primary_toolbar_coordinator.h", + "primary_toolbar_coordinator.mm", + "secondary_toolbar_coordinator.h", + "secondary_toolbar_coordinator.mm", + "toolbar_coordinatee.h", + "toolbar_coordinator_adaptor.h", + "toolbar_coordinator_adaptor.mm", + "toolbar_coordinator_delegate.h", + "toolbar_mediator.h", + "toolbar_mediator.mm", ] + + configs += [ "//build/config/compiler:enable_arc" ] + deps = [ ":toolbar_ui", - "resources:collapse", - "resources:collapse_incognito", - "resources:collapse_pressed", - "resources:collapse_pressed_incognito", - "resources:incognito_marker_typing", - "resources:toolbar_dark_newtab", - "resources:toolbar_dark_newtab_active", - "resources:toolbar_dark_newtab_incognito", - "resources:toolbar_dark_newtab_incognito_active", "//base", - "//components/prefs", - "//components/toolbar", + "//components/bookmarks/browser", + "//components/google/core/browser", + "//components/strings", "//ios/chrome/browser", "//ios/chrome/browser/autocomplete", + "//ios/chrome/browser/bookmarks", "//ios/chrome/browser/browser_state", - "//ios/chrome/browser/ssl", - "//ios/chrome/browser/ui:ui_util", - "//ios/chrome/browser/ui/activity_services/requirements", + "//ios/chrome/browser/reading_list", + "//ios/chrome/browser/search_engines", + "//ios/chrome/browser/ui", + "//ios/chrome/browser/ui/bookmarks", + "//ios/chrome/browser/ui/broadcaster", + "//ios/chrome/browser/ui/browser_list", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/fullscreen", - "//ios/chrome/browser/ui/history_popup/requirements", + "//ios/chrome/browser/ui/location_bar", + "//ios/chrome/browser/ui/ntp", + "//ios/chrome/browser/ui/ntp:util", + "//ios/chrome/browser/ui/omnibox", "//ios/chrome/browser/ui/omnibox:omnibox_internal", - "//ios/chrome/browser/ui/qr_scanner/requirements", - "//ios/chrome/browser/ui/toolbar/clean:toolbar", - "//ios/chrome/browser/ui/toolbar/clean:toolbar_ui", + "//ios/chrome/browser/ui/omnibox/popup", + "//ios/chrome/browser/ui/orchestrator", + "//ios/chrome/browser/ui/popup_menu/public", + "//ios/chrome/browser/ui/toolbar/buttons", + "//ios/chrome/browser/ui/toolbar/keyboard_assist", "//ios/chrome/browser/ui/toolbar/public", - "//ios/chrome/browser/ui/tools_menu", - "//ios/chrome/browser/ui/tools_menu/public", + "//ios/chrome/browser/ui/voice", "//ios/chrome/browser/web_state_list", + "//ios/chrome/common", + "//ios/public/provider/chrome/browser", + "//ios/public/provider/chrome/browser/images", "//ios/public/provider/chrome/browser/voice", - "//ios/web/public", + "//ios/web", ] - libs = [ "UIKit.framework" ] + + allow_circular_includes_from = [ "//ios/chrome/browser/ui/location_bar" ] } source_set("toolbar_ui") { sources = [ - "legacy_toolbar_ui_updater.h", - "legacy_toolbar_ui_updater.mm", - "toolbar_owner.h", - "toolbar_snapshot_providing.h", - "toolbar_ui.h", - "toolbar_ui.mm", + "adaptive_toolbar_view.h", + "adaptive_toolbar_view_controller+subclassing.h", + "adaptive_toolbar_view_controller.h", + "adaptive_toolbar_view_controller.mm", + "primary_toolbar_view.h", + "primary_toolbar_view.mm", + "primary_toolbar_view_controller.h", + "primary_toolbar_view_controller.mm", + "primary_toolbar_view_controller_delegate.h", + "secondary_toolbar_view.h", + "secondary_toolbar_view.mm", + "secondary_toolbar_view_controller.h", + "secondary_toolbar_view_controller.mm", + "toolbar_consumer.h", + "toolbar_progress_bar.h", + "toolbar_progress_bar.mm", ] deps = [ "//base", + "//ios/chrome/app/strings", + "//ios/chrome/browser/ui:ui", "//ios/chrome/browser/ui:ui_util", - "//ios/chrome/browser/web_state_list", - "//ios/web", + "//ios/chrome/browser/ui/activity_services/requirements", + "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/fullscreen:ui", + "//ios/chrome/browser/ui/ntp:ntp", + "//ios/chrome/browser/ui/orchestrator", + "//ios/chrome/browser/ui/popup_menu/public", + "//ios/chrome/browser/ui/toolbar/buttons", + "//ios/chrome/browser/ui/toolbar/public", + "//ios/chrome/browser/ui/toolbar/public:feature_flags", + "//ios/chrome/browser/ui/util", + "//ios/chrome/common:timing", + "//ios/chrome/common/ui_util", + "//ios/third_party/material_components_ios", + "//ui/base", ] - configs += [ "//build/config/compiler:enable_arc" ] libs = [ "UIKit.framework" ] -} - -source_set("toolbar_ui_broadcasting_util") { - sources = [ - "toolbar_ui_broadcasting_util.h", - "toolbar_ui_broadcasting_util.mm", - ] - deps = [ - ":toolbar_ui", - "//ios/chrome/browser/ui/broadcaster", - ] configs += [ "//build/config/compiler:enable_arc" ] } -source_set("resource_macros") { - sources = [ - "toolbar_resource_macros.h", - ] - deps = [ - "//ios/chrome/app/theme", - ] -} - source_set("unit_tests") { - configs += [ "//build/config/compiler:enable_arc" ] testonly = true + sources = [ - "legacy_toolbar_ui_updater_unittest.mm", - "toolbar_ui_broadcasting_util_unittest.mm", + "adaptive_toolbar_view_controller_unittest.mm", + "toolbar_mediator_unittest.mm", ] deps = [ ":toolbar", ":toolbar_ui", - ":toolbar_ui_broadcasting_util", "//base", + "//base/test:test_support", "//components/bookmarks/browser", "//components/bookmarks/test", - "//components/toolbar:test_support", - "//ios/chrome/browser", + "//components/search_engines", "//ios/chrome/browser/bookmarks", "//ios/chrome/browser/browser_state:test_support", - "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui", - "//ios/chrome/browser/ui/broadcaster", - "//ios/chrome/browser/ui/toolbar/legacy", + "//ios/chrome/browser/search_engines", + "//ios/chrome/browser/ui:ui_util", + "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/popup_menu/public", + "//ios/chrome/browser/ui/toolbar/buttons", "//ios/chrome/browser/ui/toolbar/test", "//ios/chrome/browser/web_state_list", "//ios/chrome/browser/web_state_list:test_support", "//ios/chrome/test:test_support", - "//ios/testing:ocmock_support", + "//ios/public/provider/chrome/browser:test_support", + "//ios/public/provider/chrome/browser/images:test_support", + "//ios/public/provider/chrome/browser/voice", + "//ios/web", "//ios/web/public/test", "//ios/web/public/test/fakes", "//testing/gtest", "//third_party/ocmock", ] + configs += [ "//build/config/compiler:enable_arc" ] } source_set("eg_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ + "adaptive_toolbar_egtest.mm", "toolbar_egtest.mm", ] deps = [ - ":toolbar", + ":toolbar_ui", "//base", "//components/strings", "//ios/chrome/app/strings", + "//ios/chrome/browser/infobars", "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant", + "//ios/chrome/browser/ui/infobars:test_support", "//ios/chrome/browser/ui/ntp:ntp_controller", "//ios/chrome/browser/ui/ntp:ntp_internal", "//ios/chrome/browser/ui/omnibox:omnibox_internal", "//ios/chrome/browser/ui/omnibox/popup", "//ios/chrome/browser/ui/omnibox/popup:popup_internal", "//ios/chrome/browser/ui/omnibox/popup:popup_internal", + "//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/clean:toolbar_ui", - "//ios/chrome/browser/ui/toolbar/legacy", - "//ios/chrome/browser/ui/tools_menu/public", + "//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/earl_grey:earl_grey+link", + "//ios/web:earl_grey_test_support", "//ios/web/public/test/http_server", "//ui/base", ] diff --git a/chromium/ios/chrome/browser/ui/toolbar/adaptive/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/adaptive/BUILD.gn deleted file mode 100644 index cc44e605ac7..00000000000 --- a/chromium/ios/chrome/browser/ui/toolbar/adaptive/BUILD.gn +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 2018 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("adaptive") { - sources = [ - "adaptive_toolbar_coordinator+subclassing.h", - "adaptive_toolbar_coordinator.h", - "adaptive_toolbar_coordinator.mm", - "primary_toolbar_coordinator.h", - "primary_toolbar_coordinator.mm", - "secondary_toolbar_coordinator.h", - "secondary_toolbar_coordinator.mm", - "toolbar_coordinatee.h", - "toolbar_coordinator_adaptor.h", - "toolbar_coordinator_adaptor.mm", - ] - deps = [ - ":adaptive_ui", - "//base", - "//components/google/core/browser", - "//ios/chrome/browser/bookmarks", - "//ios/chrome/browser/browser_state", - "//ios/chrome/browser/reading_list", - "//ios/chrome/browser/search_engines", - "//ios/chrome/browser/ui", - "//ios/chrome/browser/ui/commands", - "//ios/chrome/browser/ui/coordinators:chrome_coordinators", - "//ios/chrome/browser/ui/fullscreen", - "//ios/chrome/browser/ui/location_bar", - "//ios/chrome/browser/ui/ntp", - "//ios/chrome/browser/ui/ntp:util", - "//ios/chrome/browser/ui/omnibox", - "//ios/chrome/browser/ui/omnibox:omnibox_internal", - "//ios/chrome/browser/ui/omnibox/popup", - "//ios/chrome/browser/ui/orchestrator", - "//ios/chrome/browser/ui/popup_menu/public", - "//ios/chrome/browser/ui/toolbar", - "//ios/chrome/browser/ui/toolbar/buttons", - "//ios/chrome/browser/ui/toolbar/clean:toolbar", - "//ios/chrome/browser/ui/toolbar/public", - "//ios/chrome/browser/ui/tools_menu", - "//ios/chrome/browser/ui/tools_menu/public", - "//ios/chrome/browser/web_state_list", - "//ios/public/provider/chrome/browser", - "//ios/web", - ] - configs += [ "//build/config/compiler:enable_arc" ] -} - -source_set("adaptive_ui") { - sources = [ - "adaptive_toolbar_view.h", - "adaptive_toolbar_view_controller+subclassing.h", - "adaptive_toolbar_view_controller.h", - "adaptive_toolbar_view_controller.mm", - "primary_toolbar_view.h", - "primary_toolbar_view.mm", - "primary_toolbar_view_controller.h", - "primary_toolbar_view_controller.mm", - "primary_toolbar_view_controller_delegate.h", - "secondary_toolbar_view.h", - "secondary_toolbar_view.mm", - "secondary_toolbar_view_controller.h", - "secondary_toolbar_view_controller.mm", - ] - deps = [ - "//base", - "//ios/chrome/browser/ui:ui", - "//ios/chrome/browser/ui:ui_util", - "//ios/chrome/browser/ui/activity_services/requirements", - "//ios/chrome/browser/ui/commands", - "//ios/chrome/browser/ui/fullscreen:ui", - "//ios/chrome/browser/ui/ntp:ntp", - "//ios/chrome/browser/ui/orchestrator", - "//ios/chrome/browser/ui/popup_menu/public", - "//ios/chrome/browser/ui/toolbar/buttons", - "//ios/chrome/browser/ui/toolbar/clean:toolbar_ui", - "//ios/chrome/browser/ui/toolbar/public", - "//ios/chrome/browser/ui/toolbar/public:feature_flags", - "//ios/chrome/browser/ui/util", - "//ios/chrome/common:timing", - "//ios/chrome/common/ui_util", - "//ios/third_party/material_components_ios", - ] - configs += [ "//build/config/compiler:enable_arc" ] -} - -source_set("eg_tests") { - configs += [ "//build/config/compiler:enable_arc" ] - testonly = true - sources = [ - "adaptive_toolbar_egtest.mm", - ] - - deps = [ - ":adaptive_ui", - "//base", - "//components/strings", - "//ios/chrome/app/strings", - "//ios/chrome/browser/infobars", - "//ios/chrome/browser/ui:ui_util", - "//ios/chrome/browser/ui/infobars:test_support", - "//ios/chrome/browser/ui/tab_grid:egtest_support", - "//ios/chrome/browser/ui/toolbar/buttons", - "//ios/chrome/browser/ui/toolbar/public", - "//ios/chrome/browser/ui/tools_menu/public", - "//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/web:earl_grey_test_support", - "//ui/base", - ] - libs = [ "XCTest.framework" ] -} - -source_set("unit_tests") { - configs += [ "//build/config/compiler:enable_arc" ] - testonly = true - sources = [ - "adaptive_toolbar_view_controller_unittest.mm", - ] - deps = [ - ":adaptive_ui", - "//base", - "//base/test:test_support", - "//ios/chrome/browser/ui:ui_util", - "//ios/chrome/browser/ui/commands", - "//ios/chrome/browser/ui/popup_menu/public", - "//ios/chrome/browser/ui/toolbar/buttons", - "//testing/gtest", - "//third_party/ocmock", - ] -} - -source_set("hooks") { - configs += [ "//build/config/compiler:enable_arc" ] - testonly = true - sources = [ - "adaptive_toolbar_eg_tests_hook.mm", - ] - deps = [ - "//ios/chrome/app:tests_hook", - ] -} diff --git a/chromium/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn index 36b0dc76f07..349940b7bdb 100644 --- a/chromium/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn @@ -8,8 +8,6 @@ source_set("buttons") { "toolbar_button.mm", "toolbar_button_factory.h", "toolbar_button_factory.mm", - "toolbar_button_tints.h", - "toolbar_button_tints.mm", "toolbar_button_visibility_configuration.h", "toolbar_button_visibility_configuration.mm", "toolbar_component_options.h", @@ -25,30 +23,24 @@ source_set("buttons") { "toolbar_tools_menu_button.h", "toolbar_tools_menu_button.mm", "toolbar_type.h", - "tools_menu_button_observer_bridge.h", - "tools_menu_button_observer_bridge.mm", ] deps = [ "resources:toolbar_back", "resources:toolbar_bookmark", "resources:toolbar_bookmark_active", "resources:toolbar_forward", - "resources:toolbar_menu", "resources:toolbar_reload", "resources:toolbar_search", "resources:toolbar_share", "resources:toolbar_stop", "resources:toolbar_switcher", "//base", - "//components/reading_list/core", - "//components/reading_list/ios", "//components/strings", "//ios/chrome/app/strings", "//ios/chrome/app/theme", "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant", - "//ios/chrome/browser/ui/toolbar:resource_macros", "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/toolbar/public:feature_flags", "//ios/chrome/browser/ui/util", 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 06063edc0bd..5b718005528 100644 --- a/chromium/ios/chrome/browser/ui/toolbar/buttons/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/toolbar/buttons/resources/BUILD.gn @@ -40,15 +40,6 @@ imageset("toolbar_reload") { ] } -imageset("toolbar_menu") { - sources = [ - "toolbar_menu.imageset/Contents.json", - "toolbar_menu.imageset/toolbar_menu.png", - "toolbar_menu.imageset/toolbar_menu@2x.png", - "toolbar_menu.imageset/toolbar_menu@3x.png", - ] -} - imageset("toolbar_share") { sources = [ "toolbar_share.imageset/Contents.json", diff --git a/chromium/ios/chrome/browser/ui/toolbar/clean/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/clean/BUILD.gn deleted file mode 100644 index 608895ba951..00000000000 --- a/chromium/ios/chrome/browser/ui/toolbar/clean/BUILD.gn +++ /dev/null @@ -1,122 +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("toolbar") { - sources = [ - "toolbar_coordinator.h", - "toolbar_coordinator.mm", - "toolbar_coordinator_delegate.h", - "toolbar_mediator.h", - "toolbar_mediator.mm", - ] - - configs += [ "//build/config/compiler:enable_arc" ] - - deps = [ - ":toolbar_ui", - "//base", - "//components/bookmarks/browser", - "//components/strings", - "//ios/chrome/browser", - "//ios/chrome/browser/autocomplete", - "//ios/chrome/browser/bookmarks", - "//ios/chrome/browser/browser_state", - "//ios/chrome/browser/reading_list", - "//ios/chrome/browser/search_engines", - "//ios/chrome/browser/ui", - "//ios/chrome/browser/ui/bookmarks", - "//ios/chrome/browser/ui/broadcaster", - "//ios/chrome/browser/ui/browser_list", - "//ios/chrome/browser/ui/commands", - "//ios/chrome/browser/ui/commands", - "//ios/chrome/browser/ui/coordinators", - "//ios/chrome/browser/ui/fullscreen", - "//ios/chrome/browser/ui/history_popup/requirements", - "//ios/chrome/browser/ui/location_bar", - "//ios/chrome/browser/ui/ntp:util", - "//ios/chrome/browser/ui/omnibox", - "//ios/chrome/browser/ui/omnibox:omnibox_internal", - "//ios/chrome/browser/ui/omnibox/popup", - "//ios/chrome/browser/ui/toolbar:toolbar_ui", - "//ios/chrome/browser/ui/toolbar/buttons", - "//ios/chrome/browser/ui/toolbar/keyboard_assist", - "//ios/chrome/browser/ui/toolbar/public", - "//ios/chrome/browser/ui/tools_menu", - "//ios/chrome/browser/ui/tools_menu:configuration", - "//ios/chrome/browser/ui/tools_menu/public", - "//ios/chrome/browser/ui/voice", - "//ios/chrome/browser/web_state_list", - "//ios/chrome/common", - "//ios/public/provider/chrome/browser", - "//ios/public/provider/chrome/browser/images", - "//ios/public/provider/chrome/browser/voice", - "//ios/third_party/material_components_ios", - "//ios/web", - ] - - allow_circular_includes_from = [ "//ios/chrome/browser/ui/location_bar" ] -} - -source_set("toolbar_ui") { - sources = [ - "toolbar_button_updater.h", - "toolbar_button_updater.mm", - "toolbar_consumer.h", - "toolbar_view.h", - "toolbar_view.mm", - "toolbar_view_controller.h", - "toolbar_view_controller.mm", - ] - deps = [ - "//base", - "//ios/chrome/app/theme", - "//ios/chrome/browser/ui", - "//ios/chrome/browser/ui/activity_services/requirements", - "//ios/chrome/browser/ui/commands", - "//ios/chrome/browser/ui/fullscreen:ui", - "//ios/chrome/browser/ui/history_popup/requirements", - "//ios/chrome/browser/ui/toolbar/buttons", - "//ios/chrome/browser/ui/toolbar/public", - "//ios/chrome/browser/ui/toolbar/public:feature_flags", - "//ios/chrome/browser/ui/util", - "//ios/chrome/browser/ui/voice", - "//ios/chrome/common", - "//ios/third_party/material_components_ios", - ] - libs = [ "UIKit.framework" ] - configs += [ "//build/config/compiler:enable_arc" ] -} - -source_set("unit_tests") { - testonly = true - - sources = [ - "toolbar_mediator_unittest.mm", - ] - deps = [ - ":toolbar", - ":toolbar_ui", - "//base", - "//base/test:test_support", - "//components/bookmarks/browser", - "//components/bookmarks/test", - "//components/search_engines", - "//ios/chrome/browser/bookmarks", - "//ios/chrome/browser/browser_state:test_support", - "//ios/chrome/browser/search_engines", - "//ios/chrome/browser/ui/toolbar/test", - "//ios/chrome/browser/web_state_list", - "//ios/chrome/browser/web_state_list:test_support", - "//ios/chrome/test:test_support", - "//ios/public/provider/chrome/browser:test_support", - "//ios/public/provider/chrome/browser/images:test_support", - "//ios/public/provider/chrome/browser/voice", - "//ios/web", - "//ios/web/public/test", - "//ios/web/public/test/fakes", - "//testing/gtest", - "//third_party/ocmock", - ] - configs += [ "//build/config/compiler:enable_arc" ] -} diff --git a/chromium/ios/chrome/browser/ui/toolbar/fullscreen/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/fullscreen/BUILD.gn new file mode 100644 index 00000000000..cef32b156c8 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/toolbar/fullscreen/BUILD.gn @@ -0,0 +1,64 @@ +# Copyright 2016 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("fullscreen") { + sources = [ + "legacy_toolbar_ui_updater.h", + "legacy_toolbar_ui_updater.mm", + "toolbar_ui.h", + "toolbar_ui.mm", + ] + deps = [ + "//base", + "//ios/chrome/browser/ui:ui_util", + "//ios/chrome/browser/web_state_list", + "//ios/web", + ] + configs += [ "//build/config/compiler:enable_arc" ] + libs = [ "UIKit.framework" ] +} + +source_set("fullscreen_broadcasting_util") { + sources = [ + "toolbar_ui_broadcasting_util.h", + "toolbar_ui_broadcasting_util.mm", + ] + deps = [ + ":fullscreen", + "//ios/chrome/browser/ui/broadcaster", + ] + configs += [ "//build/config/compiler:enable_arc" ] +} + +source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ + "legacy_toolbar_ui_updater_unittest.mm", + "toolbar_ui_broadcasting_util_unittest.mm", + ] + deps = [ + ":fullscreen", + ":fullscreen_broadcasting_util", + "//base", + "//components/bookmarks/browser", + "//components/bookmarks/test", + "//components/toolbar:test_support", + "//ios/chrome/browser", + "//ios/chrome/browser/bookmarks", + "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/tabs", + "//ios/chrome/browser/ui", + "//ios/chrome/browser/ui/broadcaster", + "//ios/chrome/browser/ui/toolbar/test", + "//ios/chrome/browser/web_state_list", + "//ios/chrome/browser/web_state_list:test_support", + "//ios/chrome/test:test_support", + "//ios/testing:ocmock_support", + "//ios/web/public/test", + "//ios/web/public/test/fakes", + "//testing/gtest", + "//third_party/ocmock", + ] +} diff --git a/chromium/ios/chrome/browser/ui/toolbar/legacy/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/legacy/BUILD.gn deleted file mode 100644 index 4decf333bad..00000000000 --- a/chromium/ios/chrome/browser/ui/toolbar/legacy/BUILD.gn +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 2018 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("legacy") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "abstract_toolbar.h", - "legacy_toolbar_view.h", - "legacy_toolbar_view.mm", - "toolbar_controller+protected.h", - "toolbar_controller.h", - "toolbar_controller.mm", - "toolbar_controller_constants.h", - "toolbar_controller_constants.mm", - "toolbar_utils.h", - "toolbar_utils.mm", - ] - deps = [ - "//base", - "//base:i18n", - "//ios/chrome/app/strings", - "//ios/chrome/app/theme", - "//ios/chrome/browser/ui", - "//ios/chrome/browser/ui/activity_services/requirements", - "//ios/chrome/browser/ui/bubble", - "//ios/chrome/browser/ui/commands", - "//ios/chrome/browser/ui/fullscreen:ui", - "//ios/chrome/browser/ui/image_util", - "//ios/chrome/browser/ui/toolbar:resource_macros", - "//ios/chrome/browser/ui/toolbar/buttons", - "//ios/chrome/browser/ui/toolbar/buttons", - "//ios/chrome/browser/ui/toolbar/public", - "//ios/chrome/browser/ui/tools_menu:configuration", - "//ios/chrome/browser/ui/tools_menu/public", - "//ios/chrome/browser/ui/util", - "//ios/chrome/common:timing", - "//ios/third_party/material_components_ios", - ] -} - -source_set("unit_tests") { - configs += [ "//build/config/compiler:enable_arc" ] - testonly = true - sources = [ - "toolbar_controller_unittest.mm", - ] - deps = [ - ":legacy", - "//base", - "//ios/chrome/browser/ui:ui_util", - "//ios/testing:ocmock_support", - "//ios/web/public/test", - "//ios/web/public/test/fakes", - "//testing/gtest", - "//third_party/ocmock", - ] -} diff --git a/chromium/ios/chrome/browser/ui/toolbar/public/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/public/BUILD.gn index 76f876bd8e6..6f67a1c8a4d 100644 --- a/chromium/ios/chrome/browser/ui/toolbar/public/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/toolbar/public/BUILD.gn @@ -21,15 +21,14 @@ source_set("public") { "//ios/chrome/browser/ui/fullscreen:ui", "//ios/chrome/browser/ui/ntp", "//ios/chrome/browser/ui/qr_scanner/requirements", - "//ios/chrome/browser/ui/tools_menu/public", "//ios/public/provider/chrome/browser/voice", ] } source_set("feature_flags") { sources = [ - "features.cc", "features.h", + "features.mm", ] deps = [ "//base", diff --git a/chromium/ios/chrome/browser/ui/toolbar/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/resources/BUILD.gn deleted file mode 100644 index f2791fe33f5..00000000000 --- a/chromium/ios/chrome/browser/ui/toolbar/resources/BUILD.gn +++ /dev/null @@ -1,86 +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. - -import("//build/config/ios/asset_catalog.gni") - -imageset("collapse_incognito") { - sources = [ - "collapse_incognito.imageset/Contents.json", - "collapse_incognito.imageset/collapse_incognito.png", - "collapse_incognito.imageset/collapse_incognito@2x.png", - "collapse_incognito.imageset/collapse_incognito@3x.png", - ] -} - -imageset("collapse_pressed_incognito") { - sources = [ - "collapse_pressed_incognito.imageset/Contents.json", - "collapse_pressed_incognito.imageset/collapse_pressed_incognito.png", - "collapse_pressed_incognito.imageset/collapse_pressed_incognito@2x.png", - "collapse_pressed_incognito.imageset/collapse_pressed_incognito@3x.png", - ] -} - -imageset("toolbar_dark_newtab") { - sources = [ - "toolbar_dark_newtab.imageset/Contents.json", - "toolbar_dark_newtab.imageset/toolbar_dark_newtab.png", - "toolbar_dark_newtab.imageset/toolbar_dark_newtab@2x.png", - "toolbar_dark_newtab.imageset/toolbar_dark_newtab@3x.png", - ] -} - -imageset("toolbar_dark_newtab_incognito_active") { - sources = [ - "toolbar_dark_newtab_incognito_active.imageset/Contents.json", - "toolbar_dark_newtab_incognito_active.imageset/toolbar_dark_newtab_incognito_active.png", - "toolbar_dark_newtab_incognito_active.imageset/toolbar_dark_newtab_incognito_active@2x.png", - "toolbar_dark_newtab_incognito_active.imageset/toolbar_dark_newtab_incognito_active@3x.png", - ] -} - -imageset("collapse_pressed") { - sources = [ - "collapse_pressed.imageset/Contents.json", - "collapse_pressed.imageset/collapse_pressed.png", - "collapse_pressed.imageset/collapse_pressed@2x.png", - "collapse_pressed.imageset/collapse_pressed@3x.png", - ] -} - -imageset("toolbar_dark_newtab_incognito") { - sources = [ - "toolbar_dark_newtab_incognito.imageset/Contents.json", - "toolbar_dark_newtab_incognito.imageset/toolbar_dark_newtab_incognito.png", - "toolbar_dark_newtab_incognito.imageset/toolbar_dark_newtab_incognito@2x.png", - "toolbar_dark_newtab_incognito.imageset/toolbar_dark_newtab_incognito@3x.png", - ] -} - -imageset("toolbar_dark_newtab_active") { - sources = [ - "toolbar_dark_newtab_active.imageset/Contents.json", - "toolbar_dark_newtab_active.imageset/toolbar_dark_newtab_active.png", - "toolbar_dark_newtab_active.imageset/toolbar_dark_newtab_active@2x.png", - "toolbar_dark_newtab_active.imageset/toolbar_dark_newtab_active@3x.png", - ] -} - -imageset("incognito_marker_typing") { - sources = [ - "incognito_marker_typing.imageset/Contents.json", - "incognito_marker_typing.imageset/incognito_marker_typing.png", - "incognito_marker_typing.imageset/incognito_marker_typing@2x.png", - "incognito_marker_typing.imageset/incognito_marker_typing@3x.png", - ] -} - -imageset("collapse") { - sources = [ - "collapse.imageset/Contents.json", - "collapse.imageset/collapse.png", - "collapse.imageset/collapse@2x.png", - "collapse.imageset/collapse@3x.png", - ] -} diff --git a/chromium/ios/chrome/browser/ui/toolbar/test/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/test/BUILD.gn index 8fbdc986228..985d1824a35 100644 --- a/chromium/ios/chrome/browser/ui/toolbar/test/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/toolbar/test/BUILD.gn @@ -20,8 +20,7 @@ source_set("test") { deps = [ "//ios/chrome/browser/ui:ui_util", "//ios/chrome/browser/ui/broadcaster", - "//ios/chrome/browser/ui/toolbar", - "//ios/chrome/browser/ui/toolbar:toolbar_ui", + "//ios/chrome/browser/ui/toolbar/fullscreen", "//ios/web/public/test/fakes", "//testing/gtest", ] diff --git a/chromium/ios/chrome/browser/ui/tools_menu/BUILD.gn b/chromium/ios/chrome/browser/ui/tools_menu/BUILD.gn deleted file mode 100644 index 8d7e67ee630..00000000000 --- a/chromium/ios/chrome/browser/ui/tools_menu/BUILD.gn +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 2016 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("tools_menu") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "new_tab_menu_view_item.h", - "new_tab_menu_view_item.mm", - "reading_list_menu_view_item.h", - "reading_list_menu_view_item.mm", - "tools_menu_coordinator.h", - "tools_menu_coordinator.mm", - "tools_menu_model.h", - "tools_menu_model.mm", - "tools_menu_view_controller.h", - "tools_menu_view_controller.mm", - "tools_menu_view_item.h", - "tools_menu_view_item.mm", - "tools_menu_view_tools_cell.h", - "tools_menu_view_tools_cell.mm", - "tools_popup_controller.h", - "tools_popup_controller.mm", - ] - deps = [ - ":configuration", - "//base", - "//base:i18n", - "//components/feature_engagement", - "//components/strings", - "//ios/chrome/app/strings", - "//ios/chrome/browser", - "//ios/chrome/browser/ui", - "//ios/chrome/browser/ui/colors", - "//ios/chrome/browser/ui/commands", - "//ios/chrome/browser/ui/coordinators:chrome_coordinators", - "//ios/chrome/browser/ui/fullscreen:coordinators", - "//ios/chrome/browser/ui/popup_menu:constants", - "//ios/chrome/browser/ui/popup_menu:popup_menu_ui", - "//ios/chrome/browser/ui/reading_list", - "//ios/chrome/browser/ui/reading_list:reading_list_ui", - "//ios/chrome/browser/ui/toolbar:resource_macros", - "//ios/chrome/browser/ui/tools_menu/public", - "//ios/chrome/common", - "//ios/public/provider/chrome/browser", - "//ios/public/provider/chrome/browser/user_feedback", - "//ios/third_party/material_components_ios", - "//ios/third_party/material_roboto_font_loader_ios", - "//ios/web/public", - "//ui/base", - ] - libs = [ - "QuartzCore.framework", - "UIKit.framework", - ] -} - -source_set("configuration") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "tools_menu_configuration.h", - "tools_menu_configuration.mm", - ] - deps = [ - "//base", - "//ios/web/public", - ] -} - -source_set("unit_tests") { - configs += [ "//build/config/compiler:enable_arc" ] - testonly = true - sources = [ - "reading_list_menu_view_item_unittest.mm", - "tools_menu_view_controller_unittest.mm", - "tools_menu_view_item_unittest.mm", - ] - deps = [ - ":tools_menu", - "//base", - "//ios/chrome/browser:browser", - "//ios/chrome/browser/ui/commands:commands", - "//ios/chrome/browser/ui/reading_list:reading_list_ui", - "//ios/chrome/browser/ui/tools_menu", - "//ios/chrome/browser/ui/tools_menu:configuration", - "//ios/chrome/browser/ui/tools_menu/public", - "//ios/web/public", - "//testing/gtest", - ] -} - -source_set("eg_tests") { - configs += [ "//build/config/compiler:enable_arc" ] - testonly = true - sources = [ - "request_desktop_mobile_site_egtest.mm", - "tools_popup_menu_egtest.mm", - ] - deps = [ - ":tools_menu", - "//base", - "//components/strings", - "//ios/chrome/app/strings", - "//ios/chrome/browser:browser", - "//ios/chrome/browser/ui", - "//ios/chrome/browser/ui:ui_internal", - "//ios/chrome/browser/ui/popup_menu:constants", - "//ios/chrome/browser/ui/tools_menu/public", - "//ios/chrome/test/earl_grey:test_support", - "//ios/third_party/earl_grey:earl_grey+link", - "//ios/web/public/test", - "//ios/web/public/test/http_server", - "//ui/base", - ] - libs = [ "XCTest.framework" ] -} diff --git a/chromium/ios/chrome/browser/ui/tools_menu/public/BUILD.gn b/chromium/ios/chrome/browser/ui/tools_menu/public/BUILD.gn deleted file mode 100644 index 35e5600fb8e..00000000000 --- a/chromium/ios/chrome/browser/ui/tools_menu/public/BUILD.gn +++ /dev/null @@ -1,18 +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("public") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "tools_menu_configuration_provider.h", - "tools_menu_constants.h", - "tools_menu_constants.mm", - "tools_menu_presentation_provider.h", - "tools_menu_presentation_state_provider.h", - ] - deps = [ - "//base", - "//ios/web/public", - ] -} diff --git a/chromium/ios/chrome/browser/ui/util/BUILD.gn b/chromium/ios/chrome/browser/ui/util/BUILD.gn index 6abd6cb7d46..b8673affc07 100644 --- a/chromium/ios/chrome/browser/ui/util/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/util/BUILD.gn @@ -9,10 +9,10 @@ source_set("util") { "CRUILabel+AttributeUtils.mm", "core_text_util.h", "core_text_util.mm", + "dynamic_type_util.h", + "dynamic_type_util.mm", "force_touch_long_press_gesture_recognizer.h", "force_touch_long_press_gesture_recognizer.mm", - "form_sheet_navigation_controller.h", - "form_sheet_navigation_controller.mm", "i18n_string.h", "i18n_string.mm", "label_link_controller.h", @@ -29,6 +29,8 @@ source_set("util") { "named_guide_util.mm", "optional_property_animator.h", "optional_property_animator.mm", + "page_animation_util.h", + "page_animation_util.mm", "pasteboard_util.h", "pasteboard_util.mm", "property_animator_group.h", @@ -52,6 +54,7 @@ source_set("util") { "//base:i18n", "//ios/chrome/browser", "//ios/chrome/browser/ui", + "//ios/chrome/common:timing", "//net", "//url", ] @@ -63,6 +66,7 @@ source_set("unit_tests") { sources = [ "CRUILabel+AttributeUtils_unittest.mm", "core_text_util_unittest.mm", + "dynamic_type_util_unittest.mm", "force_touch_long_press_gesture_recognizer_unittest.mm", "label_link_controller_unittest.mm", "label_observer_unittest.mm", diff --git a/chromium/ios/chrome/browser/web/BUILD.gn b/chromium/ios/chrome/browser/web/BUILD.gn index b8ed80cbfe9..5a2281a625d 100644 --- a/chromium/ios/chrome/browser/web/BUILD.gn +++ b/chromium/ios/chrome/browser/web/BUILD.gn @@ -132,21 +132,23 @@ source_set("unit_tests") { js_compile_bundle("chrome_bundle_all_frames") { closure_entry_point = "__crWeb.chromeBundleAllFrames" sources = [ + "//components/autofill/ios/browser/resources/autofill_controller.js", + "//components/autofill/ios/browser/resources/suggestion_controller.js", + "//components/autofill/ios/form_util/resources/fill.js", "//components/autofill/ios/form_util/resources/form.js", + "//components/autofill/ios/form_util/resources/form_handlers.js", "resources/accessibility.js", "resources/chrome_bundle_all_frames.js", + "resources/print.js", ] } js_compile_bundle("chrome_bundle_main_frame") { closure_entry_point = "__crWeb.chromeBundleMainFrame" sources = [ - "//components/autofill/ios/browser/resources/autofill_controller.js", - "//components/autofill/ios/form_util/resources/fill.js", "//components/password_manager/ios/resources/password_controller.js", "resources/chrome_bundle_main_frame.js", "resources/image_fetch.js", - "resources/print.js", ] deps = [ @@ -306,6 +308,7 @@ source_set("eg_tests") { "progress_indicator_egtest.mm", "push_and_replace_state_navigation_egtest.mm", "stop_loading_egtest.mm", + "tab_order_egtest.mm", "visible_url_egtest.mm", "window_open_by_dom_egtest.mm", ] diff --git a/chromium/ios/chrome/test/BUILD.gn b/chromium/ios/chrome/test/BUILD.gn index fce7c6084c0..5ea51c82cb2 100644 --- a/chromium/ios/chrome/test/BUILD.gn +++ b/chromium/ios/chrome/test/BUILD.gn @@ -204,7 +204,6 @@ test("ios_chrome_unittests") { "//ios/chrome/browser/ui/first_run:unit_tests", "//ios/chrome/browser/ui/fullscreen:unit_tests", "//ios/chrome/browser/ui/history:unit_tests", - "//ios/chrome/browser/ui/history_popup:unit_tests", "//ios/chrome/browser/ui/icons:unit_tests", "//ios/chrome/browser/ui/infobars:unit_tests", "//ios/chrome/browser/ui/keyboard:unit_tests", @@ -213,8 +212,8 @@ test("ios_chrome_unittests") { "//ios/chrome/browser/ui/main:unit_tests", "//ios/chrome/browser/ui/main_content:unit_tests", "//ios/chrome/browser/ui/ntp:unit_tests", - "//ios/chrome/browser/ui/ntp/recent_tabs:unit_tests", "//ios/chrome/browser/ui/omnibox:unit_tests", + "//ios/chrome/browser/ui/omnibox/popup:unit_tests", "//ios/chrome/browser/ui/overlays:unit_tests", "//ios/chrome/browser/ui/payments:unit_tests", "//ios/chrome/browser/ui/payments/cells:unit_tests", @@ -223,24 +222,20 @@ test("ios_chrome_unittests") { "//ios/chrome/browser/ui/promos:unit_tests", "//ios/chrome/browser/ui/qr_scanner:unit_tests", "//ios/chrome/browser/ui/reading_list:unit_tests", + "//ios/chrome/browser/ui/recent_tabs:unit_tests", "//ios/chrome/browser/ui/safe_mode:unit_tests", "//ios/chrome/browser/ui/settings:unit_tests", "//ios/chrome/browser/ui/settings/cells:unit_tests", "//ios/chrome/browser/ui/side_swipe:unit_tests", "//ios/chrome/browser/ui/snackbar:unit_tests", - "//ios/chrome/browser/ui/stack_view:unit_tests", "//ios/chrome/browser/ui/static_content:unit_tests", "//ios/chrome/browser/ui/tab_grid:unit_tests", "//ios/chrome/browser/ui/tab_grid/grid:unit_tests", - "//ios/chrome/browser/ui/tab_switcher:unit_tests", "//ios/chrome/browser/ui/table_view:unit_tests", "//ios/chrome/browser/ui/table_view/cells:unit_tests", "//ios/chrome/browser/ui/tabs:unit_tests", "//ios/chrome/browser/ui/toolbar:unit_tests", - "//ios/chrome/browser/ui/toolbar/adaptive:unit_tests", - "//ios/chrome/browser/ui/toolbar/clean:unit_tests", - "//ios/chrome/browser/ui/toolbar/legacy:unit_tests", - "//ios/chrome/browser/ui/tools_menu:unit_tests", + "//ios/chrome/browser/ui/toolbar/fullscreen:unit_tests", "//ios/chrome/browser/ui/util:unit_tests", "//ios/chrome/browser/ui/voice:unit_tests", "//ios/chrome/browser/update_client:unit_tests", diff --git a/chromium/ios/chrome/test/app/BUILD.gn b/chromium/ios/chrome/test/app/BUILD.gn index ba2a190caf9..2578eee6e7c 100644 --- a/chromium/ios/chrome/test/app/BUILD.gn +++ b/chromium/ios/chrome/test/app/BUILD.gn @@ -22,8 +22,6 @@ source_set("test_support") { "settings_test_util.mm", "signin_test_util.h", "signin_test_util.mm", - "stack_view_test_util.h", - "stack_view_test_util.mm", "static_html_view_test_util.h", "static_html_view_test_util.mm", "sync_test_util.h", @@ -71,12 +69,11 @@ source_set("test_support") { "//ios/chrome/browser/ui/authentication:authentication_ui", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/main", + "//ios/chrome/browser/ui/main:tab_switcher", "//ios/chrome/browser/ui/ntp:ntp_controller", "//ios/chrome/browser/ui/settings", "//ios/chrome/browser/ui/settings:test_support", - "//ios/chrome/browser/ui/stack_view", "//ios/chrome/browser/ui/static_content", - "//ios/chrome/browser/ui/tab_switcher", "//ios/chrome/browser/ui/tabs", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web_state_list", diff --git a/chromium/ios/chrome/test/earl_grey/BUILD.gn b/chromium/ios/chrome/test/earl_grey/BUILD.gn index b146db6aefb..deb8ccc7fb0 100644 --- a/chromium/ios/chrome/test/earl_grey/BUILD.gn +++ b/chromium/ios/chrome/test/earl_grey/BUILD.gn @@ -7,7 +7,6 @@ import("//ios/chrome/test/earl_grey/chrome_ios_eg_test.gni") group("all_tests") { testonly = true deps = [ - ":ios_chrome_adaptive_toolbar_egtests", ":ios_chrome_autofill_automation_egtests", ":ios_chrome_autofill_egtests", ":ios_chrome_bookmarks_egtests", @@ -15,6 +14,7 @@ group("all_tests") { ":ios_chrome_external_url_egtests", ":ios_chrome_flaky_egtests", ":ios_chrome_integration_egtests", + ":ios_chrome_manual_fill_egtests", ":ios_chrome_multitasking_egtests", ":ios_chrome_payments_egtests", ":ios_chrome_perf_egtests", @@ -43,14 +43,6 @@ chrome_ios_eg_test("ios_chrome_integration_egtests") { ] } -chrome_ios_eg_test("ios_chrome_adaptive_toolbar_egtests") { - deps = [ - ":test_support", - "//ios/chrome/browser/ui/toolbar/adaptive:eg_tests", - ] - hooks_target = "//ios/chrome/browser/ui/toolbar/adaptive:hooks" -} - chrome_ios_eg_test("ios_chrome_autofill_egtests") { deps = [ ":test_support", @@ -67,6 +59,13 @@ 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_payments_egtests") { deps = [ ":test_support", @@ -114,22 +113,19 @@ chrome_ios_eg_test("ios_chrome_ui_egtests") { "//ios/chrome/browser/ui/first_run:eg_tests", "//ios/chrome/browser/ui/fullscreen:eg_tests", "//ios/chrome/browser/ui/history:eg_tests", - "//ios/chrome/browser/ui/history_popup:eg_tests", "//ios/chrome/browser/ui/infobars:eg_tests", "//ios/chrome/browser/ui/ntp:eg_tests", - "//ios/chrome/browser/ui/ntp/recent_tabs:eg_tests", + "//ios/chrome/browser/ui/popup_menu:eg_tests", "//ios/chrome/browser/ui/print:eg_tests", "//ios/chrome/browser/ui/qr_scanner:eg_tests", + "//ios/chrome/browser/ui/recent_tabs:eg_tests", "//ios/chrome/browser/ui/sad_tab:eg_tests", "//ios/chrome/browser/ui/safe_mode:eg_tests", "//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/stack_view:eg_tests", - "//ios/chrome/browser/ui/tab_switcher:eg_tests", "//ios/chrome/browser/ui/tabs:eg_tests", "//ios/chrome/browser/ui/toolbar:eg_tests", - "//ios/chrome/browser/ui/tools_menu:eg_tests", "//ios/chrome/browser/ui/webui:eg_tests", ] } @@ -264,10 +260,7 @@ source_set("test_support") { "//ios/chrome/browser/ui/static_content", "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/browser/ui/toolbar/buttons", - "//ios/chrome/browser/ui/toolbar/legacy", "//ios/chrome/browser/ui/toolbar/public", - "//ios/chrome/browser/ui/tools_menu", - "//ios/chrome/browser/ui/tools_menu/public", "//ios/chrome/test/app:test_support", "//ios/testing/earl_grey:earl_grey_support", "//ios/third_party/material_components_ios", diff --git a/chromium/ios/public/provider/chrome/browser/voice/BUILD.gn b/chromium/ios/public/provider/chrome/browser/voice/BUILD.gn index 0e67bbdf9ae..217f91988ac 100644 --- a/chromium/ios/public/provider/chrome/browser/voice/BUILD.gn +++ b/chromium/ios/public/provider/chrome/browser/voice/BUILD.gn @@ -7,8 +7,6 @@ source_set("voice") { sources = [ "audio_session_controller.h", "logo_animation_controller.h", - "voice_search_bar.h", - "voice_search_bar_owner.h", "voice_search_controller.h", "voice_search_controller.mm", "voice_search_language.h", diff --git a/chromium/ios/testing/BUILD.gn b/chromium/ios/testing/BUILD.gn index 1c4092662e4..2c5ebd5ab03 100644 --- a/chromium/ios/testing/BUILD.gn +++ b/chromium/ios/testing/BUILD.gn @@ -91,6 +91,7 @@ bundle_data("http_server_bundle_data") { "data/http_server_files/testpage.pdf", "data/http_server_files/two_pages.pdf", "data/http_server_files/user_agent_test_page.html", + "data/http_server_files/username_password_field_form.html", "data/http_server_files/window_close.html", "data/http_server_files/window_location.html", "data/http_server_files/window_location.js", diff --git a/chromium/ios/third_party/earl_grey/BUILD.gn b/chromium/ios/third_party/earl_grey/BUILD.gn index add07e9ac0f..0ee316e8fb2 100644 --- a/chromium/ios/third_party/earl_grey/BUILD.gn +++ b/chromium/ios/third_party/earl_grey/BUILD.gn @@ -243,46 +243,47 @@ ios_framework_bundle("earl_grey") { "src/EarlGrey/Traversal/GREYTraversalDFS.m", ] public_headers = [ - "src/EarlGrey/EarlGrey.h", - "src/EarlGrey/Core/EarlGreyImpl.h", "src/EarlGrey/Action/GREYAction.h", "src/EarlGrey/Action/GREYActionBlock.h", "src/EarlGrey/Action/GREYActions.h", - "src/EarlGrey/Matcher/GREYAllOf.h", - "src/EarlGrey/Matcher/GREYAnyOf.h", + "src/EarlGrey/Action/GREYBaseAction.h", + "src/EarlGrey/Action/GREYScrollActionError.h", + "src/EarlGrey/AppSupport/GREYIdlingResource.h", "src/EarlGrey/Assertion/GREYAssertion.h", "src/EarlGrey/Assertion/GREYAssertionBlock.h", "src/EarlGrey/Assertion/GREYAssertionDefines.h", "src/EarlGrey/Assertion/GREYAssertions.h", - "src/EarlGrey/Action/GREYBaseAction.h", - "src/EarlGrey/Matcher/GREYBaseMatcher.h", - "src/EarlGrey/Synchronization/GREYCondition.h", "src/EarlGrey/Common/GREYConfiguration.h", "src/EarlGrey/Common/GREYConstants.h", - "src/EarlGrey/Provider/GREYDataEnumerator.h", "src/EarlGrey/Common/GREYDefines.h", - "src/EarlGrey/Matcher/GREYDescription.h", - "src/EarlGrey/Synchronization/GREYDispatchQueueIdlingResource.h", - "src/EarlGrey/Core/GREYElementFinder.h", "src/EarlGrey/Common/GREYElementHierarchy.h", + "src/EarlGrey/Common/GREYScreenshotUtil.h", + "src/EarlGrey/Common/GREYTestHelper.h", + "src/EarlGrey/Core/EarlGreyImpl.h", + "src/EarlGrey/Core/GREYElementFinder.h", "src/EarlGrey/Core/GREYElementInteraction.h", - "src/EarlGrey/Matcher/GREYElementMatcherBlock.h", + "src/EarlGrey/Core/GREYInteraction.h", + "src/EarlGrey/Core/GREYKeyboard.h", + "src/EarlGrey/EarlGrey.h", "src/EarlGrey/Exception/GREYFailureHandler.h", "src/EarlGrey/Exception/GREYFrameworkException.h", - "src/EarlGrey/AppSupport/GREYIdlingResource.h", - "src/EarlGrey/Core/GREYInteraction.h", + "src/EarlGrey/Matcher/GREYAllOf.h", + "src/EarlGrey/Matcher/GREYAnyOf.h", + "src/EarlGrey/Matcher/GREYBaseMatcher.h", + "src/EarlGrey/Matcher/GREYDescription.h", + "src/EarlGrey/Matcher/GREYElementMatcherBlock.h", "src/EarlGrey/Matcher/GREYLayoutConstraint.h", - "src/EarlGrey/Synchronization/GREYManagedObjectContextIdlingResource.h", "src/EarlGrey/Matcher/GREYMatcher.h", "src/EarlGrey/Matcher/GREYMatchers.h", - "src/EarlGrey/Synchronization/GREYNSTimerIdlingResource.h", "src/EarlGrey/Matcher/GREYNot.h", - "src/EarlGrey/Synchronization/GREYOperationQueueIdlingResource.h", + "src/EarlGrey/Provider/GREYDataEnumerator.h", "src/EarlGrey/Provider/GREYProvider.h", - "src/EarlGrey/Common/GREYScreenshotUtil.h", - "src/EarlGrey/Action/GREYScrollActionError.h", + "src/EarlGrey/Synchronization/GREYCondition.h", + "src/EarlGrey/Synchronization/GREYDispatchQueueIdlingResource.h", + "src/EarlGrey/Synchronization/GREYManagedObjectContextIdlingResource.h", + "src/EarlGrey/Synchronization/GREYNSTimerIdlingResource.h", + "src/EarlGrey/Synchronization/GREYOperationQueueIdlingResource.h", "src/EarlGrey/Synchronization/GREYSyncAPI.h", - "src/EarlGrey/Common/GREYTestHelper.h", "src/EarlGrey/Synchronization/GREYUIThreadExecutor.h", ] deps = [ diff --git a/chromium/ios/third_party/earl_grey/ios_eg_test.gni b/chromium/ios/third_party/earl_grey/ios_eg_test.gni index 39d21029af8..048d84a7e2e 100644 --- a/chromium/ios/third_party/earl_grey/ios_eg_test.gni +++ b/chromium/ios/third_party/earl_grey/ios_eg_test.gni @@ -3,6 +3,7 @@ # found in the LICENSE file. import("//build/config/ios/rules.gni") +import("//ios/third_party/firebase/firebase.gni") # EarlGrey tests are just XCTests that also depends on EarlGrey. template("ios_eg_test") { @@ -15,6 +16,12 @@ template("ios_eg_test") { "//ios/third_party/earl_grey:earl_grey+bundle", "//ios/third_party/ochamcrest:ochamcrest+bundle", ] + if (ios_enable_firebase_sdk) { + assert(ios_firebase_resources_target != "", + "ios_firebase_resources_target must be defined if Firebase SDK " + + "is enabled.") + bundle_deps += [ ios_firebase_resources_target ] + } if (!defined(deps)) { deps = [] } diff --git a/chromium/ios/third_party/earl_grey2/BUILD.gn b/chromium/ios/third_party/earl_grey2/BUILD.gn new file mode 100644 index 00000000000..bb9de38681d --- /dev/null +++ b/chromium/ios/third_party/earl_grey2/BUILD.gn @@ -0,0 +1,138 @@ +import("//build/config/ios/ios_sdk.gni") +import("//build/config/ios/rules.gni") + +config("config") { + include_dirs = [ "//ios/third_party/earl_grey2/src/EarlGreyApp/EarlGreyApp.h" ] +} + +source_set("eg2") { + testonly = true + + sources = [ + "src/AppFramework/Action/GREYAction.h", + "src/AppFramework/Action/GREYActionBlock.h", + "src/AppFramework/Action/GREYActionBlock.m", + "src/AppFramework/Action/GREYActions+Internal.h", + "src/AppFramework/Action/GREYActions.h", + "src/AppFramework/Action/GREYActions.mm", + "src/AppFramework/Action/GREYBaseAction.h", + "src/AppFramework/Action/GREYBaseAction.m", + "src/AppFramework/Action/GREYChangeStepperAction.h", + "src/AppFramework/Action/GREYChangeStepperAction.m", + "src/AppFramework/Action/GREYMultiFingerSwipeAction.h", + "src/AppFramework/Action/GREYMultiFingerSwipeAction.m", + "src/AppFramework/Action/GREYPathGestureUtils.h", + "src/AppFramework/Action/GREYPathGestureUtils.m", + "src/AppFramework/Action/GREYPickerAction.h", + "src/AppFramework/Action/GREYPickerAction.m", + "src/AppFramework/Action/GREYPinchAction.h", + "src/AppFramework/Action/GREYPinchAction.m", + "src/AppFramework/Action/GREYScrollAction.h", + "src/AppFramework/Action/GREYScrollAction.m", + "src/AppFramework/Action/GREYScrollToContentEdgeAction.h", + "src/AppFramework/Action/GREYScrollToContentEdgeAction.m", + "src/AppFramework/Action/GREYSlideAction.h", + "src/AppFramework/Action/GREYSlideAction.m", + "src/AppFramework/Action/GREYSwipeAction.h", + "src/AppFramework/Action/GREYSwipeAction.m", + "src/AppFramework/Action/GREYTapAction.h", + "src/AppFramework/Action/GREYTapAction.m", + "src/AppFramework/Action/GREYTapper.h", + "src/AppFramework/Action/GREYTapper.m", + "src/AppFramework/Assertion/GREYAssertion.h", + "src/AppFramework/Assertion/GREYAssertionBlock.h", + "src/AppFramework/Assertion/GREYAssertionBlock.m", + "src/AppFramework/Assertion/GREYAssertions.h", + "src/AppFramework/Assertion/GREYAssertions.m", + "src/AppFramework/AutomationSetup/GREYAutomationSetup.h", + "src/AppFramework/AutomationSetup/GREYAutomationSetup.m", + "src/AppFramework/Core/GREYElementFinder.h", + "src/AppFramework/Core/GREYElementFinder.m", + "src/AppFramework/Core/GREYElementInteraction.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", + "src/AppFramework/Delegate/GREYNSURLConnectionDelegate.h", + "src/AppFramework/Delegate/GREYNSURLConnectionDelegate.m", + "src/AppFramework/Delegate/GREYSurrogateDelegate.h", + "src/AppFramework/Delegate/GREYSurrogateDelegate.m", + "src/AppFramework/Delegate/GREYUIWebViewDelegate.h", + "src/AppFramework/Delegate/GREYUIWebViewDelegate.m", + "src/AppFramework/DistantObject/GREYHostApplicationDistantObject+GREYTestHelper.h", + "src/AppFramework/DistantObject/GREYHostApplicationDistantObject+GREYTestHelper.m", + "src/AppFramework/DistantObject/GREYHostApplicationDistantObject.m", + "src/AppFramework/DistantObject/GREYHostBackgroundDistantObject+GREYApp.h", + "src/AppFramework/DistantObject/GREYHostBackgroundDistantObject+GREYApp.m", + "src/AppFramework/DistantObject/GREYHostBackgroundDistantObject.m", + "src/AppFramework/DistantObject/GREYTestStub.m", + "src/AppFramework/EarlGreyV2/EarlGreyApp.h", + "src/AppFramework/Error/GREYAppFailureHandler.h", + "src/AppFramework/Error/GREYAppFailureHandler.m", + "src/AppFramework/Error/GREYFailureScreenshotter.h", + "src/AppFramework/Error/GREYFailureScreenshotter.m", + "src/AppFramework/Error/GREYFailureScreenshotterStub.m", + "src/AppFramework/Event/GREYIOHIDEventTypes.h", + "src/AppFramework/Event/GREYSyntheticEvents.h", + "src/AppFramework/Event/GREYSyntheticEvents.m", + "src/AppFramework/Event/GREYTouchInjector.h", + "src/AppFramework/Event/GREYTouchInjector.m", + "src/AppFramework/IdlingResources/GREYDispatchQueueIdlingResource.h", + "src/AppFramework/IdlingResources/GREYDispatchQueueIdlingResource.m", + "src/AppFramework/IdlingResources/GREYIdlingResource.h", + "src/AppFramework/IdlingResources/GREYManagedObjectContextIdlingResource.h", + "src/AppFramework/IdlingResources/GREYManagedObjectContextIdlingResource.m", + "src/AppFramework/IdlingResources/GREYNSTimerIdlingResource.h", + "src/AppFramework/IdlingResources/GREYNSTimerIdlingResource.m", + "src/AppFramework/IdlingResources/GREYOperationQueueIdlingResource.h", + "src/AppFramework/IdlingResources/GREYOperationQueueIdlingResource.m", + "src/AppFramework/IdlingResources/GREYTimedIdlingResource.h", + "src/AppFramework/IdlingResources/GREYTimedIdlingResource.m", + "src/AppFramework/IdlingResources/GREYUIWebViewIdlingResource.h", + "src/AppFramework/IdlingResources/GREYUIWebViewIdlingResource.m", + "src/AppFramework/Keyboard/GREYKeyboard.h, + "src/AppFramework/Keyboard/GREYKeyboard.m, + "src/AppFramework/Matcher/GREYAllOf.h, + "src/AppFramework/Matcher/GREYAllOf.m, + "src/AppFramework/Matcher/GREYAnyOf.h, + "src/AppFramework/Matcher/GREYAnyOf.m, + "src/AppFramework/Matcher/GREYBaseMatcher.h, + "src/AppFramework/Matcher/GREYBaseMatcher.m, + "src/AppFramework/Matcher/GREYElementMatcherBlock.h, + "src/AppFramework/Matcher/GREYElementMatcherBlock.m, + "src/AppFramework/Matcher/GREYMatchers.h, + "src/AppFramework/Matcher/GREYMatchers.m, + "src/AppFramework/Matcher/GREYMatchersShorthand.h, + "src/AppFramework/Matcher/GREYMatchersShorthand.m, + "src/AppFramework/Matcher/GREYNot.h, + "src/AppFramework/Matcher/GREYNot.m, + "src/AppFramework/Synchronization/GREYAppStateTracker.h, + "src/AppFramework/Synchronization/GREYAppStateTracker.m, + "src/AppFramework/Synchronization/GREYAppStateTrackerObject.h, + "src/AppFramework/Synchronization/GREYAppStateTrackerObject.m, + "src/AppFramework/Synchronization/GREYDispatchQueueTracker.h, + "src/AppFramework/Synchronization/GREYDispatchQueueTracker.m., + "src/AppFramework/Synchronization/GREYObjectDeallocationTracker.h, + "src/AppFramework/Synchronization/GREYObjectDeallocationTracker.m, + "src/AppFramework/Synchronization/GREYRunLoopSpinner.h, + "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.h, + "src/AppFramework/Synchronization/GREYUIThreadExecutor.m, + ] + + public_configs = [ ":config" ] + + configs -= [ + "//build/config/gcc:symbol_visibility_hidden", + "//build/config/compiler:chromium_code", + ] + configs += [ + "//build/config/compiler:no_chromium_code", + "//build/config/compiler:enable_arc", + "//build/config/gcc:symbol_visibility_default", + ] +} diff --git a/chromium/ios/third_party/firebase/BUILD.gn b/chromium/ios/third_party/firebase/BUILD.gn index 5b68744faa3..9fa73ea22ed 100644 --- a/chromium/ios/third_party/firebase/BUILD.gn +++ b/chromium/ios/third_party/firebase/BUILD.gn @@ -2,13 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//ios/third_party/firebase/firebase.gni") - source_set("firebase") { - assert( - ios_firebase_resources_target != "", - "ios_firebase_resources_target must be defined if Firebase SDK is enabled.") - # From gn documentation: # https://chromium.googlesource.com/chromium/src/+/master/tools/gn/docs/reference.md#ldflags # "ldflags are NOT pushed to dependents, so applying ldflags to source sets @@ -19,9 +13,6 @@ source_set("firebase") { # This source_set must be specified as a direct deps of an ios_app_bundle # target for ldflags specified in :firebase_config to be applied. public_configs = [ ":firebase_config" ] - deps = [ - ios_firebase_resources_target, - ] } config("firebase_config") { @@ -35,7 +26,8 @@ config("firebase_config") { "FirebaseCore.framework", "FirebaseCoreDiagnostics.framework", "FirebaseInstanceID.framework", - "FirebaseNanoPB.framework", + "GoogleAppMeasurement.framework", + "GoogleUtilities.framework", "nanopb.framework", ] } diff --git a/chromium/ios/third_party/material_components_ios/BUILD.gn b/chromium/ios/third_party/material_components_ios/BUILD.gn index b60c6680f11..ee525a4c70d 100644 --- a/chromium/ios/third_party/material_components_ios/BUILD.gn +++ b/chromium/ios/third_party/material_components_ios/BUILD.gn @@ -8,7 +8,9 @@ config("config") { visibility = [ ":material_components_ios" ] include_dirs = [ "src/components/ActivityIndicator/src", + "src/components/Buttons/src/ShapeThemer", "src/components/AppBar/src", + "src/components/private/ShapeLibrary/src", "src/components/ButtonBar/src", "src/components/Buttons/src", "src/components/CollectionCells/src", @@ -30,6 +32,7 @@ config("config") { "src/components/private/Shapes/src/", "src/components/private/UIMetrics/src", "src/components/schemes/Color/src", + "src/components/schemes/Shape/src", "src/components/schemes/Typography/src", ] } @@ -67,12 +70,19 @@ source_set("material_components_ios") { "src/components/AnimationTiming/src/MaterialAnimationTiming.h", "src/components/AnimationTiming/src/UIView+MDCTimingFunction.h", "src/components/AnimationTiming/src/UIView+MDCTimingFunction.m", + "src/components/AppBar/src/ColorThemer/MDCAppBarColorThemer.h", + "src/components/AppBar/src/ColorThemer/MDCAppBarColorThemer.m", + "src/components/AppBar/src/ColorThemer/MaterialAppBar+ColorThemer.h", "src/components/AppBar/src/MDCAppBar.h", "src/components/AppBar/src/MDCAppBarContainerViewController.h", "src/components/AppBar/src/MDCAppBarContainerViewController.m", + "src/components/AppBar/src/MDCAppBarNavigationController.h", + "src/components/AppBar/src/MDCAppBarNavigationController.m", "src/components/AppBar/src/MDCAppBarViewController.h", "src/components/AppBar/src/MDCAppBarViewController.m", "src/components/AppBar/src/MaterialAppBar.h", + "src/components/AppBar/src/private/MaterialAppBarStrings.h", + "src/components/AppBar/src/private/MaterialAppBarStrings_table.h", "src/components/BottomSheet/src/MDCBottomSheetController.h", "src/components/BottomSheet/src/MDCBottomSheetController.m", "src/components/BottomSheet/src/MDCBottomSheetPresentationController.h", @@ -113,6 +123,11 @@ source_set("material_components_ios") { "src/components/Buttons/src/MDCRaisedButton.h", "src/components/Buttons/src/MDCRaisedButton.m", "src/components/Buttons/src/MaterialButtons.h", + "src/components/Buttons/src/ShapeThemer/MDCButtonShapeThemer.h", + "src/components/Buttons/src/ShapeThemer/MDCButtonShapeThemer.m", + "src/components/Buttons/src/ShapeThemer/MDCFloatingButtonShapeThemer.h", + "src/components/Buttons/src/ShapeThemer/MDCFloatingButtonShapeThemer.m", + "src/components/Buttons/src/ShapeThemer/MaterialButtons+ShapeThemer.h", "src/components/Buttons/src/TypographyThemer/MDCButtonTypographyThemer.h", "src/components/Buttons/src/TypographyThemer/MDCButtonTypographyThemer.m", "src/components/Buttons/src/private/MDCButton+Subclassing.h", @@ -163,6 +178,9 @@ source_set("material_components_ios") { "src/components/Dialogs/src/private/MDCDialogShadowedView.m", "src/components/Dialogs/src/private/MaterialDialogsStrings.h", "src/components/Dialogs/src/private/MaterialDialogsStrings_table.h", + "src/components/FlexibleHeader/src/ColorThemer/MDCFlexibleHeaderColorThemer.h", + "src/components/FlexibleHeader/src/ColorThemer/MDCFlexibleHeaderColorThemer.m", + "src/components/FlexibleHeader/src/ColorThemer/MaterialFlexibleHeader+ColorThemer.h", "src/components/FlexibleHeader/src/MDCFlexibleHeaderContainerViewController.h", "src/components/FlexibleHeader/src/MDCFlexibleHeaderContainerViewController.m", "src/components/FlexibleHeader/src/MDCFlexibleHeaderView.h", @@ -170,6 +188,8 @@ source_set("material_components_ios") { "src/components/FlexibleHeader/src/MDCFlexibleHeaderViewController.h", "src/components/FlexibleHeader/src/MDCFlexibleHeaderViewController.m", "src/components/FlexibleHeader/src/MaterialFlexibleHeader.h", + "src/components/FlexibleHeader/src/private/MDCFlexibleHeaderTopSafeArea.h", + "src/components/FlexibleHeader/src/private/MDCFlexibleHeaderTopSafeArea.m", "src/components/FlexibleHeader/src/private/MDCStatusBarShifter.h", "src/components/FlexibleHeader/src/private/MDCStatusBarShifter.m", "src/components/HeaderStackView/src/MDCHeaderStackView.h", @@ -189,6 +209,9 @@ source_set("material_components_ios") { "src/components/Ink/src/private/MDCLegacyInkLayer+Testing.h", "src/components/Ink/src/private/MDCLegacyInkLayer.h", "src/components/Ink/src/private/MDCLegacyInkLayer.m", + "src/components/NavigationBar/src/ColorThemer/MDCNavigationBarColorThemer.h", + "src/components/NavigationBar/src/ColorThemer/MDCNavigationBarColorThemer.m", + "src/components/NavigationBar/src/ColorThemer/MaterialNavigationBar+ColorThemer.h", "src/components/NavigationBar/src/MDCNavigationBar.h", "src/components/NavigationBar/src/MDCNavigationBar.m", "src/components/NavigationBar/src/MaterialNavigationBar.h", @@ -275,6 +298,14 @@ source_set("material_components_ios") { "src/components/private/Overlay/src/private/MDCOverlayObserverTransition.m", "src/components/private/Overlay/src/private/MDCOverlayUtilities.h", "src/components/private/Overlay/src/private/MDCOverlayUtilities.m", + "src/components/private/Shapes/src/MDCCornerTreatment.h", + "src/components/private/Shapes/src/MDCCornerTreatment.m", + "src/components/private/Shapes/src/MDCEdgeTreatment.h", + "src/components/private/Shapes/src/MDCEdgeTreatment.m", + "src/components/private/Shapes/src/MDCPathGenerator.h", + "src/components/private/Shapes/src/MDCPathGenerator.m", + "src/components/private/Shapes/src/MDCRectangleShapeGenerator.h", + "src/components/private/Shapes/src/MDCRectangleShapeGenerator.m", "src/components/private/Shapes/src/MDCShapedShadowLayer.h", "src/components/private/Shapes/src/MDCShapedShadowLayer.m", "src/components/private/Shapes/src/MDCShapedView.h", @@ -299,6 +330,10 @@ source_set("material_components_ios") { "src/components/schemes/Color/src/MDCSemanticColorScheme.h", "src/components/schemes/Color/src/MDCSemanticColorScheme.m", "src/components/schemes/Color/src/MaterialColorScheme.h", + "src/components/schemes/Shape/src/MDCShapeCategory.h", + "src/components/schemes/Shape/src/MDCShapeCategory.m", + "src/components/schemes/Shape/src/MDCShapeScheme.h", + "src/components/schemes/Shape/src/MDCShapeScheme.m", "src/components/schemes/Typography/src/MDCLegacyFontScheme.h", "src/components/schemes/Typography/src/MDCLegacyFontScheme.m", "src/components/schemes/Typography/src/MDCTypographyScheme.h", @@ -309,12 +344,16 @@ source_set("material_components_ios") { "src/components/ActivityIndicator/src", "src/components/AnimationTiming/src", "src/components/AppBar/src", + "src/components/AppBar/src/ColorThemer", "src/components/BottomSheet/src", "src/components/ButtonBar/src", "src/components/Buttons/src/ButtonThemer", "src/components/Buttons/src/ColorThemer", "src/components/Buttons/src/TypographyThemer", + "src/components/FlexibleHeader/src", + "src/components/FlexibleHeader/src/ColorThemer", "src/components/NavigationBar/src", + "src/components/NavigationBar/src/ColorThemer", "src/components/OverlayWindow/src", "src/components/private/Math/src", "src/components/private/Application/src", @@ -376,6 +415,16 @@ source_set("material_components_ios") { _locales = [ "en" ] foreach(locale, _locales) { + bundle_data("material_app_bar_bundle_$locale") { + visibility = [ ":material_app_bar_bundle" ] + sources = [ + "src/components/AppBar/src/MaterialAppBar.bundle/Resources/$locale.lproj/MaterialAppBar.strings", + ] + outputs = [ + "{{bundle_resources_dir}}/MaterialAppBar.bundle/Resources/$locale.lproj/{{source_file_part}}", + ] + } + bundle_data("material_collections_bundle_$locale") { visibility = [ ":material_collections_bundle" ] sources = [ diff --git a/chromium/ios/web/BUILD.gn b/chromium/ios/web/BUILD.gn index fa431352c9c..f8715af71d4 100644 --- a/chromium/ios/web/BUILD.gn +++ b/chromium/ios/web/BUILD.gn @@ -405,6 +405,7 @@ source_set("ios_web_web_state_unittests") { "web_state/session_certificate_policy_cache_impl_unittest.mm", "web_state/session_certificate_policy_cache_storage_builder_unittest.mm", "web_state/web_frame_impl_unittest.mm", + "web_state/web_frame_util_unittest.mm", "web_state/web_frames_manager_impl_unittest.mm", "web_state/web_state_delegate_bridge_unittest.mm", "web_state/web_state_impl_unittest.mm", @@ -452,7 +453,7 @@ source_set("ios_web_web_state_js_unittests") { "web_state/js/crw_js_injection_manager_unittest.mm", "web_state/js/crw_js_post_request_loader_unittest.mm", "web_state/js/crw_js_window_id_manager_unittest.mm", - "web_state/js/frame_messaging_js_unittest.mm", + "web_state/js/message_js_unittest.mm", "web_state/js/page_script_util_unittest.mm", ] } @@ -528,6 +529,7 @@ source_set("ios_web_webui_unittests") { "//ios/web/test:test_constants", "//ios/web/test:test_support", "//net:test_support", + "//services/network:test_support", "//services/service_manager/public/cpp", "//testing/gmock", "//testing/gtest", @@ -580,6 +582,8 @@ test("ios_web_inttests") { "web_state/error_page_inttest.mm", "web_state/favicon_callbacks_inttest.mm", "web_state/http_auth_inttest.mm", + "web_state/web_frame_impl_inttest.mm", + "web_state/web_frame_web_state_observer_inttest.mm", "web_state/web_frames_manager_inttest.mm", "web_state/web_state_observer_inttest.mm", "webui/web_ui_mojo_inttest.mm", @@ -625,7 +629,6 @@ js_compile_bundle("all_frames_web_bundle") { "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/frame_messaging.js", "web_state/js/resources/message.js", ] } diff --git a/chromium/ios/web/js_compile.gni b/chromium/ios/web/js_compile.gni index 9fd25b1ea1e..83bcc0b7dd7 100644 --- a/chromium/ios/web/js_compile.gni +++ b/chromium/ios/web/js_compile.gni @@ -122,7 +122,6 @@ 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/frame_messaging.js", "//ios/web/web_state/js/resources/message.js", ] if (defined(invoker.js_modules)) { diff --git a/chromium/ios/web/public/BUILD.gn b/chromium/ios/web/public/BUILD.gn index 65cce83225d..22c482a0906 100644 --- a/chromium/ios/web/public/BUILD.gn +++ b/chromium/ios/web/public/BUILD.gn @@ -60,12 +60,9 @@ source_set("public") { "url_schemes.h", "url_schemes.mm", "url_util.h", - "web_capabilities.cc", - "web_capabilities.h", "web_client.h", "web_kit_constants.h", "web_state/context_menu_params.h", - "web_state/form_activity_params.h", "web_state/global_web_state_observer.h", "web_state/js/crw_js_injection_evaluator.h", "web_state/js/crw_js_injection_manager.h", @@ -85,6 +82,7 @@ source_set("public") { "web_state/url_verification_constants.h", "web_state/web_frame.h", "web_state/web_frame_user_data.h", + "web_state/web_frame_util.h", "web_state/web_frames_manager.h", "web_state/web_state.h", "web_state/web_state_delegate.h", diff --git a/chromium/ios/web/public/test/fakes/BUILD.gn b/chromium/ios/web/public/test/fakes/BUILD.gn index 59ef2115680..baa2b5d39a8 100644 --- a/chromium/ios/web/public/test/fakes/BUILD.gn +++ b/chromium/ios/web/public/test/fakes/BUILD.gn @@ -11,6 +11,7 @@ source_set("fakes") { "//ios/web/public/download", "//ios/web/test:test_constants", "//ios/web/web_state:navigation_context", + "//ios/web/web_state:web_frame", "//ios/web/web_state/ui:crw_web_view_navigation_proxy", "//ios/web/web_state/ui:web_view_js_utils", "//ios/web/webui:webui", @@ -36,6 +37,8 @@ source_set("fakes") { "fake_download_task.mm", "fake_navigation_context.h", "fake_navigation_context.mm", + "fake_web_frame.cc", + "fake_web_frame.h", "test_browser_state.cc", "test_browser_state.h", "test_java_script_dialog_presenter.h", diff --git a/chromium/ios/web/web_state/BUILD.gn b/chromium/ios/web/web_state/BUILD.gn index ca6aed159c8..ccf460c7e29 100644 --- a/chromium/ios/web/web_state/BUILD.gn +++ b/chromium/ios/web/web_state/BUILD.gn @@ -103,6 +103,7 @@ source_set("error_translation_util") { deps = [ "//base", "//ios/net", + "//ios/web/public", "//net", ] @@ -158,7 +159,6 @@ source_set("context_menu") { "context_menu_params.mm", "context_menu_params_utils.h", "context_menu_params_utils.mm", - "form_activity_params.cc", ] configs += [ "//build/config/compiler:enable_arc" ] @@ -166,6 +166,7 @@ source_set("context_menu") { source_set("web_frame") { deps = [ + ":web_state_impl_header", "//base", "//crypto", "//ios/web/public", @@ -175,6 +176,7 @@ source_set("web_frame") { sources = [ "web_frame_impl.h", "web_frame_impl.mm", + "web_frame_util.mm", "web_frames_manager_impl.h", "web_frames_manager_impl.mm", ] diff --git a/chromium/ios/web/web_state/ui/BUILD.gn b/chromium/ios/web/web_state/ui/BUILD.gn index 142e016a149..1207c4b06af 100644 --- a/chromium/ios/web/web_state/ui/BUILD.gn +++ b/chromium/ios/web/web_state/ui/BUILD.gn @@ -65,6 +65,8 @@ source_set("ui") { source_set("crw_wk_script_message_router") { deps = [ "//base", + "//ios/web/navigation:core", + "//net", ] sources = [ diff --git a/chromium/ios/web_view/BUILD.gn b/chromium/ios/web_view/BUILD.gn index e5c44d9e324..59b6e434cdd 100644 --- a/chromium/ios/web_view/BUILD.gn +++ b/chromium/ios/web_view/BUILD.gn @@ -66,7 +66,13 @@ ios_web_view_public_headers = [ "public/cwv_web_view_configuration.h", ] if (ios_web_view_enable_sync) { - ios_web_view_public_headers += [ "public/cwv_identity.h" ] + ios_web_view_public_headers += [ + "public/cwv_identity.h", + "public/cwv_sync_controller.h", + "public/cwv_sync_controller_data_source.h", + "public/cwv_sync_controller_delegate.h", + "public/cwv_web_view_configuration_sync.h", + ] } if (ios_web_view_enable_autofill) { ios_web_view_public_headers += [ @@ -93,6 +99,8 @@ ios_web_view_sources = [ "internal/autofill/web_view_autofill_client_ios.mm", "internal/autofill/web_view_personal_data_manager_factory.cc", "internal/autofill/web_view_personal_data_manager_factory.h", + "internal/autofill/web_view_strike_database_factory.cc", + "internal/autofill/web_view_strike_database_factory.h", "internal/content_settings/web_view_cookie_settings_factory.cc", "internal/content_settings/web_view_cookie_settings_factory.h", "internal/content_settings/web_view_host_content_settings_map_factory.cc", @@ -205,7 +213,11 @@ ios_web_view_sources = [ ] ios_web_view_sources += ios_web_view_public_headers if (ios_web_view_enable_sync) { - ios_web_view_sources += [ "internal/signin/cwv_identity.mm" ] + ios_web_view_sources += [ + "internal/signin/cwv_identity.mm", + "internal/sync/cwv_sync_controller.mm", + "internal/sync/cwv_sync_controller_internal.h", + ] } if (ios_web_view_enable_autofill) { ios_web_view_sources += [ @@ -222,6 +234,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", ] } @@ -246,10 +260,11 @@ ios_web_view_deps = [ "//components/language/core/browser", "//components/language/core/common", "//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/common", - "//components/password_manager/sync/browser", + "//components/password_manager/ios", "//components/pref_registry", "//components/prefs", "//components/proxy_config", @@ -258,6 +273,7 @@ ios_web_view_deps = [ "//components/signin/ios/browser:active_state_manager", "//components/strings:components_strings_grit", "//components/sync", + "//components/sync_sessions", "//components/translate/core/browser", "//components/translate/core/common", "//components/translate/ios/browser", @@ -365,7 +381,9 @@ test("ios_web_view_unittests") { "internal/cwv_html_element_unittest.mm", "internal/cwv_preferences_unittest.mm", "internal/cwv_preview_element_info_unittest.mm", + "internal/cwv_scroll_view_unittest.mm", "internal/signin/cwv_identity_unittest.mm", + "internal/sync/cwv_sync_controller_unittest.mm", "internal/translate/cwv_translation_controller_unittest.mm", "internal/translate/cwv_translation_language_unittest.mm", "internal/translate/cwv_translation_policy_unittest.mm", @@ -381,7 +399,10 @@ test("ios_web_view_unittests") { "//components/autofill/core/browser:test_support", "//components/autofill/ios/browser:test_support", "//components/autofill/ios/form_util:test_support", + "//components/browser_sync:test_support", "//components/prefs:test_support", + "//components/signin/core/browser:test_support", + "//components/sync:test_support_driver", "//ios/web/public/test", "//ios/web/public/test/fakes", "//testing/gtest", @@ -412,8 +433,10 @@ js_compile_bundle("web_view_bundle") { closure_entry_point = "__crWeb.webViewBundle" sources = [ "//components/autofill/ios/browser/resources/autofill_controller.js", + "//components/autofill/ios/browser/resources/suggestion_controller.js", "//components/autofill/ios/form_util/resources/fill.js", "//components/autofill/ios/form_util/resources/form.js", + "//components/autofill/ios/form_util/resources/form_handlers.js", "//components/password_manager/ios/resources/password_controller.js", "resources/web_view_bundle.js", ] |