diff options
Diffstat (limited to 'chromium/ios/chrome/browser')
131 files changed, 1063 insertions, 400 deletions
diff --git a/chromium/ios/chrome/browser/BUILD.gn b/chromium/ios/chrome/browser/BUILD.gn index ae885c6a68d..d606b433ef7 100644 --- a/chromium/ios/chrome/browser/BUILD.gn +++ b/chromium/ios/chrome/browser/BUILD.gn @@ -217,12 +217,11 @@ source_set("browser_impl") { "//ios/chrome/browser/translate", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/update_client", - "//ios/chrome/browser/web_resource", "//ios/chrome/common", "//ios/chrome/common/app_group", "//ios/public/provider/chrome/browser", "//ios/web", - "//ios/web/public/app", + "//ios/web/public/init", "//net", "//rlz/buildflags", "//services/network:network_service", diff --git a/chromium/ios/chrome/browser/autofill/BUILD.gn b/chromium/ios/chrome/browser/autofill/BUILD.gn index 3bb6bbccee6..4a5844bdeae 100644 --- a/chromium/ios/chrome/browser/autofill/BUILD.gn +++ b/chromium/ios/chrome/browser/autofill/BUILD.gn @@ -25,8 +25,6 @@ source_set("autofill") { "form_suggestion_tab_helper.mm", "form_suggestion_view.h", "form_suggestion_view.mm", - "legacy_strike_database_factory.cc", - "legacy_strike_database_factory.h", "personal_data_manager_factory.cc", "personal_data_manager_factory.h", "strike_database_factory.cc", @@ -59,17 +57,21 @@ source_set("autofill") { "//components/autofill/ios/form_util", "//components/keyed_service/core", "//components/keyed_service/ios", + "//components/leveldb_proto", "//components/prefs", "//ios/chrome/app/strings", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/history", + "//ios/chrome/browser/leveldb_proto:factory", "//ios/chrome/browser/passwords:passwords_generation_utils", "//ios/chrome/browser/signin", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/autofill/manual_fill:manual_fill_ui", "//ios/chrome/browser/ui/image_util", - "//ios/web", + "//ios/chrome/browser/ui/util", + "//ios/chrome/common/ui_util", + "//ios/web/public/deprecated", + "//ios/web/public/js_messaging", "//third_party/leveldatabase", "//third_party/libaddressinput", "//ui/base", @@ -91,7 +93,7 @@ source_set("autofill_shared") { "//base", "//components/autofill/core/browser", "//components/autofill/ios/browser", - "//ios/chrome/browser/ui", + "//ios/chrome/browser/ui/util", ] libs = [ "UIKit.framework" ] } @@ -118,7 +120,6 @@ source_set("autofill_internal") { "//ios/chrome/browser/infobars", "//ios/chrome/browser/signin", "//ios/chrome/browser/ui/autofill", - "//ios/web", "//third_party/leveldatabase", "//ui/gfx/geometry", "//url", @@ -156,14 +157,15 @@ source_set("unit_tests") { "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/infobars", "//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/ui/util", "//ios/chrome/browser/web:test_support", "//ios/chrome/browser/web:web_internal", "//ios/chrome/test/base", - "//ios/web", + "//ios/web/public/deprecated", + "//ios/web/public/js_messaging", "//ios/web/public/test", "//testing/gtest", "//third_party/leveldatabase", @@ -504,12 +506,13 @@ source_set("eg_tests") { "//components/autofill/ios/browser:browser", "//ios/chrome/app/strings", "//ios/chrome/browser/autofill:autofill_shared", - "//ios/chrome/browser/ui", + "//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/deprecated", "//ios/web/public/test:element_selector", "//ios/web/public/test/http_server", ] diff --git a/chromium/ios/chrome/browser/autofill/automation/BUILD.gn b/chromium/ios/chrome/browser/autofill/automation/BUILD.gn index 4dd97d7fd00..4cc06b98c76 100644 --- a/chromium/ios/chrome/browser/autofill/automation/BUILD.gn +++ b/chromium/ios/chrome/browser/autofill/automation/BUILD.gn @@ -31,6 +31,7 @@ source_set("eg_tests") { "//ios/chrome/test/earl_grey:test_support", "//ios/testing/earl_grey:earl_grey_support", "//ios/web:earl_grey_test_support", + "//ios/web/public/js_messaging", "//ios/web/public/test:element_selector", "//ios/web/public/test/http_server:http_server", "//ui/base", diff --git a/chromium/ios/chrome/browser/browser_state/BUILD.gn b/chromium/ios/chrome/browser/browser_state/BUILD.gn index 9d8b2190c14..39a69107b77 100644 --- a/chromium/ios/chrome/browser/browser_state/BUILD.gn +++ b/chromium/ios/chrome/browser/browser_state/BUILD.gn @@ -22,6 +22,7 @@ source_set("browser_state") { "//components/sync_preferences", "//components/variations/net", "//ios/chrome/browser/net:net_types", + "//ios/web/public/webui", ] configs += [ "//build/config/compiler:enable_arc" ] @@ -119,7 +120,6 @@ source_set("browser_state_impl") { "//ios/net", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/signin", - "//ios/web", "//ios/web/net/cookies", "//net", "//net:extras", diff --git a/chromium/ios/chrome/browser/context_menu/BUILD.gn b/chromium/ios/chrome/browser/context_menu/BUILD.gn index 9be41b12639..835d1571949 100644 --- a/chromium/ios/chrome/browser/context_menu/BUILD.gn +++ b/chromium/ios/chrome/browser/context_menu/BUILD.gn @@ -13,7 +13,7 @@ source_set("eg_tests") { "//base/test:test_support", "//components/strings", "//ios/chrome/app/strings", - "//ios/chrome/browser/ui", + "//ios/chrome/browser/ui/util", "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", "//ios/public/provider/chrome/browser", diff --git a/chromium/ios/chrome/browser/crash_report/BUILD.gn b/chromium/ios/chrome/browser/crash_report/BUILD.gn index ac098033a05..1f29f88b3d4 100644 --- a/chromium/ios/chrome/browser/crash_report/BUILD.gn +++ b/chromium/ios/chrome/browser/crash_report/BUILD.gn @@ -60,7 +60,6 @@ source_set("crash_report_internal") { "//ios/chrome/browser/infobars", "//ios/chrome/browser/sessions", "//ios/chrome/browser/sessions:serialisation", - "//ios/chrome/browser/tabs", "//ios/chrome/browser/web:tab_id_tab_helper", "//ios/chrome/browser/web_state_list", "//ios/web", diff --git a/chromium/ios/chrome/browser/device_sharing/BUILD.gn b/chromium/ios/chrome/browser/device_sharing/BUILD.gn index 0e6c6251b69..fbfb9b68853 100644 --- a/chromium/ios/chrome/browser/device_sharing/BUILD.gn +++ b/chromium/ios/chrome/browser/device_sharing/BUILD.gn @@ -47,7 +47,7 @@ source_set("eg_tests") { deps = [ ":device_sharing", "//components/handoff", - "//ios/chrome/browser/ui", + "//ios/chrome/browser/ui/util", "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", "//ios/third_party/earl_grey:earl_grey+link", diff --git a/chromium/ios/chrome/browser/find_in_page/BUILD.gn b/chromium/ios/chrome/browser/find_in_page/BUILD.gn index be428735899..a258b727c94 100644 --- a/chromium/ios/chrome/browser/find_in_page/BUILD.gn +++ b/chromium/ios/chrome/browser/find_in_page/BUILD.gn @@ -23,8 +23,8 @@ source_set("find_in_page") { "//base", "//ios/chrome/browser/metrics:ukm_url_recorder", "//ios/chrome/browser/web", - "//ios/web", "//ios/web/public", + "//ios/web/public/deprecated", "//ios/web/public/find_in_page", "//services/metrics/public/cpp:ukm_builders", ] @@ -69,7 +69,7 @@ source_set("unit_tests") { "//ios/chrome/browser/metrics:ukm_url_recorder", "//ios/chrome/browser/web:test_support", "//ios/chrome/browser/web:web_internal", - "//ios/web", + "//ios/web/public/deprecated", "//ios/web/public/test", "//ios/web/public/test/fakes", "//testing/gtest", diff --git a/chromium/ios/chrome/browser/infobars/BUILD.gn b/chromium/ios/chrome/browser/infobars/BUILD.gn index e7cdd228d71..78fd90d8ac8 100644 --- a/chromium/ios/chrome/browser/infobars/BUILD.gn +++ b/chromium/ios/chrome/browser/infobars/BUILD.gn @@ -43,6 +43,7 @@ source_set("badge") { ] deps = [ ":infobars", + ":public", "//ios/chrome/browser/ui/infobars:feature_flags", "//ios/chrome/browser/ui/infobars:infobars_ui", "//ios/web", @@ -53,6 +54,12 @@ source_set("public") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ "infobar_controller_delegate.h", + "infobar_metrics_recorder.h", + "infobar_metrics_recorder.mm", + "infobar_type.h", + ] + deps = [ + "//base", ] } @@ -67,6 +74,7 @@ source_set("unit_tests") { ":infobars", "//base/test:test_support", "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/infobars:public", "//ios/chrome/browser/ui/infobars:feature_flags", "//ios/chrome/browser/ui/infobars:infobars_ui", "//ios/chrome/browser/ui/infobars:test_support", diff --git a/chromium/ios/chrome/browser/interstitials/BUILD.gn b/chromium/ios/chrome/browser/interstitials/BUILD.gn index a3bc4544144..cb25fb7f9d7 100644 --- a/chromium/ios/chrome/browser/interstitials/BUILD.gn +++ b/chromium/ios/chrome/browser/interstitials/BUILD.gn @@ -26,6 +26,7 @@ source_set("interstitials") { "//ios/chrome/browser/ui/util", "//ios/web", "//ios/web/public", + "//ios/web/public/security", "//ui/base", "//url", ] diff --git a/chromium/ios/chrome/browser/invalidation/BUILD.gn b/chromium/ios/chrome/browser/invalidation/BUILD.gn index bb0eec8132b..c416184b907 100644 --- a/chromium/ios/chrome/browser/invalidation/BUILD.gn +++ b/chromium/ios/chrome/browser/invalidation/BUILD.gn @@ -14,7 +14,6 @@ source_set("invalidation") { "//base", "//components/gcm_driver", "//components/invalidation/impl", - "//components/invalidation/impl:json_unsafe_parser", "//components/keyed_service/ios", "//components/pref_registry", "//components/prefs", @@ -22,6 +21,7 @@ source_set("invalidation") { "//ios/chrome/browser/browser_state", "//ios/chrome/browser/gcm", "//ios/chrome/browser/gcm/instance_id", + "//ios/chrome/browser/json_parser", "//ios/chrome/browser/signin", "//ios/web", "//net", diff --git a/chromium/ios/chrome/browser/web_resource/BUILD.gn b/chromium/ios/chrome/browser/json_parser/BUILD.gn index 352de82d228..666b01da120 100644 --- a/chromium/ios/chrome/browser/web_resource/BUILD.gn +++ b/chromium/ios/chrome/browser/json_parser/BUILD.gn @@ -1,29 +1,26 @@ -# Copyright 2016 The Chromium Authors. All rights reserved. +# Copyright 2019 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -source_set("web_resource") { +source_set("json_parser") { sources = [ - "web_resource_util.cc", - "web_resource_util.h", + "in_process_json_parser.cc", + "in_process_json_parser.h", ] - deps = [ + public_deps = [ "//base", - "//components/web_resource", - "//ios/web", ] } source_set("unit_tests") { testonly = true sources = [ - "web_resource_util_unittest.cc", + "in_process_json_parser_unittest.cc", ] deps = [ - ":web_resource", + ":json_parser", "//base", "//base/test:test_support", - "//ios/web", "//testing/gtest", ] } diff --git a/chromium/ios/chrome/browser/main/BUILD.gn b/chromium/ios/chrome/browser/main/BUILD.gn index 297d7781d79..6677eab36cc 100644 --- a/chromium/ios/chrome/browser/main/BUILD.gn +++ b/chromium/ios/chrome/browser/main/BUILD.gn @@ -7,6 +7,7 @@ source_set("main") { "browser.h", "browser_impl.h", "browser_impl.mm", + "browser_observer.h", ] deps = [ "//base", @@ -21,6 +22,8 @@ source_set("main") { source_set("test_support") { testonly = true sources = [ + "fake_browser_observer.h", + "fake_browser_observer.mm", "test_browser.h", "test_browser.mm", ] @@ -46,6 +49,7 @@ source_set("unit_tests") { "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/tabs", "//ios/chrome/browser/web_state_list", + "//ios/chrome/browser/web_state_list:test_support", "//ios/web/public/test", "//testing/gtest", "//third_party/ocmock", diff --git a/chromium/ios/chrome/browser/memory/BUILD.gn b/chromium/ios/chrome/browser/memory/BUILD.gn index 0673e33a099..e11599cc30a 100644 --- a/chromium/ios/chrome/browser/memory/BUILD.gn +++ b/chromium/ios/chrome/browser/memory/BUILD.gn @@ -16,6 +16,6 @@ source_set("memory") { "//base", "//components/prefs", "//ios/chrome/browser", - "//ios/chrome/browser/ui", + "//ios/chrome/browser/ui/util", ] } diff --git a/chromium/ios/chrome/browser/metrics/BUILD.gn b/chromium/ios/chrome/browser/metrics/BUILD.gn index c50555d35ad..75424c4c18f 100644 --- a/chromium/ios/chrome/browser/metrics/BUILD.gn +++ b/chromium/ios/chrome/browser/metrics/BUILD.gn @@ -18,6 +18,16 @@ source_set("ukm_url_recorder") { ] } +source_set("features") { + sources = [ + "features.cc", + "features.h", + ] + deps = [ + "//base", + ] +} + source_set("metrics") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ @@ -47,6 +57,7 @@ source_set("metrics") { ":ukm_url_recorder", ] deps = [ + ":features", "//base", "//components/browser_sync", "//components/crash/core/common", @@ -62,7 +73,7 @@ source_set("metrics") { "//components/rappor", "//components/signin/core/browser", "//components/sync", - "//components/sync:device_info", + "//components/sync_device_info", "//components/ukm", "//components/ukm:observers", "//components/variations", @@ -83,7 +94,7 @@ source_set("metrics") { "//ios/chrome/common", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/user", - "//ios/web", + "//ios/web/public/deprecated", "//url", ] } @@ -140,7 +151,7 @@ source_set("metrics_internal") { "//ios/chrome/browser/browser_state", "//ios/chrome/browser/prerender", "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui", + "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web_state_list", "//ios/web", "//ui/base", @@ -162,7 +173,7 @@ source_set("unit_tests_internal") { ":metrics_internal", "//base", "//base/test:test_support", - "//ios/chrome/browser/ui", + "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web_state_list", "//ios/chrome/browser/web_state_list:test_support", "//ios/testing:ocmock_support", @@ -191,12 +202,12 @@ source_set("eg_tests") { "//components/strings", "//components/ukm", "//components/ukm:test_support", + "//components/unified_consent:unified_consent", "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser", "//ios/chrome/browser/metrics", "//ios/chrome/browser/signin", "//ios/chrome/browser/sync", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/authentication", "//ios/chrome/browser/ui/authentication:eg_test_support", "//ios/chrome/browser/ui/authentication/cells", @@ -205,6 +216,7 @@ source_set("eg_tests") { "//ios/chrome/browser/ui/tab_grid:egtest_support", "//ios/chrome/browser/ui/toolbar/buttons", "//ios/chrome/browser/ui/toolbar/public", + "//ios/chrome/browser/ui/util", "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", "//ios/public/provider/chrome/browser/signin:test_support", @@ -229,10 +241,10 @@ source_set("test_support") { "//ios/chrome/app:app_internal", "//ios/chrome/app/strings", "//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/util", "//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/ntp/BUILD.gn b/chromium/ios/chrome/browser/ntp/BUILD.gn index 769e0da5a44..21508a350da 100644 --- a/chromium/ios/chrome/browser/ntp/BUILD.gn +++ b/chromium/ios/chrome/browser/ntp/BUILD.gn @@ -45,7 +45,6 @@ source_set("unit_tests") { "//ios/chrome/browser/ntp", "//ios/chrome/browser/ntp_snippets:ntp_snippets", "//ios/chrome/browser/search_engines:search_engines", - "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/web_state_list", "//ios/chrome/browser/web_state_list:test_support", "//ios/chrome/test:test_support", diff --git a/chromium/ios/chrome/browser/ntp_snippets/BUILD.gn b/chromium/ios/chrome/browser/ntp_snippets/BUILD.gn index 3aa15dd8770..928431f6176 100644 --- a/chromium/ios/chrome/browser/ntp_snippets/BUILD.gn +++ b/chromium/ios/chrome/browser/ntp_snippets/BUILD.gn @@ -27,6 +27,7 @@ source_set("ntp_snippets") { "//ios/chrome/browser/browser_state", "//ios/chrome/browser/favicon", "//ios/chrome/browser/history", + "//ios/chrome/browser/json_parser", "//ios/chrome/browser/leveldb_proto:factory", "//ios/chrome/browser/reading_list", "//ios/chrome/browser/signin", diff --git a/chromium/ios/chrome/browser/ntp_tiles/BUILD.gn b/chromium/ios/chrome/browser/ntp_tiles/BUILD.gn index a5622a3e5a7..d0f3ac6508d 100644 --- a/chromium/ios/chrome/browser/ntp_tiles/BUILD.gn +++ b/chromium/ios/chrome/browser/ntp_tiles/BUILD.gn @@ -19,11 +19,11 @@ source_set("ntp_tiles") { "//components/image_fetcher/ios", "//components/keyed_service/core", "//components/ntp_tiles", - "//components/ntp_tiles:json_unsafe_parser", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/favicon", "//ios/chrome/browser/history", + "//ios/chrome/browser/json_parser", "//ios/chrome/browser/search_engines", "//ios/chrome/browser/suggestions", "//ios/web", diff --git a/chromium/ios/chrome/browser/omaha/BUILD.gn b/chromium/ios/chrome/browser/omaha/BUILD.gn index becd3ec4c3b..6fcc9a09805 100644 --- a/chromium/ios/chrome/browser/omaha/BUILD.gn +++ b/chromium/ios/chrome/browser/omaha/BUILD.gn @@ -18,7 +18,7 @@ source_set("omaha") { "//ios/chrome/browser", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/browser_state_metrics", - "//ios/chrome/browser/ui", + "//ios/chrome/browser/ui/util", "//ios/chrome/browser/upgrade", "//ios/chrome/common", "//ios/public/provider/chrome/browser", diff --git a/chromium/ios/chrome/browser/overlays/BUILD.gn b/chromium/ios/chrome/browser/overlays/BUILD.gn index 155d2099c4f..51c035c3b74 100644 --- a/chromium/ios/chrome/browser/overlays/BUILD.gn +++ b/chromium/ios/chrome/browser/overlays/BUILD.gn @@ -3,39 +3,34 @@ # found in the LICENSE file. source_set("overlays") { - sources = [ - "overlay_request.h", - "overlay_request_queue.h", - "overlay_response.h", - "overlay_user_data.h", - ] - - configs += [ "//build/config/compiler:enable_arc" ] - - allow_circular_includes_from = [ ":internal" ] - - deps = [ - ":internal", - "//base", - "//ios/web/public", + public = [ + "public/overlay_dismissal_callback.h", + "public/overlay_modality.h", + "public/overlay_presenter.h", + "public/overlay_request.h", + "public/overlay_request_queue.h", + "public/overlay_response.h", + "public/overlay_user_data.h", ] -} - -source_set("internal") { sources = [ + "overlay_presenter_impl.h", + "overlay_presenter_impl.mm", "overlay_request_impl.cc", "overlay_request_impl.h", "overlay_request_queue_impl.h", "overlay_request_queue_impl.mm", - "overlay_request_queue_impl_observer.h", "overlay_response_impl.cc", "overlay_response_impl.h", ] configs += [ "//build/config/compiler:enable_arc" ] + friend = [ ":unit_tests" ] + deps = [ "//base", + "//ios/chrome/browser/main", + "//ios/chrome/browser/web_state_list", "//ios/web/public", ] } @@ -43,6 +38,8 @@ source_set("internal") { source_set("unit_tests") { testonly = true sources = [ + "overlay_presenter_impl_unittest.mm", + "overlay_request_impl_unittest.cc", "overlay_request_queue_impl_unittest.mm", "overlay_request_unittest.cc", "overlay_response_unittest.cc", @@ -51,11 +48,16 @@ source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] deps = [ - ":internal", ":overlays", "//base/test:test_support", + "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/main", + "//ios/chrome/browser/main:test_support", "//ios/chrome/browser/overlays/test", + "//ios/chrome/browser/web_state_list", + "//ios/chrome/browser/web_state_list:test_support", "//ios/web/public", + "//ios/web/public/test", "//ios/web/public/test/fakes", "//testing/gmock", "//testing/gtest", diff --git a/chromium/ios/chrome/browser/overlays/public/web_content_area/BUILD.gn b/chromium/ios/chrome/browser/overlays/public/web_content_area/BUILD.gn new file mode 100644 index 00000000000..df86fb05c5b --- /dev/null +++ b/chromium/ios/chrome/browser/overlays/public/web_content_area/BUILD.gn @@ -0,0 +1,24 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +source_set("web_content_area") { + sources = [ + "java_script_alert_overlay.h", + "java_script_alert_overlay.mm", + "java_script_confirmation_overlay.h", + "java_script_confirmation_overlay.mm", + "java_script_dialog_source.cc", + "java_script_dialog_source.h", + "java_script_prompt_overlay.h", + "java_script_prompt_overlay.mm", + ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + "//base", + "//ios/chrome/browser/overlays", + "//url", + ] +} diff --git a/chromium/ios/chrome/browser/overlays/test/BUILD.gn b/chromium/ios/chrome/browser/overlays/test/BUILD.gn index 851c72a2ad2..4c7a3ed9844 100644 --- a/chromium/ios/chrome/browser/overlays/test/BUILD.gn +++ b/chromium/ios/chrome/browser/overlays/test/BUILD.gn @@ -5,6 +5,8 @@ source_set("test") { testonly = true sources = [ + "fake_overlay_presenter_ui_delegate.cc", + "fake_overlay_presenter_ui_delegate.h", "fake_overlay_user_data.cc", "fake_overlay_user_data.h", ] diff --git a/chromium/ios/chrome/browser/passwords/BUILD.gn b/chromium/ios/chrome/browser/passwords/BUILD.gn index 5bd2ca1557c..1d90f1a5c05 100644 --- a/chromium/ios/chrome/browser/passwords/BUILD.gn +++ b/chromium/ios/chrome/browser/passwords/BUILD.gn @@ -17,8 +17,6 @@ source_set("passwords") { "ios_chrome_password_manager_driver.mm", "ios_chrome_password_store_factory.cc", "ios_chrome_password_store_factory.h", - "ios_chrome_save_password_infobar_delegate.h", - "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", @@ -42,7 +40,7 @@ source_set("passwords") { "update_password_infobar_controller.mm", ] deps = [ - ":public", + ":infobar_delegates", "//base", "//base:i18n", "//components/autofill/core/browser", @@ -70,23 +68,27 @@ source_set("passwords") { "//ios/chrome/browser", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/infobars", + "//ios/chrome/browser/infobars:public", "//ios/chrome/browser/metrics:ukm_url_recorder", "//ios/chrome/browser/signin", "//ios/chrome/browser/ssl", "//ios/chrome/browser/sync/glue", "//ios/chrome/browser/translate:translate", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/elements", "//ios/chrome/browser/ui/infobars:feature_flags", "//ios/chrome/browser/ui/infobars:infobars_ui", "//ios/chrome/browser/ui/infobars/coordinators", + "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web", + "//ios/chrome/common/ui_util", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/ui", "//ios/third_party/material_components_ios:material_components_ios", - "//ios/web", + "//ios/web/common", + "//ios/web/public/deprecated", + "//ios/web/public/js_messaging", "//net", "//third_party/material_design_icons:ic_account_circle", "//ui/base", @@ -100,22 +102,38 @@ source_set("passwords") { allow_circular_includes_from = [ ":passwords_generation_utils" ] } -source_set("public") { +source_set("infobar_delegates") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ "ios_chrome_password_manager_infobar_delegate.h", "ios_chrome_password_manager_infobar_delegate.mm", + "ios_chrome_save_password_infobar_delegate.h", + "ios_chrome_save_password_infobar_delegate.mm", ] deps = [ + ":public", "//base", "//components/infobars/core", "//components/password_manager/core/browser", + "//components/strings", "//ios/chrome/app/strings", "//ios/chrome/app/theme", + "//ios/chrome/browser/ui/infobars:feature_flags", "//ui/base", ] } +source_set("public") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "ios_chrome_password_infobar_metrics_recorder.h", + "ios_chrome_password_infobar_metrics_recorder.mm", + ] + deps = [ + "//base", + ] +} + source_set("feature_flags") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ @@ -135,7 +153,6 @@ source_set("passwords_generation_utils") { ] deps = [ "//base:i18n", - "//ios/chrome/browser/ui", ] libs = [ "CoreGraphics.framework" ] } @@ -167,6 +184,7 @@ source_set("unit_tests") { "//google_apis", "//ios/chrome/browser/autofill", "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/passwords/test", "//ios/chrome/browser/ssl", "//ios/chrome/browser/ui/autofill:autofill", "//ios/chrome/browser/ui/commands", @@ -174,6 +192,8 @@ source_set("unit_tests") { "//ios/chrome/browser/web:web_internal", "//ios/testing:ocmock_support", "//ios/web", + "//ios/web/public/js_messaging", + "//ios/web/public/security", "//ios/web/public/test", "//ios/web/public/test/fakes", "//net:test_support", diff --git a/chromium/ios/chrome/browser/passwords/test/BUILD.gn b/chromium/ios/chrome/browser/passwords/test/BUILD.gn new file mode 100644 index 00000000000..96843d1a590 --- /dev/null +++ b/chromium/ios/chrome/browser/passwords/test/BUILD.gn @@ -0,0 +1,21 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +source_set("test") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + + sources = [ + "test_password_manager_client.h", + "test_password_manager_client.mm", + ] + + deps = [ + "//components/password_manager/core/browser:test_support", + "//components/password_manager/core/common", + "//components/prefs", + "//components/prefs:test_support", + "//testing/gtest", + ] +} diff --git a/chromium/ios/chrome/browser/payments/BUILD.gn b/chromium/ios/chrome/browser/payments/BUILD.gn index 51231dc3413..9b329be70f3 100644 --- a/chromium/ios/chrome/browser/payments/BUILD.gn +++ b/chromium/ios/chrome/browser/payments/BUILD.gn @@ -47,6 +47,7 @@ source_set("payments") { "//ios/chrome/browser/metrics", "//ios/chrome/browser/signin", "//ios/web", + "//ios/web/public/security", "//net", "//services/identity/public/cpp:cpp", "//ui/base", diff --git a/chromium/ios/chrome/browser/prerender/BUILD.gn b/chromium/ios/chrome/browser/prerender/BUILD.gn index 88ce54b4592..9cb0c20fef9 100644 --- a/chromium/ios/chrome/browser/prerender/BUILD.gn +++ b/chromium/ios/chrome/browser/prerender/BUILD.gn @@ -32,11 +32,10 @@ source_set("prerender") { "//ios/chrome/browser/sessions:serialisation", "//ios/chrome/browser/signin", "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/ntp:util", "//ios/chrome/browser/web", "//ios/chrome/browser/web_state_list", - "//ios/web", + "//ios/web/public/deprecated", "//ui/base", "//url", ] diff --git a/chromium/ios/chrome/browser/providers/signin/BUILD.gn b/chromium/ios/chrome/browser/providers/signin/BUILD.gn index d7427bd0c28..2b7303f3495 100644 --- a/chromium/ios/chrome/browser/providers/signin/BUILD.gn +++ b/chromium/ios/chrome/browser/providers/signin/BUILD.gn @@ -9,7 +9,7 @@ source_set("signin") { ] deps = [ "//base", - "//ios/chrome/browser/ui", + "//ios/chrome/browser/ui/util", "//ios/public/provider/chrome/browser/signin", ] libs = [ "UIKit.framework" ] diff --git a/chromium/ios/chrome/browser/reading_list/BUILD.gn b/chromium/ios/chrome/browser/reading_list/BUILD.gn index 2237330a250..034b4fc3cd4 100644 --- a/chromium/ios/chrome/browser/reading_list/BUILD.gn +++ b/chromium/ios/chrome/browser/reading_list/BUILD.gn @@ -46,8 +46,9 @@ source_set("reading_list") { "//ios/chrome/browser/favicon", "//ios/chrome/browser/history", "//ios/chrome/common", - "//ios/web", "//ios/web/public", + "//ios/web/public/deprecated", + "//ios/web/public/security", "//net", "//ui/base", "//url", diff --git a/chromium/ios/chrome/browser/send_tab_to_self/BUILD.gn b/chromium/ios/chrome/browser/send_tab_to_self/BUILD.gn index 2da9c1066c3..25d9dd02c6c 100644 --- a/chromium/ios/chrome/browser/send_tab_to_self/BUILD.gn +++ b/chromium/ios/chrome/browser/send_tab_to_self/BUILD.gn @@ -11,6 +11,8 @@ source_set("send_tab_to_self") { "send_tab_to_self_client_service_factory.mm", "send_tab_to_self_client_service_ios.h", "send_tab_to_self_client_service_ios.mm", + "send_tab_to_self_util.h", + "send_tab_to_self_util.mm", ] deps = [ "//base", @@ -19,6 +21,7 @@ source_set("send_tab_to_self") { "//components/keyed_service/ios", "//components/send_tab_to_self", "//components/sync", + "//components/sync_device_info", "//ios/chrome/app/strings", "//ios/chrome/app/theme:theme_grit", "//ios/chrome/browser", @@ -27,6 +30,7 @@ source_set("send_tab_to_self") { "//ios/chrome/browser/infobars:public", "//ios/chrome/browser/sync", "//ios/chrome/browser/tabs", + "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/infobars:infobars_ui", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web_state_list", @@ -36,3 +40,25 @@ source_set("send_tab_to_self") { "//ui/strings:ui_strings_grit", ] } + +source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ + "send_tab_to_self_util_unittest.mm", + ] + deps = [ + ":send_tab_to_self", + "//base", + "//base/test:test_support", + "//components/send_tab_to_self", + "//components/send_tab_to_self:test_support", + "//components/sync", + "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/sync", + "//ios/chrome/browser/sync:test_support", + "//testing/gtest", + "//third_party/ocmock", + "//url", + ] +} diff --git a/chromium/ios/chrome/browser/sessions/BUILD.gn b/chromium/ios/chrome/browser/sessions/BUILD.gn index e72675c1907..b8045ac2345 100644 --- a/chromium/ios/chrome/browser/sessions/BUILD.gn +++ b/chromium/ios/chrome/browser/sessions/BUILD.gn @@ -53,6 +53,7 @@ source_set("serialisation") { "//components/sessions", "//ios/chrome/browser/browser_state", "//ios/web", + "//ios/web/public/session", ] configs += [ "//build/config/compiler:enable_arc" ] } @@ -86,6 +87,7 @@ source_set("unit_tests") { "//ios/chrome/browser", "//ios/chrome/browser/browser_state:test_support", "//ios/web", + "//ios/web/public/session", "//testing/gtest", "//third_party/ocmock", ] diff --git a/chromium/ios/chrome/browser/signin/BUILD.gn b/chromium/ios/chrome/browser/signin/BUILD.gn index cdedefcc5fa..2996fbee978 100644 --- a/chromium/ios/chrome/browser/signin/BUILD.gn +++ b/chromium/ios/chrome/browser/signin/BUILD.gn @@ -11,8 +11,6 @@ source_set("signin") { "account_consistency_service_factory.mm", "account_reconcilor_factory.cc", "account_reconcilor_factory.h", - "account_tracker_service_factory.cc", - "account_tracker_service_factory.h", "authentication_service.h", "authentication_service.mm", "authentication_service_delegate.h", @@ -99,6 +97,7 @@ source_set("feature_flags") { ] deps = [ "//base", + "//components/unified_consent", ] } @@ -151,9 +150,10 @@ source_set("unit_tests") { "//components/signin/core/browser:internals_test_support", "//components/signin/ios/browser", "//components/signin/ios/browser:test_support", - "//components/sync:test_support_driver", + "//components/sync:test_support", "//components/sync_preferences", "//components/sync_preferences:test_support", + "//components/unified_consent", "//google_apis", "//ios/chrome/browser", "//ios/chrome/browser/browser_state:browser_state_impl", diff --git a/chromium/ios/chrome/browser/snapshots/BUILD.gn b/chromium/ios/chrome/browser/snapshots/BUILD.gn index a35f0093034..4812e7ed67e 100644 --- a/chromium/ios/chrome/browser/snapshots/BUILD.gn +++ b/chromium/ios/chrome/browser/snapshots/BUILD.gn @@ -36,8 +36,8 @@ source_set("snapshots") { "//ios/chrome/browser/infobars", "//ios/chrome/browser/ntp", "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web:tab_id_tab_helper", "//ios/chrome/browser/web_state_list", "//ios/web/public", @@ -77,8 +77,8 @@ source_set("unit_tests") { ":test_utils", "//base", "//ios/chrome/browser/browser_state:test_support", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/image_util", + "//ios/chrome/browser/ui/util", "//ios/web", "//ios/web/public/test", "//ios/web/public/test/fakes:fakes", diff --git a/chromium/ios/chrome/browser/ssl/BUILD.gn b/chromium/ios/chrome/browser/ssl/BUILD.gn index 57b72b0cea0..99e3dee9dcf 100644 --- a/chromium/ios/chrome/browser/ssl/BUILD.gn +++ b/chromium/ios/chrome/browser/ssl/BUILD.gn @@ -39,7 +39,9 @@ source_set("ssl") { "//ios/chrome/browser/tabs", "//ios/chrome/browser/ui/util", "//ios/public/provider/chrome/browser", - "//ios/web", + "//ios/web/common", + "//ios/web/public", + "//ios/web/public/security", "//net", "//ui/base", "//url", @@ -73,6 +75,7 @@ source_set("unit_tests") { "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/web:test_support", "//ios/web", + "//ios/web/public/security", "//ios/web/public/test", "//net", "//net:test_support", diff --git a/chromium/ios/chrome/browser/sync/BUILD.gn b/chromium/ios/chrome/browser/sync/BUILD.gn index 03d3fd0bc0b..c9e8dcc10b6 100644 --- a/chromium/ios/chrome/browser/sync/BUILD.gn +++ b/chromium/ios/chrome/browser/sync/BUILD.gn @@ -54,10 +54,10 @@ source_set("sync") { "//components/sessions", "//components/signin/core/browser", "//components/sync", - "//components/sync:device_info", - "//components/sync:user_events", + "//components/sync_device_info", "//components/sync_preferences", "//components/sync_sessions", + "//components/sync_user_events", "//components/unified_consent", "//components/version_info", "//google_apis", diff --git a/chromium/ios/chrome/browser/tabs/BUILD.gn b/chromium/ios/chrome/browser/tabs/BUILD.gn index ef495fdf4c3..203241527ba 100644 --- a/chromium/ios/chrome/browser/tabs/BUILD.gn +++ b/chromium/ios/chrome/browser/tabs/BUILD.gn @@ -44,15 +44,9 @@ source_set("tabs_internal") { "tab_model.mm", "tab_model_closing_web_state_observer.h", "tab_model_closing_web_state_observer.mm", - "tab_model_favicon_driver_observer.h", - "tab_model_favicon_driver_observer.mm", "tab_model_list.mm", - "tab_model_notification_observer.h", - "tab_model_notification_observer.mm", "tab_model_observers.h", "tab_model_observers.mm", - "tab_model_observers_bridge.h", - "tab_model_observers_bridge.mm", "tab_model_selected_tab_observer.h", "tab_model_selected_tab_observer.mm", "tab_model_synced_window_delegate.mm", @@ -121,7 +115,6 @@ source_set("tabs_internal") { "//ios/chrome/browser/sync", "//ios/chrome/browser/translate", "//ios/chrome/browser/u2f", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/commands", @@ -140,6 +133,9 @@ source_set("tabs_internal") { "//ios/public/provider/chrome/browser", "//ios/web", "//ios/web/public", + "//ios/web/public/deprecated", + "//ios/web/public/security", + "//ios/web/public/session", "//net", "//ui/base", "//url", @@ -155,7 +151,6 @@ source_set("tabs_internal") { source_set("unit_tests") { testonly = true sources = [ - "tab_model_favicon_driver_observer_unittest.mm", "tab_model_list_unittest.mm", "tab_model_unittest.mm", "tab_title_util_unittest.mm", @@ -167,7 +162,6 @@ source_set("unit_tests") { "//base", "//base/test:test_support", "//components/bookmarks/test", - "//components/favicon/ios", "//components/history/core/browser", "//components/keyed_service/core", "//components/search_engines", @@ -184,7 +178,6 @@ source_set("unit_tests") { "//ios/chrome/browser/sessions:serialisation", "//ios/chrome/browser/sessions:test_support", "//ios/chrome/browser/snapshots", - "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/open_in", "//ios/chrome/browser/web", "//ios/chrome/browser/web:web_internal", @@ -192,20 +185,21 @@ source_set("unit_tests") { "//ios/chrome/browser/web_state_list:test_support", "//ios/chrome/browser/web_state_list/web_usage_enabler", "//ios/chrome/test:test_support", + "//ios/chrome/test/fakes", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser:test_support", "//ios/testing:ocmock_support", "//ios/web/common", + "//ios/web/navigation:core", + "//ios/web/public/session", "//ios/web/public/test", "//ios/web/public/test/fakes", "//ios/web/test/fakes:fakes", - "//ios/web/web_state:navigation_context", "//net", "//testing/gmock", "//testing/gtest", "//third_party/ocmock", "//ui/base", - "//ui/gfx", ] configs += [ "//build/config/compiler:enable_arc" ] } diff --git a/chromium/ios/chrome/browser/translate/BUILD.gn b/chromium/ios/chrome/browser/translate/BUILD.gn index ba1eab1dd7a..857141fdbe0 100644 --- a/chromium/ios/chrome/browser/translate/BUILD.gn +++ b/chromium/ios/chrome/browser/translate/BUILD.gn @@ -32,8 +32,8 @@ source_set("translate") { "translate_ranker_factory.h", "translate_ranker_metrics_provider.cc", "translate_ranker_metrics_provider.h", - "translate_service_ios.cc", "translate_service_ios.h", + "translate_service_ios.mm", ] deps = [ "//base", @@ -58,7 +58,7 @@ source_set("translate") { "//ios/chrome/browser/ui/infobars:infobars_ui", "//ios/chrome/browser/ui/translate:translate_ui", "//ios/chrome/browser/ui/util", - "//ios/web", + "//ios/web/public/deprecated", "//third_party/metrics_proto", "//ui/base", "//ui/gfx", @@ -88,6 +88,7 @@ source_set("unit_tests") { "//ios/chrome/common", "//ios/public/provider/chrome/browser:test_support", "//ios/web/public", + "//ios/web/public/deprecated", "//ios/web/public/test:util", "//skia", "//testing/gmock", diff --git a/chromium/ios/chrome/browser/u2f/BUILD.gn b/chromium/ios/chrome/browser/u2f/BUILD.gn index 7cebd98b05b..2916fa9975e 100644 --- a/chromium/ios/chrome/browser/u2f/BUILD.gn +++ b/chromium/ios/chrome/browser/u2f/BUILD.gn @@ -30,7 +30,8 @@ source_set("u2f_internal") { "//crypto", "//ios/chrome/browser", "//ios/chrome/common", - "//ios/web", + "//ios/web/public", + "//ios/web/public/deprecated", "//net", "//url", ] @@ -49,7 +50,7 @@ source_set("unit_tests") { "//base", "//ios/chrome/browser", "//ios/chrome/browser/web:tab_id_tab_helper", - "//ios/web", + "//ios/web/public/deprecated", "//ios/web/public/test/fakes", "//net", "//testing/gmock", diff --git a/chromium/ios/chrome/browser/ui/BUILD.gn b/chromium/ios/chrome/browser/ui/BUILD.gn index 4f7091cfafd..5ac87f4a4e2 100644 --- a/chromium/ios/chrome/browser/ui/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/BUILD.gn @@ -4,27 +4,6 @@ import("//build/config/ios/rules.gni") -source_set("ui") { - sources = [ - "native_content_controller.h", - "native_content_controller.mm", - ] - public_deps = [ - "//ios/chrome/browser/ui/util", - "//ios/chrome/common/ui_util", - ] - deps = [ - "//base", - "//base:i18n", - "//components/sessions", - "//ios/chrome/browser", - "//ios/chrome/browser/ui/commands", - "//ui/base", - ] - allow_circular_includes_from = [ "//ios/chrome/browser/ui/commands" ] - configs += [ "//build/config/compiler:enable_arc" ] -} - source_set("feature_flags") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ @@ -35,83 +14,3 @@ source_set("feature_flags") { "//base", ] } - -source_set("unit_tests") { - configs += [ "//build/config/compiler:enable_arc" ] - testonly = true - sources = [ - "native_content_controller_unittest.mm", - ] - deps = [ - ":native_content_controller_test_xib", - ":resources_unit_tests", - ":ui", - "//base", - "//base/test:test_support", - "//components/bookmarks/browser", - "//components/bookmarks/test", - "//components/omnibox/browser:test_support", - "//components/payments/core", - "//components/prefs:test_support", - "//components/search_engines", - "//components/sessions", - "//ios/chrome/app/strings", - "//ios/chrome/browser", - "//ios/chrome/browser/bookmarks", - "//ios/chrome/browser/browser_state", - "//ios/chrome/browser/browser_state:test_support", - "//ios/chrome/browser/favicon", - "//ios/chrome/browser/find_in_page", - "//ios/chrome/browser/main:test_support", - "//ios/chrome/browser/search_engines", - "//ios/chrome/browser/sessions", - "//ios/chrome/browser/snapshots", - "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui:feature_flags", - "//ios/chrome/browser/ui/activity_services", - "//ios/chrome/browser/ui/alert_coordinator", - "//ios/chrome/browser/ui/browser_container:ui", - "//ios/chrome/browser/ui/commands", - "//ios/chrome/browser/ui/ntp:ntp_controller", - "//ios/chrome/browser/ui/toolbar/public", - "//ios/chrome/browser/ui/toolbar/test", - "//ios/chrome/browser/url_loading", - "//ios/chrome/browser/web", - "//ios/chrome/browser/web:web_internal", - "//ios/chrome/browser/web_state_list", - "//ios/chrome/browser/web_state_list:test_support", - "//ios/chrome/browser/web_state_list/web_usage_enabler", - "//ios/chrome/test:test_support", - "//ios/net", - "//ios/testing:ocmock_support", - "//ios/web/public/test", - "//ios/web/public/test/fakes", - "//net", - "//net:test_support", - "//services/network:test_support", - "//testing/gmock", - "//testing/gtest", - "//third_party/ocmock", - "//ui/base", - "//ui/base:test_support", - "//url", - ] -} - -bundle_data_ib_file("native_content_controller_test_xib") { - visibility = [ ":unit_tests" ] - testonly = true - source = "native_content_controller_test.xib" -} - -bundle_data("resources_unit_tests") { - visibility = [ ":unit_tests" ] - testonly = true - sources = [ - "//ios/chrome/test/data/testbadpass.pkpass", - "//ios/chrome/test/data/testpass.pkpass", - ] - outputs = [ - "{{bundle_resources_dir}}/ios/chrome/test/data/{{source_file_part}}", - ] -} diff --git a/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn b/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn index d35b35bb868..305de56d324 100644 --- a/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn @@ -26,6 +26,7 @@ source_set("activity_services") { deps = [ "//base", "//components/bookmarks/browser", + "//components/send_tab_to_self", "//components/ui_metrics", "//ios/chrome/app/strings", "//ios/chrome/browser", @@ -33,12 +34,15 @@ source_set("activity_services") { "//ios/chrome/browser/browser_state", "//ios/chrome/browser/find_in_page", "//ios/chrome/browser/passwords", + "//ios/chrome/browser/send_tab_to_self", "//ios/chrome/browser/snapshots", + "//ios/chrome/browser/sync", "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/activity_services/activities", "//ios/chrome/browser/ui/activity_services/requirements", "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/context_menu", + "//ios/chrome/browser/ui/util", "//ios/web", "//net", "//ui/base", @@ -89,6 +93,8 @@ source_set("unit_tests") { "//base/test:test_support", "//components/bookmarks/browser", "//components/bookmarks/test", + "//components/send_tab_to_self", + "//components/sync/driver:driver", "//components/ui_metrics", "//ios/chrome/app/strings", "//ios/chrome/browser/bookmarks", @@ -97,11 +103,13 @@ source_set("unit_tests") { "//ios/chrome/browser/passwords", "//ios/chrome/browser/snapshots", "//ios/chrome/browser/snapshots:test_utils", + "//ios/chrome/browser/sync", "//ios/chrome/browser/tabs", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/activity_services/activities", "//ios/chrome/browser/ui/activity_services/requirements", "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/context_menu", "//ios/chrome/browser/ui/util", "//ios/testing:ocmock_support", "//ios/web", @@ -125,7 +133,7 @@ source_set("eg_tests") { "//base", "//components/strings", "//ios/chrome/app/strings", - "//ios/chrome/browser/ui", + "//ios/chrome/browser/ui/util", "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", "//ios/third_party/material_components_ios", diff --git a/chromium/ios/chrome/browser/ui/activity_services/activities/BUILD.gn b/chromium/ios/chrome/browser/ui/activity_services/activities/BUILD.gn index f5b212a5bf8..c46e83bea89 100644 --- a/chromium/ios/chrome/browser/ui/activity_services/activities/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/activity_services/activities/BUILD.gn @@ -17,6 +17,8 @@ source_set("activities") { "reading_list_activity.mm", "request_desktop_or_mobile_site_activity.h", "request_desktop_or_mobile_site_activity.mm", + "send_tab_to_self_activity.h", + "send_tab_to_self_activity.mm", ] deps = [ "resources:activity_services_add_bookmark", @@ -27,9 +29,13 @@ source_set("activities") { "resources:activity_services_read_later", "resources:activity_services_request_desktop_site", "resources:activity_services_request_mobile_site", + "resources:activity_services_send_tab_to_self", "//base", "//ios/chrome/app/strings", + "//ios/chrome/browser/send_tab_to_self", + "//ios/chrome/browser/ui/activity_services/requirements", "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/context_menu", "//ios/chrome/browser/ui/util", "//ios/web/public", "//ui/base", diff --git a/chromium/ios/chrome/browser/ui/activity_services/activities/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/activity_services/activities/resources/BUILD.gn index b265e6197ec..a5197be28ea 100644 --- a/chromium/ios/chrome/browser/ui/activity_services/activities/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/activity_services/activities/resources/BUILD.gn @@ -76,3 +76,12 @@ imageset("activity_services_request_mobile_site") { "activity_services_request_mobile_site.imageset/activity_services_request_mobile_site-76@2x.png", ] } + +imageset("activity_services_send_tab_to_self") { + sources = [ + "activity_services_send_tab_to_self.imageset/Contents.json", + "activity_services_send_tab_to_self.imageset/activity_services_send_tab_to_self-60@2x.png", + "activity_services_send_tab_to_self.imageset/activity_services_send_tab_to_self-60@3x.png", + "activity_services_send_tab_to_self.imageset/activity_services_send_tab_to_self-76@2x.png", + ] +} diff --git a/chromium/ios/chrome/browser/ui/alert_coordinator/BUILD.gn b/chromium/ios/chrome/browser/ui/alert_coordinator/BUILD.gn index c66a8158e90..3d4366bad8e 100644 --- a/chromium/ios/chrome/browser/ui/alert_coordinator/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/alert_coordinator/BUILD.gn @@ -20,6 +20,7 @@ source_set("alert_coordinator") { "//ios/chrome/browser", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", + "//ios/chrome/browser/ui/dialogs:completion_block_util", "//ios/web", "//ui/base", "//ui/strings", @@ -40,7 +41,7 @@ source_set("unit_tests") { "//base", "//base/test:test_support", "//components/strings", - "//ios/chrome/browser/ui", + "//ios/chrome/browser/ui/util", "//ios/chrome/test:test_support", "//ios/web/public/test/fakes", "//testing/gtest", @@ -60,9 +61,10 @@ source_set("alert_coordinator_internal") { "//base", "//components/strings", "//ios/chrome/browser", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/material_components", + "//ios/chrome/browser/ui/util", + "//ios/chrome/common/ui_util", "//ios/third_party/material_components_ios", "//ios/third_party/material_roboto_font_loader_ios", "//ui/base", diff --git a/chromium/ios/chrome/browser/ui/alert_view_controller/BUILD.gn b/chromium/ios/chrome/browser/ui/alert_view_controller/BUILD.gn index 7f360bbaa30..257e5b7c29c 100644 --- a/chromium/ios/chrome/browser/ui/alert_view_controller/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/alert_view_controller/BUILD.gn @@ -4,12 +4,31 @@ source_set("alert_view_controller") { sources = [ + "alert_action.h", + "alert_action.mm", + "alert_consumer.h", "alert_view_controller.h", "alert_view_controller.mm", ] deps = [ + "//base", + "//ios/chrome/browser/ui/elements", + "//ios/chrome/browser/ui/presenters", + "//ios/chrome/browser/ui/util", "//ios/chrome/common/ui_util", ] libs = [ "UIKit.framework" ] configs += [ "//build/config/compiler:enable_arc" ] } + +source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ + "alert_view_controller_unittest.mm", + ] + deps = [ + ":alert_view_controller", + "//testing/gtest:gtest", + ] +} diff --git a/chromium/ios/chrome/browser/ui/alert_view_controller/test/BUILD.gn b/chromium/ios/chrome/browser/ui/alert_view_controller/test/BUILD.gn new file mode 100644 index 00000000000..b3cdf7fe85e --- /dev/null +++ b/chromium/ios/chrome/browser/ui/alert_view_controller/test/BUILD.gn @@ -0,0 +1,19 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +source_set("test") { + testonly = true + sources = [ + "fake_alert_consumer.h", + "fake_alert_consumer.mm", + ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + "//base", + "//ios/chrome/browser/ui/alert_view_controller", + "//testing/gtest", + ] +} diff --git a/chromium/ios/chrome/browser/ui/authentication/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/BUILD.gn index 258b731c8da..c596be0ee30 100644 --- a/chromium/ios/chrome/browser/ui/authentication/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/BUILD.gn @@ -50,7 +50,6 @@ source_set("authentication") { "//ios/chrome/browser/signin", "//ios/chrome/browser/sync", "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/authentication/cells", "//ios/chrome/browser/ui/collection_view/cells", @@ -59,8 +58,10 @@ source_set("authentication") { "//ios/chrome/browser/ui/material_components", "//ios/chrome/browser/ui/settings:settings_root", "//ios/chrome/browser/ui/signin_interaction/public", + "//ios/chrome/browser/ui/util", "//ios/chrome/browser/unified_consent", "//ios/chrome/common", + "//ios/chrome/common/ui_util", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/images", "//ios/public/provider/chrome/browser/signin", diff --git a/chromium/ios/chrome/browser/ui/authentication/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/cells/BUILD.gn index 7286007a37c..72bf92166e5 100644 --- a/chromium/ios/chrome/browser/ui/authentication/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/cells/BUILD.gn @@ -28,13 +28,13 @@ source_set("cells") { "//components/unified_consent", "//ios/chrome/app/strings", "//ios/chrome/browser", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/collection_view/cells", "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/settings/cells:public", "//ios/chrome/browser/ui/table_view:styler", "//ios/chrome/browser/ui/table_view/cells", + "//ios/chrome/common/ui_util", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/signin", "//ui/base", diff --git a/chromium/ios/chrome/browser/ui/autofill/BUILD.gn b/chromium/ios/chrome/browser/ui/autofill/BUILD.gn index 264bf28ad35..8c479d742bf 100644 --- a/chromium/ios/chrome/browser/ui/autofill/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/autofill/BUILD.gn @@ -45,19 +45,20 @@ source_set("autofill") { "//ios/chrome/browser/ssl", "//ios/chrome/browser/sync", "//ios/chrome/browser/translate:translate", - "//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", + "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web_state_list:web_state_list", "//ios/chrome/common", "//ios/public/provider/chrome/browser", "//ios/third_party/material_components_ios", "//ios/third_party/material_roboto_font_loader_ios", - "//ios/web", + "//ios/web/public/deprecated", + "//ios/web/public/js_messaging", "//ui/base", ] public_deps = [ @@ -77,10 +78,10 @@ source_set("bridges") { "//base", "//components/autofill/core/browser", "//components/strings", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/autofill/cells", "//ios/chrome/browser/ui/collection_view/cells", "//ios/chrome/browser/ui/colors", + "//ios/chrome/browser/ui/util", "//ios/third_party/material_components_ios", "//ios/third_party/material_roboto_font_loader_ios", "//ios/web", @@ -113,12 +114,12 @@ source_set("autofill_ui") { "//ios/chrome/browser", "//ios/chrome/browser/infobars", "//ios/chrome/browser/infobars:public", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/image_util", "//ios/chrome/browser/ui/infobars:infobars_ui", "//ios/chrome/browser/ui/util", "//ios/chrome/common", + "//ios/chrome/common/ui_util", "//ios/third_party/material_components_ios", "//ios/third_party/material_roboto_font_loader_ios", "//ui/base:base", @@ -144,6 +145,7 @@ source_set("eg_tests") { "//ios/chrome/browser/autofill", "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", + "//ios/web/public/js_messaging", "//ios/web/public/test/http_server", "//services/network:test_support", ] diff --git a/chromium/ios/chrome/browser/ui/autofill/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/autofill/cells/BUILD.gn index 23fee9ca0ac..b8f427ac865 100644 --- a/chromium/ios/chrome/browser/ui/autofill/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/autofill/cells/BUILD.gn @@ -20,7 +20,6 @@ source_set("cells") { "//ios/chrome/app/strings", "//ios/chrome/app/theme", "//ios/chrome/browser", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/autofill:autofill_ui", "//ios/chrome/browser/ui/collection_view/cells", 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 841716aa19b..3b7635608c2 100644 --- a/chromium/ios/chrome/browser/ui/autofill/manual_fill/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/autofill/manual_fill/BUILD.gn @@ -56,7 +56,9 @@ source_set("manual_fill") { "//ios/chrome/browser/ui/table_view:table_view", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web_state_list:web_state_list", - "//ios/web/public:public", + "//ios/web/public", + "//ios/web/public/deprecated", + "//ios/web/public/js_messaging", "//ui/base:base", ] libs = [ "UIKit.framework" ] @@ -180,6 +182,7 @@ source_set("requesters") { "//ios/chrome/browser/ui/payments:requesters", "//ios/chrome/browser/web_state_list:web_state_list", "//ios/web/public:public", + "//ios/web/public/js_messaging", "//ui/base:base", ] libs = [ "UIKit.framework" ] diff --git a/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn index 7c16ccb23fd..69d1c2796c4 100644 --- a/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn @@ -76,7 +76,6 @@ source_set("bookmarks") { "//ios/chrome/browser/signin", "//ios/chrome/browser/sync", "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/authentication", "//ios/chrome/browser/ui/authentication/cells", @@ -98,6 +97,7 @@ source_set("bookmarks") { "//ios/chrome/browser/url_loading", "//ios/chrome/browser/web_state_list", "//ios/chrome/common/favicon", + "//ios/chrome/common/ui_util", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/ui", "//ios/third_party/material_roboto_font_loader_ios", @@ -163,12 +163,12 @@ source_set("eg_tests") { "//components/bookmarks/browser", "//components/prefs", "//components/strings", + "//components/unified_consent", "//ios/chrome/app/strings", "//ios/chrome/browser", "//ios/chrome/browser/bookmarks", "//ios/chrome/browser/bookmarks:bookmarks_utils", "//ios/chrome/browser/browser_state", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/authentication:eg_test_support", "//ios/chrome/browser/ui/authentication/cells", "//ios/chrome/browser/ui/bookmarks:bookmarks", @@ -177,6 +177,7 @@ source_set("eg_tests") { "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/toolbar/buttons", "//ios/chrome/browser/ui/toolbar/public", + "//ios/chrome/browser/ui/util", "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", "//ios/public/provider/chrome/browser/signin:test_support", diff --git a/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn index 476e4816693..2d59545f34d 100644 --- a/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn @@ -27,7 +27,6 @@ source_set("cells") { "//components/unified_consent", "//ios/chrome/app/strings", "//ios/chrome/browser", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/authentication", "//ios/chrome/browser/ui/authentication/cells", "//ios/chrome/browser/ui/bookmarks:bookmarks_ui", @@ -35,6 +34,7 @@ source_set("cells") { "//ios/chrome/browser/ui/icons", "//ios/chrome/browser/ui/table_view:styler", "//ios/chrome/browser/ui/table_view/cells", + "//ios/chrome/common/ui_util", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/ui", "//ios/third_party/material_components_ios", diff --git a/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn b/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn index 269cd571b7b..399ed2d2000 100644 --- a/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn @@ -5,6 +5,8 @@ source_set("browser_view") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ + "browser_coordinator.h", + "browser_coordinator.mm", "browser_view_controller+private.h", "browser_view_controller.h", "browser_view_controller.mm", @@ -37,16 +39,20 @@ source_set("browser_view") { "//ios/chrome/app:tests_hook", "//ios/chrome/app/strings", "//ios/chrome/browser", + "//ios/chrome/browser/app_launcher", "//ios/chrome/browser/autofill:autofill_internal", "//ios/chrome/browser/bookmarks", "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/crash_report", "//ios/chrome/browser/download", + "//ios/chrome/browser/download:features", "//ios/chrome/browser/feature_engagement", "//ios/chrome/browser/find_in_page", "//ios/chrome/browser/first_run", "//ios/chrome/browser/geolocation:geolocation_internal", "//ios/chrome/browser/infobars", "//ios/chrome/browser/language", + "//ios/chrome/browser/main", "//ios/chrome/browser/metrics:metrics_internal", "//ios/chrome/browser/net", "//ios/chrome/browser/ntp", @@ -56,17 +62,20 @@ source_set("browser_view") { "//ios/chrome/browser/prerender", "//ios/chrome/browser/reading_list", "//ios/chrome/browser/search_engines", + "//ios/chrome/browser/send_tab_to_self", "//ios/chrome/browser/sessions", "//ios/chrome/browser/sessions:serialisation", "//ios/chrome/browser/signin", "//ios/chrome/browser/snapshots", "//ios/chrome/browser/ssl", + "//ios/chrome/browser/store_kit", "//ios/chrome/browser/tabs", "//ios/chrome/browser/translate", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/activity_services:coordinator", "//ios/chrome/browser/ui/activity_services/requirements", "//ios/chrome/browser/ui/alert_coordinator", + "//ios/chrome/browser/ui/app_launcher", "//ios/chrome/browser/ui/authentication", "//ios/chrome/browser/ui/autofill:autofill", "//ios/chrome/browser/ui/autofill/manual_fill", @@ -80,6 +89,7 @@ source_set("browser_view") { "//ios/chrome/browser/ui/content_suggestions", "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant", "//ios/chrome/browser/ui/context_menu", + "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/dialogs:dialogs_internal", "//ios/chrome/browser/ui/download", "//ios/chrome/browser/ui/elements:elements_internal", @@ -96,22 +106,23 @@ source_set("browser_view") { "//ios/chrome/browser/ui/keyboard", "//ios/chrome/browser/ui/location_bar:location_bar_model_delegate", "//ios/chrome/browser/ui/location_bar:notifications", - "//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:coordinator", - "//ios/chrome/browser/ui/ntp:ntp_controller", "//ios/chrome/browser/ui/ntp:util", "//ios/chrome/browser/ui/omnibox:omnibox_internal", "//ios/chrome/browser/ui/omnibox/popup", "//ios/chrome/browser/ui/overscroll_actions", + "//ios/chrome/browser/ui/page_info:coordinator", "//ios/chrome/browser/ui/page_info/requirements", "//ios/chrome/browser/ui/payments", "//ios/chrome/browser/ui/popup_menu", "//ios/chrome/browser/ui/presenters", + "//ios/chrome/browser/ui/print", "//ios/chrome/browser/ui/qr_scanner:coordinator", "//ios/chrome/browser/ui/reading_list", + "//ios/chrome/browser/ui/recent_tabs", "//ios/chrome/browser/ui/sad_tab", "//ios/chrome/browser/ui/sad_tab:coordinator", "//ios/chrome/browser/ui/settings/sync/utils", @@ -152,6 +163,7 @@ source_set("browser_view") { "//ios/web", "//ios/web/common", "//ios/web/public", + "//ios/web/public/deprecated", "//third_party/google_toolbox_for_mac", "//ui/base", "//ui/gfx", @@ -199,7 +211,6 @@ source_set("unit_tests") { "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/browser_container:ui", "//ios/chrome/browser/ui/commands", - "//ios/chrome/browser/ui/ntp:ntp_controller", "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/toolbar/test", "//ios/chrome/browser/ui/util", @@ -212,6 +223,7 @@ source_set("unit_tests") { "//ios/net", "//ios/testing:ocmock_support", "//ios/web/public", + "//ios/web/public/deprecated", "//ios/web/public/test", "//ios/web/public/test/fakes", "//ios/web/web_state:web_state_impl_header", @@ -242,7 +254,6 @@ source_set("eg_tests") { "//ios/chrome/browser/tabs", "//ios/chrome/browser/ui/bookmarks:bookmarks_ui", "//ios/chrome/browser/ui/commands", - "//ios/chrome/browser/ui/ntp:ntp_controller", "//ios/chrome/browser/ui/popup_menu:constants", "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/util", diff --git a/chromium/ios/chrome/browser/ui/bubble/BUILD.gn b/chromium/ios/chrome/browser/ui/bubble/BUILD.gn index 98f3f21a069..68927677274 100644 --- a/chromium/ios/chrome/browser/ui/bubble/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/bubble/BUILD.gn @@ -25,7 +25,6 @@ source_set("bubble") { "//ios/chrome/browser", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/feature_engagement", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/util", @@ -49,7 +48,7 @@ source_set("unit_tests") { ":bubble", "//base", "//base:i18n", - "//ios/chrome/browser/ui", + "//ios/chrome/browser/ui/util", "//testing/gtest", ] libs = [ "CoreGraphics.framework" ] diff --git a/chromium/ios/chrome/browser/ui/commands/BUILD.gn b/chromium/ios/chrome/browser/ui/commands/BUILD.gn index 795f1e1695b..8eca2b67a51 100644 --- a/chromium/ios/chrome/browser/ui/commands/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/commands/BUILD.gn @@ -22,6 +22,8 @@ source_set("commands") { "qr_scanner_commands.h", "reading_list_add_command.h", "reading_list_add_command.mm", + "send_tab_to_self_command.h", + "send_tab_to_self_command.mm", "settings_main_page_commands.h", "show_signin_command.h", "show_signin_command.mm", diff --git a/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn b/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn index 128e556a108..18359944276 100644 --- a/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn @@ -45,9 +45,9 @@ source_set("content_suggestions") { "//ios/chrome/browser/ntp_tiles", "//ios/chrome/browser/reading_list", "//ios/chrome/browser/search_engines", + "//ios/chrome/browser/signin", + "//ios/chrome/browser/signin:feature_flags", "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui", - "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/collection_view/cells", "//ios/chrome/browser/ui/commands", @@ -71,11 +71,13 @@ source_set("content_suggestions") { "//ios/chrome/browser/web_state_list", "//ios/chrome/common/app_group", "//ios/chrome/common/favicon", + "//ios/chrome/common/ui_util", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/images", + "//ios/public/provider/chrome/browser/signin", "//ios/public/provider/chrome/browser/ui", "//ios/public/provider/chrome/browser/voice", - "//ios/web", + "//services/identity/public/objc", "//ui/base", "//ui/strings", ] @@ -106,6 +108,7 @@ source_set("content_suggestions_ui") { "content_suggestions_view_controller.mm", "content_suggestions_view_controller_audience.h", "ntp_home_consumer.h", + "user_account_image_update_delegate.h", ] deps = [ ":content_suggestions_constant", @@ -115,8 +118,7 @@ source_set("content_suggestions_ui") { "resources:ntp_search_icon", "//base", "//components/strings", - "//ios/chrome/browser/ui", - "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/browser/signin:feature_flags", "//ios/chrome/browser/ui/collection_view", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/content_suggestions/cells:cells_ui", @@ -131,6 +133,7 @@ source_set("content_suggestions_ui") { "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/util:util", "//ios/chrome/common/favicon", + "//ios/chrome/common/ui_util", "//ios/web/common", "//ui/base", ] @@ -162,14 +165,13 @@ source_set("content_suggestions_ui_util") { "//base:i18n", "//components/strings", "//ios/chrome/app/strings", - "//ios/chrome/browser/ui", - "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/content_suggestions/cells:cells_ui", "//ios/chrome/browser/ui/location_bar:constants", "//ios/chrome/browser/ui/ntp", "//ios/chrome/browser/ui/ntp_tile_views:constants", "//ios/chrome/browser/ui/toolbar/public", + "//ios/chrome/browser/ui/util", "//ios/third_party/material_components_ios", "//ios/web/common", "//ui/base", @@ -196,8 +198,8 @@ source_set("unit_tests") { "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/ntp_snippets", "//ios/chrome/browser/search_engines", - "//ios/chrome/browser/ui", - "//ios/chrome/browser/ui", + "//ios/chrome/browser/signin", + "//ios/chrome/browser/signin:test_support", "//ios/chrome/browser/ui/collection_view", "//ios/chrome/browser/ui/collection_view", "//ios/chrome/browser/ui/commands", @@ -207,6 +209,7 @@ source_set("unit_tests") { "//ios/chrome/browser/ui/content_suggestions/identifier", "//ios/chrome/browser/ui/location_bar:notifications", "//ios/chrome/browser/ui/toolbar/test", + "//ios/chrome/browser/ui/util", "//ios/chrome/browser/url_loading", "//ios/chrome/browser/web_state_list", "//ios/chrome/browser/web_state_list:test_support", @@ -214,6 +217,7 @@ source_set("unit_tests") { "//ios/public/provider/chrome/browser/ui", "//ios/web/public/test", "//ios/web/public/test/fakes", + "//services/identity/public/objc", "//testing/gtest", "//testing/gtest", "//third_party/ocmock", @@ -229,13 +233,12 @@ source_set("eg_tests") { "ntp_home_egtest.mm", "ntp_home_provider_test_singleton.h", "ntp_home_provider_test_singleton.mm", - "ntp_home_test_utils.h", - "ntp_home_test_utils.mm", ] deps = [ ":content_suggestions_constant", ":content_suggestions_ui", ":content_suggestions_ui_util", + ":test_support", "//base", "//base/test:test_support", "//components/keyed_service/ios", @@ -244,20 +247,20 @@ source_set("eg_tests") { "//components/reading_list/core", "//components/search_engines", "//components/strings", + "//components/unified_consent", "//ios/chrome/app/strings", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/ntp_snippets", "//ios/chrome/browser/reading_list", "//ios/chrome/browser/search_engines", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/content_suggestions/cells:cells_ui", "//ios/chrome/browser/ui/location_bar:location_bar", - "//ios/chrome/browser/ui/ntp:ntp_controller", "//ios/chrome/browser/ui/settings", "//ios/chrome/browser/ui/tab_grid:egtest_support", "//ios/chrome/browser/ui/toolbar/buttons", "//ios/chrome/browser/ui/toolbar/public", + "//ios/chrome/browser/ui/util", "//ios/chrome/test:eg_test_support", "//ios/chrome/test:test_support", "//ios/chrome/test/app:test_support", @@ -275,3 +278,19 @@ source_set("eg_tests") { ] configs += [ "//build/config/compiler:enable_arc" ] } + +source_set("test_support") { + testonly = true + sources = [ + "ntp_home_test_utils.h", + "ntp_home_test_utils.mm", + ] + deps = [ + "//components/ntp_snippets", + "//ios/chrome/browser/ui/content_suggestions", + "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant", + "//ios/chrome/browser/ui/content_suggestions:content_suggestions_ui", + "//ios/third_party/earl_grey:earl_grey+link", + ] + configs += [ "//build/config/compiler:enable_arc" ] +} diff --git a/chromium/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn index e54fb8fe0bc..7b4f0ed4906 100644 --- a/chromium/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn @@ -54,7 +54,6 @@ source_set("cells_ui") { deps = [ "//base", "//ios/chrome/app/strings", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/collection_view", "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/content_suggestions/identifier", @@ -64,6 +63,7 @@ source_set("cells_ui") { "//ios/chrome/browser/ui/util", "//ios/chrome/common", "//ios/chrome/common/favicon", + "//ios/chrome/common/ui_util", "//ui/base", ] public_deps = [ @@ -87,8 +87,8 @@ source_set("unit_tests") { ":cells_ui", "//base", "//ios/chrome/app/strings", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/collection_view", + "//ios/chrome/browser/ui/util", "//ios/chrome/common/favicon", "//testing/gtest", "//third_party/ocmock", diff --git a/chromium/ios/chrome/browser/ui/context_menu/BUILD.gn b/chromium/ios/chrome/browser/ui/context_menu/BUILD.gn index a033b2fd716..5f8d2b5d857 100644 --- a/chromium/ios/chrome/browser/ui/context_menu/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/context_menu/BUILD.gn @@ -7,13 +7,14 @@ source_set("context_menu") { sources = [ "context_menu_coordinator.h", "context_menu_coordinator.mm", + "context_menu_item.h", + "context_menu_item.mm", ] deps = [ "//base", "//ios/chrome/browser", "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", - "//ios/web", "//ui/base", "//ui/strings", ] @@ -28,7 +29,6 @@ source_set("unit_tests") { deps = [ ":context_menu", "//base", - "//ios/web", "//testing/gtest", ] } diff --git a/chromium/ios/chrome/browser/ui/dialogs/BUILD.gn b/chromium/ios/chrome/browser/ui/dialogs/BUILD.gn index 3e7e7f6e850..60589a8dfc8 100644 --- a/chromium/ios/chrome/browser/ui/dialogs/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/dialogs/BUILD.gn @@ -50,8 +50,6 @@ source_set("unit_tests") { source_set("dialogs_internal") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ - "completion_block_util.h", - "completion_block_util.mm", "dialog_presenter.h", "dialog_presenter.mm", "java_script_dialog_presenter_impl.h", @@ -60,15 +58,16 @@ source_set("dialogs_internal") { "nsurl_protection_space_util.mm", ] deps = [ + ":completion_block_util", ":dialogs", "//base", "//components/strings", "//components/url_formatter", "//ios/chrome/app/strings", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/dialogs/non_modal", + "//ios/chrome/browser/ui/util", "//ios/web", "//ui/base", "//url", @@ -76,6 +75,17 @@ source_set("dialogs_internal") { libs = [ "UIKit.framework" ] } +source_set("completion_block_util") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "completion_block_util.h", + "completion_block_util.mm", + ] + deps = [ + "//base", + ] +} + source_set("unit_tests_internal") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true @@ -86,6 +96,7 @@ source_set("unit_tests_internal") { "nsurl_protection_space_util_unittest.mm", ] deps = [ + ":completion_block_util", ":dialogs_internal", "//base", "//components/strings", @@ -112,7 +123,7 @@ source_set("eg_tests") { "//components/strings", "//components/url_formatter", "//ios/chrome/app/strings", - "//ios/chrome/browser/ui", + "//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", diff --git a/chromium/ios/chrome/browser/ui/download/BUILD.gn b/chromium/ios/chrome/browser/ui/download/BUILD.gn index 2440ba3e46e..7e7250633ba 100644 --- a/chromium/ios/chrome/browser/ui/download/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/download/BUILD.gn @@ -38,7 +38,6 @@ source_set("download") { "//ios/chrome/browser/download", "//ios/chrome/browser/infobars", "//ios/chrome/browser/store_kit", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", @@ -46,6 +45,7 @@ source_set("download") { "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web:web_internal", "//ios/chrome/browser/web_state_list:web_state_list", + "//ios/chrome/common/ui_util", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/images", "//ios/third_party/material_components_ios", @@ -136,3 +136,23 @@ source_set("eg_tests") { ] libs = [ "XCTest.framework" ] } + +source_set("eg2_tests") { + defines = [ "CHROME_EARL_GREY_2" ] + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + testonly = true + + sources = [] + + deps = [ + "//ios/chrome/test/earl_grey:eg_test_support+eg2", + "//ios/web/public/test:element_selector", + "//net:test_support", + "//ui/base", + ] + + libs = [ "UIKit.framework" ] +} diff --git a/chromium/ios/chrome/browser/ui/elements/BUILD.gn b/chromium/ios/chrome/browser/ui/elements/BUILD.gn index 0213e739a6e..d55b180b852 100644 --- a/chromium/ios/chrome/browser/ui/elements/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/elements/BUILD.gn @@ -7,6 +7,8 @@ source_set("elements") { sources = [ "extended_touch_target_button.h", "extended_touch_target_button.mm", + "gray_highlight_button.h", + "gray_highlight_button.mm", "selector_coordinator.h", "selector_coordinator.mm", "selector_picker_presentation_controller.h", @@ -14,6 +16,8 @@ source_set("elements") { "selector_picker_view_controller.h", "selector_picker_view_controller.mm", "selector_view_controller_delegate.h", + "text_field_configuration.h", + "text_field_configuration.mm", "top_aligned_image_view.h", "top_aligned_image_view.mm", "windowed_container_view.h", @@ -35,6 +39,7 @@ source_set("unit_tests") { "chrome_activity_overlay_coordinator_unittest.mm", "selector_coordinator_unittest.mm", "selector_picker_view_controller_unittest.mm", + "text_field_configuration_unittest.mm", "windowed_container_view_unittest.mm", ] deps = [ @@ -63,9 +68,10 @@ source_set("elements_internal") { deps = [ "//base", "//ios/chrome/browser", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/material_components", + "//ios/chrome/browser/ui/util", + "//ios/chrome/common/ui_util", "//ios/third_party/material_components_ios", ] libs = [ "UIKit.framework" ] diff --git a/chromium/ios/chrome/browser/ui/find_bar/BUILD.gn b/chromium/ios/chrome/browser/ui/find_bar/BUILD.gn index 83aa9b1bd2c..ba157e356ea 100644 --- a/chromium/ios/chrome/browser/ui/find_bar/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/find_bar/BUILD.gn @@ -20,11 +20,12 @@ source_set("find_bar") { "//components/strings", "//ios/chrome/app/strings", "//ios/chrome/browser/find_in_page", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/image_util", "//ios/chrome/browser/ui/resources:menu_shadow", "//ios/chrome/browser/ui/toolbar/public", + "//ios/chrome/browser/ui/util", + "//ios/chrome/common/ui_util", "//ios/third_party/material_components_ios", "//ui/base", "//ui/gfx", diff --git a/chromium/ios/chrome/browser/ui/first_run/BUILD.gn b/chromium/ios/chrome/browser/ui/first_run/BUILD.gn index ea141d75221..e91f47ed033 100644 --- a/chromium/ios/chrome/browser/ui/first_run/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/first_run/BUILD.gn @@ -27,6 +27,7 @@ source_set("first_run") { "//components/metrics", "//components/prefs", "//components/signin/core/browser", + "//components/unified_consent", "//ios/chrome/app/strings", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", @@ -34,7 +35,6 @@ source_set("first_run") { "//ios/chrome/browser/first_run", "//ios/chrome/browser/signin", "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/authentication", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/fancy_ui", @@ -75,8 +75,8 @@ source_set("unit_tests") { "//components/prefs:test_support", "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/fancy_ui", + "//ios/chrome/browser/ui/util", "//ios/chrome/test:test_support", "//ios/web/public/test", "//testing/gtest", @@ -96,6 +96,7 @@ source_set("eg_tests") { "//base/test:test_support", "//components/metrics", "//components/prefs", + "//components/unified_consent", "//ios/chrome/app:app_internal", "//ios/chrome/app/strings", "//ios/chrome/browser", diff --git a/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn b/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn index a755029b548..d7bc9e58592 100644 --- a/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn @@ -100,6 +100,7 @@ source_set("internal") { "//ios/public/provider/chrome/browser/ui", "//ios/web", "//ios/web/common", + "//ios/web/public/security", "//ui/gfx/geometry", ] } @@ -147,6 +148,7 @@ source_set("unit_tests") { "//ios/chrome/browser/web_state_list:test_support", "//ios/web/common", "//ios/web/public", + "//ios/web/public/security", "//ios/web/public/test/fakes", "//testing/gmock", "//testing/gtest", diff --git a/chromium/ios/chrome/browser/ui/history/BUILD.gn b/chromium/ios/chrome/browser/ui/history/BUILD.gn index dbe170d4aa5..7d28dd5a7d9 100644 --- a/chromium/ios/chrome/browser/ui/history/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/history/BUILD.gn @@ -24,10 +24,10 @@ source_set("history") { "//ios/chrome/browser/favicon", "//ios/chrome/browser/history", "//ios/chrome/browser/sync", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/context_menu", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/table_view", + "//ios/chrome/browser/ui/util", ] libs = [ "MobileCoreServices.framework", @@ -36,6 +36,14 @@ source_set("history") { ] } +source_set("constants") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "history_ui_constants.h", + "history_ui_constants.mm", + ] +} + source_set("history_ui") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ @@ -54,12 +62,11 @@ source_set("history_ui") { "history_table_view_controller.mm", "history_transitioning_delegate.h", "history_transitioning_delegate.mm", - "history_ui_constants.h", - "history_ui_constants.mm", "history_util.h", "history_util.mm", ] deps = [ + ":constants", "public", "resources:empty_history", "//base", @@ -74,7 +81,6 @@ source_set("history_ui") { "//ios/chrome/browser/browser_state", "//ios/chrome/browser/metrics:metrics_internal", "//ios/chrome/browser/sync", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/collection_view/cells", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/context_menu", @@ -86,6 +92,7 @@ source_set("history_ui") { "//ios/chrome/browser/ui/util", "//ios/chrome/browser/url_loading", "//ios/chrome/common/favicon", + "//ios/chrome/common/ui_util", "//ui/base", ] } @@ -99,7 +106,6 @@ source_set("clear_browsing_data") { deps = [ ":history_ui", "//base", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/history/public", @@ -123,7 +129,6 @@ source_set("unit_tests") { "//base", "//base/test:test_support", "//components/history/core/browser", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/list_model", "//ios/chrome/test:test_support", "//testing/gtest", @@ -138,6 +143,7 @@ source_set("eg_tests") { "history_ui_egtest.mm", ] deps = [ + ":constants", ":history", ":history_ui", "//base", @@ -148,7 +154,6 @@ source_set("eg_tests") { "//ios/chrome/app/strings", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", - "//ios/chrome/browser/ui:ui", "//ios/chrome/browser/ui/authentication:eg_test_support", "//ios/chrome/browser/ui/authentication/cells", "//ios/chrome/browser/ui/popup_menu:constants", diff --git a/chromium/ios/chrome/browser/ui/infobars/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/BUILD.gn index ea440e7e0e8..18d799c7189 100644 --- a/chromium/ios/chrome/browser/ui/infobars/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/infobars/BUILD.gn @@ -21,6 +21,7 @@ source_set("infobars") { "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/fullscreen", + "//ios/chrome/browser/ui/infobars/banners:public", "//ios/chrome/browser/ui/infobars/coordinators", "//ios/chrome/browser/upgrade", "//ios/chrome/browser/web:tab_id_tab_helper", @@ -30,6 +31,7 @@ source_set("infobars") { source_set("public") { sources = [ + "infobar_container.h", "infobar_positioner.h", ] } @@ -61,8 +63,10 @@ source_set("infobars_ui") { deps = [ ":public", "resources:infobar_downloading", + "resources:infobar_hide_password_icon", "resources:infobar_passwords_icon", "resources:infobar_popup_blocker", + "resources:infobar_reveal_password_icon", "resources:infobar_settings_icon", "resources:infobar_warning", "//base", @@ -70,7 +74,7 @@ source_set("infobars_ui") { "//components/strings", "//ios/chrome/app/theme:theme", "//ios/chrome/app/theme:theme_grit", - "//ios/chrome/browser/ui", + "//ios/chrome/browser/infobars:public", "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/fancy_ui", "//ios/chrome/browser/ui/fullscreen", @@ -94,10 +98,28 @@ source_set("unit_tests") { testonly = true sources = [ "confirm_infobar_view_unittest.mm", + "infobar_container_coordinator_unittest.mm", ] deps = [ + ":feature_flags", + ":infobars", ":infobars_ui", + ":public", + ":test_support", + "//base/test:test_support", + "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/infobars", + "//ios/chrome/browser/infobars:badge", + "//ios/chrome/browser/infobars:public", + "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/infobars/coordinators", + "//ios/chrome/browser/web_state_list", + "//ios/chrome/browser/web_state_list:test_support", + "//ios/chrome/test:test_support", + "//ios/web/public/test/fakes", + "//testing/gtest", "//testing/gtest", + "//third_party/ocmock", ] } diff --git a/chromium/ios/chrome/browser/ui/infobars/badge/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/badge/BUILD.gn new file mode 100644 index 00000000000..864ca3776d3 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/infobars/badge/BUILD.gn @@ -0,0 +1,15 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +source_set("badge") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "infobar_badge_button.h", + "infobar_badge_button.mm", + ] + deps = [ + "//ios/chrome/browser/ui/elements", + "//ios/chrome/browser/ui/util", + ] +} diff --git a/chromium/ios/chrome/browser/ui/infobars/banners/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/banners/BUILD.gn index cd02ebee5da..c5df288e02f 100644 --- a/chromium/ios/chrome/browser/ui/infobars/banners/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/infobars/banners/BUILD.gn @@ -12,7 +12,10 @@ source_set("banners") { deps = [ ":public", "//base", + "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser/infobars:public", "//ios/chrome/browser/ui/util", + "//ui/base", ] } @@ -21,6 +24,8 @@ source_set("public") { sources = [ "infobar_banner_constants.h", "infobar_banner_constants.mm", + "infobar_banner_interaction_delegate.h", + "infobar_banner_presentation_state.h", ] } @@ -32,6 +37,7 @@ source_set("unit_tests") { ] deps = [ ":banners", + "//ios/chrome/browser/infobars:public", "//ios/chrome/test:test_support", "//testing/gtest", "//third_party/ocmock", diff --git a/chromium/ios/chrome/browser/ui/infobars/coordinators/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/coordinators/BUILD.gn index 72091d07550..dcd02ea7355 100644 --- a/chromium/ios/chrome/browser/ui/infobars/coordinators/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/infobars/coordinators/BUILD.gn @@ -16,15 +16,22 @@ source_set("coordinators") { deps = [ "//base", "//components/infobars/core", + "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser/infobars:public", + "//ios/chrome/browser/infobars:public", + "//ios/chrome/browser/passwords:infobar_delegates", "//ios/chrome/browser/passwords:public", + "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/fullscreen", "//ios/chrome/browser/ui/infobars:infobars_ui", + "//ios/chrome/browser/ui/infobars:public", "//ios/chrome/browser/ui/infobars/banners", + "//ios/chrome/browser/ui/infobars/banners:public", "//ios/chrome/browser/ui/infobars/modals", "//ios/chrome/browser/ui/infobars/presentation", "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/util", + "//ui/base", ] } diff --git a/chromium/ios/chrome/browser/ui/infobars/modals/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/modals/BUILD.gn index 971e2ff22e3..0c4a739095b 100644 --- a/chromium/ios/chrome/browser/ui/infobars/modals/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/infobars/modals/BUILD.gn @@ -8,7 +8,7 @@ source_set("modals") { "infobar_modal_delegate.h", "infobar_modal_view_controller.h", "infobar_modal_view_controller.mm", - "infobar_password_modal_delegate", + "infobar_password_modal_delegate.h", "infobar_password_table_view_controller.h", "infobar_password_table_view_controller.mm", ] @@ -16,8 +16,11 @@ source_set("modals") { ":public", "//base", "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser/infobars:public", + "//ios/chrome/browser/passwords:public", "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/table_view:styler", + "//ios/chrome/browser/ui/util", "//ui/base", ] } diff --git a/chromium/ios/chrome/browser/ui/infobars/presentation/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/presentation/BUILD.gn index 6a639ce5e78..30a35c599f9 100644 --- a/chromium/ios/chrome/browser/ui/infobars/presentation/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/infobars/presentation/BUILD.gn @@ -14,6 +14,7 @@ source_set("presentation") { "infobar_banner_transition_driver.mm", "infobar_expand_banner_animator.h", "infobar_expand_banner_animator.mm", + "infobar_modal_positioner.h", "infobar_modal_presentation_controller.h", "infobar_modal_presentation_controller.mm", "infobar_modal_transition_driver.h", @@ -21,6 +22,7 @@ source_set("presentation") { ] deps = [ "//base", + "//ios/chrome/browser/ui/infobars/banners:public", "//ios/chrome/browser/ui/util", ] } diff --git a/chromium/ios/chrome/browser/ui/infobars/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/resources/BUILD.gn index 1da4e819014..87bd745fc09 100644 --- a/chromium/ios/chrome/browser/ui/infobars/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/infobars/resources/BUILD.gn @@ -40,6 +40,22 @@ imageset("infobar_passwords_icon") { ] } +imageset("infobar_reveal_password_icon") { + sources = [ + "infobar_reveal_password_icon.imageset/Contents.json", + "infobar_reveal_password_icon.imageset/infobar_reveal_password_icon@2x.png", + "infobar_reveal_password_icon.imageset/infobar_reveal_password_icon@3x.png", + ] +} + +imageset("infobar_hide_password_icon") { + sources = [ + "infobar_hide_password_icon.imageset/Contents.json", + "infobar_hide_password_icon.imageset/infobar_hide_password_icon@2x.png", + "infobar_hide_password_icon.imageset/infobar_hide_password_icon@3x.png", + ] +} + imageset("infobar_settings_icon") { sources = [ "infobar_settings_icon.imageset/Contents.json", diff --git a/chromium/ios/chrome/browser/ui/keyboard/BUILD.gn b/chromium/ios/chrome/browser/ui/keyboard/BUILD.gn index a8aef36ba8f..ef34f9555f9 100644 --- a/chromium/ios/chrome/browser/ui/keyboard/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/keyboard/BUILD.gn @@ -41,7 +41,6 @@ source_set("eg_tests") { "//ios/chrome/app/strings", "//ios/chrome/browser/ui/bookmarks:bookmarks_ui", "//ios/chrome/browser/ui/browser_view", - "//ios/chrome/browser/ui/ntp:ntp_controller", "//ios/chrome/browser/ui/popup_menu:constants", "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/util", diff --git a/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn b/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn index 40702c59137..3cc4c329bed 100644 --- a/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn @@ -39,16 +39,17 @@ source_set("location_bar") { "//ios/chrome/browser/browser_state:browser_state", "//ios/chrome/browser/geolocation:geolocation_internal", "//ios/chrome/browser/infobars:badge", + "//ios/chrome/browser/infobars:public", "//ios/chrome/browser/ntp", "//ios/chrome/browser/search_engines", "//ios/chrome/browser/ssl", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/elements", "//ios/chrome/browser/ui/fullscreen", "//ios/chrome/browser/ui/fullscreen:ui", "//ios/chrome/browser/ui/infobars:feature_flags", + "//ios/chrome/browser/ui/infobars/badge", "//ios/chrome/browser/ui/ntp:util", "//ios/chrome/browser/ui/omnibox:omnibox", "//ios/chrome/browser/ui/omnibox:omnibox_internal", @@ -66,11 +67,13 @@ source_set("location_bar") { "//ios/chrome/browser/web", "//ios/chrome/browser/web_state_list", "//ios/chrome/common:timing", + "//ios/chrome/common/ui_util", "//ios/public/provider/chrome/browser:browser", "//ios/public/provider/chrome/browser/voice", "//ios/third_party/material_components_ios", "//ios/third_party/material_roboto_font_loader_ios", "//ios/web/public:public", + "//ios/web/public/security", "//skia", "//third_party/google_toolbox_for_mac", "//ui/base", @@ -106,6 +109,7 @@ source_set("location_bar_model_delegate") { "//ios/chrome/browser/ssl", "//ios/chrome/browser/web_state_list", "//ios/web/public", + "//ios/web/public/security", ] libs = [ "UIKit.framework" ] } diff --git a/chromium/ios/chrome/browser/ui/main/BUILD.gn b/chromium/ios/chrome/browser/ui/main/BUILD.gn index 843a72292d7..9454e847658 100644 --- a/chromium/ios/chrome/browser/ui/main/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/main/BUILD.gn @@ -5,17 +5,13 @@ source_set("main") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ - "browser_coordinator.h", - "browser_coordinator.mm", "browser_interface_provider.h", "browser_view_wrangler.h", "browser_view_wrangler.mm", "bvc_container_view_controller.h", "bvc_container_view_controller.mm", - "view_controller_swapping.h", ] deps = [ - ":tab_switcher", "//base", "//components/translate/core/browser", "//ios/chrome/app/resources:launchscreen_xib", @@ -61,20 +57,6 @@ source_set("main") { libs = [ "UIKit.framework" ] } -source_set("tab_switcher") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "tab_switcher.h", - ] - deps = [ - "//base", - "//ios/chrome/browser/ui", - "//ios/chrome/browser/ui/commands", - "//ui/base", - "//url", - ] -} - source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true @@ -83,7 +65,6 @@ source_set("unit_tests") { ] deps = [ ":main", - ":tab_switcher", "//base", "//base/test:test_support", "//components/bookmarks/test", diff --git a/chromium/ios/chrome/browser/ui/ntp/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp/BUILD.gn index 7b4930f13a8..00c8f2f64fb 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_owning.h", ] configs += [ "//build/config/compiler:enable_arc" ] deps = [ @@ -34,39 +33,6 @@ source_set("coordinator") { ] } -source_set("ntp_controller") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "new_tab_page_controller.h", - "new_tab_page_controller.mm", - ] - deps = [ - ":ntp", - ":ntp_internal", - "//base", - "//components/prefs", - "//components/search_engines", - "//components/strings", - "//components/sync_sessions", - "//ios/chrome/app/strings", - "//ios/chrome/browser", - "//ios/chrome/browser/browser_state", - "//ios/chrome/browser/search_engines", - "//ios/chrome/browser/sync", - "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui", - "//ios/chrome/browser/ui/bookmarks", - "//ios/chrome/browser/ui/commands", - "//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/location_bar:notifications", - "//ios/chrome/browser/url_loading", - "//ios/public/provider/chrome/browser/voice", - "//ui/base", - ] -} - source_set("util") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ @@ -132,7 +98,6 @@ source_set("ntp_internal") { "//ios/chrome/browser/search_engines", "//ios/chrome/browser/suggestions", "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/bookmarks", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant", @@ -143,12 +108,14 @@ source_set("ntp_internal") { "//ios/chrome/browser/ui/overscroll_actions", "//ios/chrome/browser/ui/toolbar/buttons", "//ios/chrome/browser/ui/toolbar/public", + "//ios/chrome/browser/ui/util", "//ios/chrome/browser/url_loading", "//ios/chrome/browser/web_state_list", "//ios/chrome/common", "//ios/chrome/common/app_group", "//ios/chrome/common/favicon", "//ios/chrome/common/ntp_tile", + "//ios/chrome/common/ui_util", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/images", "//ios/public/provider/chrome/browser/ui", @@ -156,6 +123,7 @@ source_set("ntp_internal") { "//ios/third_party/material_components_ios", "//ios/third_party/material_roboto_font_loader_ios", "//ios/web", + "//ios/web/public/deprecated", "//net", "//skia", "//ui/base", @@ -180,7 +148,6 @@ source_set("unit_tests") { deps = [ ":coordinator", ":ntp", - ":ntp_controller", ":ntp_internal", "//base", "//base/test:test_support", @@ -201,7 +168,6 @@ source_set("unit_tests") { "//ios/chrome/browser/sessions", "//ios/chrome/browser/sessions:test_support", "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant", "//ios/chrome/browser/ui/content_suggestions:content_suggestions_ui", @@ -229,14 +195,13 @@ source_set("eg_tests") { "new_tab_page_egtest.mm", ] deps = [ - ":ntp_controller", "//base/test:test_support", "//components/strings", "//ios/chrome/app/strings", "//ios/chrome/browser", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant", + "//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", diff --git a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn index f791d273009..c298336a903 100644 --- a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn @@ -26,6 +26,41 @@ source_set("omnibox_popup_shared") { ] } +# This util file must be separate from the below +# omnibox_util file because it is used in showcase. This +# means that its dependencies should be limited, avoiding +# components code. +source_set("omnibox_suggestion_icon_util") { + configs += [ "//build/config/compiler:enable_arc" ] + + sources = [ + "omnibox_suggestion_icon_util.h", + "omnibox_suggestion_icon_util.mm", + ] + deps = [ + "resources:answer_calculator", + "resources:answer_conversion", + "resources:answer_dictionary", + "resources:answer_local_time", + "resources:answer_stock", + "resources:answer_sunrise", + "resources:answer_translation", + "resources:answer_when_is", + "resources:background_solid", + "resources:background_stroke", + "resources:favicon_fallback", + "resources:omnibox_completion_bookmark", + "resources:omnibox_completion_calculator", + "resources:omnibox_completion_default_favicon", + "resources:omnibox_completion_history", + "resources:omnibox_completion_search", + "resources:search", + "//base", + ] +} + +# See the comment above on omnibox_suggestion_icon_util +# for why these two targets are separated. source_set("omnibox_util") { configs += [ "//build/config/compiler:enable_arc" ] @@ -34,16 +69,18 @@ source_set("omnibox_util") { "omnibox_util.mm", ] deps = [ + ":omnibox_suggestion_icon_util", "resources:omnibox_background", - "resources:omnibox_clear_icon", "resources:omnibox_completion_bookmark", "resources:omnibox_completion_calculator", "resources:omnibox_completion_default_favicon", "resources:omnibox_completion_history", "resources:omnibox_completion_search", + "resources:search", "//base", "//components/omnibox/browser", "//components/security_state/core", + "//ios/chrome/browser/ui:feature_flags", ] public_deps = [ "//ios/chrome/app/theme", @@ -78,6 +115,7 @@ source_set("omnibox_internal") { ":omnibox", ":omnibox_popup_shared", ":omnibox_util", + "resources:omnibox_clear_icon", "resources:omnibox_transparent_background", "//base", "//components/favicon/ios", @@ -92,11 +130,11 @@ source_set("omnibox_internal") { "//ios/chrome/browser/bookmarks", "//ios/chrome/browser/bookmarks:bookmarks_utils", "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/favicon", "//ios/chrome/browser/net", "//ios/chrome/browser/prerender", "//ios/chrome/browser/search_engines", "//ios/chrome/browser/sessions", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/fullscreen", @@ -107,7 +145,9 @@ source_set("omnibox_internal") { "//ios/chrome/browser/ui/toolbar/public:feature_flags", "//ios/chrome/browser/ui/util", "//ios/chrome/common", + "//ios/chrome/common/favicon", "//ios/public/provider/chrome/browser", + "//ios/public/provider/chrome/browser/images", "//ios/third_party/material_roboto_font_loader_ios", "//ios/web", "//net", diff --git a/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn index 8be7717384b..2d60b347344 100644 --- a/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn @@ -22,11 +22,12 @@ source_set("popup") { "//components/image_fetcher/ios", "//components/omnibox/browser", "//components/open_from_clipboard", + "//components/search_engines", "//ios/chrome/app/strings", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/favicon", - "//ios/chrome/browser/ui", + "//ios/chrome/browser/search_engines", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/ntp:util", @@ -34,8 +35,10 @@ source_set("popup") { "//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/util", "//ios/chrome/browser/web_state_list:web_state_list", "//ios/chrome/common/favicon", + "//ios/chrome/common/ui_util", "//ios/web/public:public", "//net", "//ui/base", @@ -49,6 +52,9 @@ source_set("popup_ui") { "autocomplete_suggestion.h", "favicon_retriever.h", "image_retriever.h", + "omnibox_icon.h", + "omnibox_icon_view.h", + "omnibox_icon_view.mm", "omnibox_popup_base_view_controller+internal.h", "omnibox_popup_base_view_controller.h", "omnibox_popup_base_view_controller.mm", @@ -64,6 +70,8 @@ source_set("popup_ui") { "omnibox_popup_view_controller.mm", "self_sizing_table_view.h", "self_sizing_table_view.mm", + "simple_omnibox_icon.h", + "simple_omnibox_icon.mm", ] deps = [ "resources:omnibox_popup_tab_match", @@ -71,13 +79,19 @@ source_set("popup_ui") { "//components/omnibox/common", "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/app/theme", + "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/elements", + "//ios/chrome/browser/ui/ntp_tile_views", "//ios/chrome/browser/ui/omnibox:omnibox_popup_shared", + "//ios/chrome/browser/ui/omnibox:omnibox_suggestion_icon_util", "//ios/chrome/browser/ui/toolbar/buttons", "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/util", "//ios/chrome/common/ui_util", + "//ios/public/provider/chrome/browser", + "//ios/public/provider/chrome/browser/images", "//ui/base", "//url", ] @@ -88,20 +102,20 @@ source_set("popup_internal") { sources = [ "autocomplete_match_formatter.h", "autocomplete_match_formatter.mm", + "omnibox_icon_formatter.h", + "omnibox_icon_formatter.mm", ] deps = [ + ":popup_ui", "//base", "//components/omnibox/browser", "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/omnibox:omnibox_util", "//ios/chrome/browser/ui/util", "//ios/third_party/material_components_ios", ] - - # Temporary until ios_internal CL is submitted - public_deps = [ - ":popup_ui", - ] configs += [ "//build/config/compiler:enable_arc" ] } diff --git a/chromium/ios/chrome/browser/ui/omnibox/popup/shortcuts/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/popup/shortcuts/BUILD.gn index 1c45ca1460b..f6c50ef50ca 100644 --- a/chromium/ios/chrome/browser/ui/omnibox/popup/shortcuts/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/omnibox/popup/shortcuts/BUILD.gn @@ -46,7 +46,6 @@ source_set("shortcuts_internal") { "//components/reading_list/core", "//components/reading_list/ios", "//ios/chrome/browser/ntp_tiles", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/commands:commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/favicon", @@ -88,7 +87,6 @@ source_set("eg_tests") { "//components/strings", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/reading_list", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant", "//ios/chrome/browser/ui/omnibox:omnibox_popup_shared", diff --git a/chromium/ios/chrome/browser/ui/omnibox/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/resources/BUILD.gn index b6a4a1172ab..43c652a6ad9 100644 --- a/chromium/ios/chrome/browser/ui/omnibox/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/omnibox/resources/BUILD.gn @@ -75,3 +75,98 @@ imageset("omnibox_completion_search") { "omnibox_completion_search.imageset/omnibox_completion_search@3x.png", ] } + +imageset("answer_calculator") { + sources = [ + "answer_calculator.imageset/Contents.json", + "answer_calculator.imageset/answer_calculator@2x.png", + "answer_calculator.imageset/answer_calculator@3x.png", + ] +} + +imageset("answer_conversion") { + sources = [ + "answer_conversion.imageset/Contents.json", + "answer_conversion.imageset/answer_conversion@2x.png", + "answer_conversion.imageset/answer_conversion@3x.png", + ] +} + +imageset("answer_dictionary") { + sources = [ + "answer_dictionary.imageset/Contents.json", + "answer_dictionary.imageset/answer_dictionary@2x.png", + "answer_dictionary.imageset/answer_dictionary@3x.png", + ] +} + +imageset("answer_stock") { + sources = [ + "answer_stock.imageset/Contents.json", + "answer_stock.imageset/answer_stock@2x.png", + "answer_stock.imageset/answer_stock@3x.png", + ] +} + +imageset("answer_sunrise") { + sources = [ + "answer_sunrise.imageset/Contents.json", + "answer_sunrise.imageset/answer_sunrise@2x.png", + "answer_sunrise.imageset/answer_sunrise@3x.png", + ] +} +imageset("answer_local_time") { + sources = [ + "answer_local_time.imageset/Contents.json", + "answer_local_time.imageset/answer_local_time@2x.png", + "answer_local_time.imageset/answer_local_time@3x.png", + ] +} + +imageset("answer_when_is") { + sources = [ + "answer_when_is.imageset/Contents.json", + "answer_when_is.imageset/answer_when_is@2x.png", + "answer_when_is.imageset/answer_when_is@3x.png", + ] +} + +imageset("favicon_fallback") { + sources = [ + "favicon_fallback.imageset/Contents.json", + "favicon_fallback.imageset/favicon_fallback@2x.png", + "favicon_fallback.imageset/favicon_fallback@3x.png", + ] +} + +imageset("search") { + sources = [ + "search.imageset/Contents.json", + "search.imageset/search@2x.png", + "search.imageset/search@3x.png", + ] +} + +imageset("answer_translation") { + sources = [ + "answer_translation.imageset/Contents.json", + "answer_translation.imageset/answer_translation@2x.png", + "answer_translation.imageset/answer_translation@3x.png", + ] +} + +imageset("background_solid") { + sources = [ + "background_solid.imageset/Contents.json", + "background_solid.imageset/background_solid@2x.png", + "background_solid.imageset/background_solid@3x.png", + ] +} + +imageset("background_stroke") { + sources = [ + "background_stroke.imageset/Contents.json", + "background_stroke.imageset/background_stroke@2x.png", + "background_stroke.imageset/background_stroke@3x.png", + ] +} diff --git a/chromium/ios/chrome/browser/ui/overlays/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/BUILD.gn new file mode 100644 index 00000000000..f158aa40792 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/overlays/BUILD.gn @@ -0,0 +1,81 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +source_set("overlays") { + public = [ + "overlay_container_coordinator.h", + "overlay_coordinator_factory.h", + ] + sources = [ + "overlay_container_coordinator.mm", + "overlay_coordinator_factory+initialization.h", + "overlay_coordinator_factory.mm", + "overlay_presenter_ui_delegate_impl.h", + "overlay_presenter_ui_delegate_impl.mm", + "overlay_request_ui_state.h", + "overlay_request_ui_state.mm", + ] + + configs += [ "//build/config/compiler:enable_arc" ] + + friend = [ ":unit_tests" ] + + deps = [ + ":container_ui", + ":coordinators", + "//base", + "//ios/chrome/browser/main", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/ui/coordinators:chrome_coordinators", + "//ios/chrome/browser/ui/overlays/web_content_area", + "//ios/chrome/common/ui_util", + ] +} + +source_set("container_ui") { + sources = [ + "overlay_container_view_controller.h", + "overlay_container_view_controller.mm", + ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + "//base", + ] +} + +source_set("coordinators") { + sources = [ + "overlay_request_coordinator.h", + "overlay_request_coordinator.mm", + "overlay_ui_dismissal_delegate.h", + ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + "//base", + "//ios/chrome/browser/ui/coordinators:chrome_coordinators", + ] +} + +source_set("unit_tests") { + testonly = true + sources = [ + "overlay_request_ui_state_unittest.mm", + ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + ":coordinators", + ":overlays", + "//base/test:test_support", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/test", + "//ios/chrome/browser/ui/overlays/test", + "//testing/gtest", + ] +} diff --git a/chromium/ios/chrome/browser/ui/overlays/test/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/test/BUILD.gn new file mode 100644 index 00000000000..d5c019f5e10 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/overlays/test/BUILD.gn @@ -0,0 +1,21 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +source_set("test") { + testonly = true + sources = [ + "fake_overlay_request_coordinator.h", + "fake_overlay_request_coordinator.mm", + "fake_overlay_ui_dismissal_delegate.cc", + "fake_overlay_ui_dismissal_delegate.h", + ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + "//base", + "//ios/chrome/browser/ui/overlays:coordinators", + "//testing/gtest", + ] +} diff --git a/chromium/ios/chrome/browser/ui/overlays/web_content_area/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/web_content_area/BUILD.gn new file mode 100644 index 00000000000..937a52166d6 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/overlays/web_content_area/BUILD.gn @@ -0,0 +1,19 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +source_set("web_content_area") { + public = [ + "web_content_area_supported_overlay_coordinator_classes.h", + ] + sources = [ + "web_content_area_supported_overlay_coordinator_classes.mm", + ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + "//base", + "//ios/chrome/browser/ui/overlays:coordinators", + ] +} diff --git a/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn b/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn index 73d2858cfb6..f2fa8c19405 100644 --- a/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn @@ -23,7 +23,6 @@ source_set("overscroll_actions") { "//ios/chrome/app/strings:ios_chromium_strings_grit", "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/app/theme", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant", "//ios/chrome/browser/ui/fullscreen", diff --git a/chromium/ios/chrome/browser/ui/page_info/BUILD.gn b/chromium/ios/chrome/browser/ui/page_info/BUILD.gn index 84384265a4a..a86df900580 100644 --- a/chromium/ios/chrome/browser/ui/page_info/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/page_info/BUILD.gn @@ -23,13 +23,14 @@ source_set("page_info") { "//ios/chrome/app/theme", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/fancy_ui", "//ios/chrome/browser/ui/page_info/requirements", "//ios/chrome/browser/ui/popup_menu", + "//ios/chrome/browser/ui/util", "//ios/chrome/common", "//ios/web", + "//ios/web/public/security", "//ui/base", "//ui/gfx", "//url", @@ -50,7 +51,6 @@ source_set("coordinator") { "//ios/chrome/browser/browser_state", "//ios/chrome/browser/reading_list", "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/fullscreen:coordinators", diff --git a/chromium/ios/chrome/browser/ui/payments/BUILD.gn b/chromium/ios/chrome/browser/ui/payments/BUILD.gn index 4d3904678e7..e4cf8e750fd 100644 --- a/chromium/ios/chrome/browser/ui/payments/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/payments/BUILD.gn @@ -78,7 +78,6 @@ source_set("payments") { "//ios/chrome/browser/browser_state", "//ios/chrome/browser/payments", "//ios/chrome/browser/signin", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/autofill", "//ios/chrome/browser/ui/autofill:autofill_ui", "//ios/chrome/browser/ui/autofill/cells", @@ -89,8 +88,13 @@ source_set("payments") { "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/icons", "//ios/chrome/browser/ui/payments/cells", + "//ios/chrome/browser/ui/util", "//ios/third_party/material_roboto_font_loader_ios", - "//ios/web", + "//ios/web/common", + "//ios/web/public", + "//ios/web/public/deprecated", + "//ios/web/public/js_messaging", + "//ios/web/public/security", "//third_party/libaddressinput", "//third_party/libaddressinput:strings_grit", "//ui/base", @@ -155,7 +159,6 @@ source_set("payments_ui") { "//components/strings", "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/app/theme", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/autofill:autofill_ui", "//ios/chrome/browser/ui/autofill/cells", "//ios/chrome/browser/ui/collection_view", @@ -164,6 +167,7 @@ source_set("payments_ui") { "//ios/chrome/browser/ui/list_model", "//ios/chrome/browser/ui/material_components", "//ios/chrome/browser/ui/payments/cells", + "//ios/chrome/browser/ui/util", "//ios/third_party/material_components_ios", "//third_party/libaddressinput:strings_grit", "//ui/base", @@ -241,8 +245,9 @@ source_set("unit_tests") { "//ios/testing:ocmock_support", "//ios/third_party/material_components_ios", "//ios/web", + "//ios/web/public/deprecated:test_doubles", + "//ios/web/public/js_messaging", "//ios/web/public/test", - "//ios/web/public/test/fakes", "//services/identity/public/cpp:cpp", "//services/identity/public/cpp:test_support", "//testing/gmock", diff --git a/chromium/ios/chrome/browser/ui/payments/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/payments/cells/BUILD.gn index 176a4dc4a73..4dbfeae1b3f 100644 --- a/chromium/ios/chrome/browser/ui/payments/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/payments/cells/BUILD.gn @@ -25,10 +25,11 @@ source_set("cells") { deps = [ "//ios/chrome/app/theme", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/autofill:autofill_ui", "//ios/chrome/browser/ui/collection_view/cells", "//ios/chrome/browser/ui/colors", + "//ios/chrome/browser/ui/util", + "//ios/chrome/common/ui_util", "//ios/third_party/material_components_ios", "//ios/third_party/material_roboto_font_loader_ios", "//url/", diff --git a/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn index f06e19be0b2..eddff42c88c 100644 --- a/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn @@ -53,7 +53,6 @@ source_set("popup_menu") { "//ios/chrome/browser/reading_list", "//ios/chrome/browser/search_engines", "//ios/chrome/browser/translate", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/activity_services", "//ios/chrome/browser/ui/bookmarks", diff --git a/chromium/ios/chrome/browser/ui/popup_menu/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/cells/BUILD.gn index 95f5d3cc851..90a2c85cd0f 100644 --- a/chromium/ios/chrome/browser/ui/popup_menu/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/popup_menu/cells/BUILD.gn @@ -12,7 +12,6 @@ source_set("cells") { ] deps = [ "//base", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/favicon/resources:default_favicon", "//ios/chrome/browser/ui/popup_menu/public:ui_constants", "//ios/chrome/browser/ui/popup_menu/public/cells", diff --git a/chromium/ios/chrome/browser/ui/popup_menu/public/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/public/BUILD.gn index 6350c66b2c9..9cbdc1ce42d 100644 --- a/chromium/ios/chrome/browser/ui/popup_menu/public/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/popup_menu/public/BUILD.gn @@ -32,7 +32,6 @@ source_set("popup_menu_ui") { ":ui_constants", "//base", "//ios/chrome/app/strings", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/image_util", "//ios/chrome/browser/ui/popup_menu/public/", "//ios/chrome/browser/ui/popup_menu/public/cells", @@ -42,6 +41,7 @@ source_set("popup_menu_ui") { "//ios/chrome/browser/ui/table_view:styler", "//ios/chrome/browser/ui/util", "//ios/chrome/common", + "//ios/chrome/common/ui_util", "//ui/base", ] libs = [ diff --git a/chromium/ios/chrome/browser/ui/presenters/BUILD.gn b/chromium/ios/chrome/browser/ui/presenters/BUILD.gn index 76d19b09acc..585e8e5fdd4 100644 --- a/chromium/ios/chrome/browser/ui/presenters/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/presenters/BUILD.gn @@ -7,6 +7,8 @@ source_set("presenters") { sources = [ "contained_presenter.h", "contained_presenter_delegate.h", + "non_modal_view_controller_presenter.h", + "non_modal_view_controller_presenter.mm", "vertical_animation_container.h", "vertical_animation_container.mm", ] diff --git a/chromium/ios/chrome/browser/ui/print/BUILD.gn b/chromium/ios/chrome/browser/ui/print/BUILD.gn index 0a26766e09a..08e502d9476 100644 --- a/chromium/ios/chrome/browser/ui/print/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/print/BUILD.gn @@ -31,7 +31,7 @@ source_set("eg_tests") { ] deps = [ "//ios/chrome/app/strings", - "//ios/chrome/browser/ui", + "//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", diff --git a/chromium/ios/chrome/browser/ui/promos/BUILD.gn b/chromium/ios/chrome/browser/ui/promos/BUILD.gn index a6dfa0fd7b2..b6ea1578fa2 100644 --- a/chromium/ios/chrome/browser/ui/promos/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/promos/BUILD.gn @@ -12,6 +12,7 @@ source_set("promos") { deps = [ "//base", "//components/signin/core/browser", + "//components/unified_consent", "//components/version_info", "//ios/chrome/app:tests_hook", "//ios/chrome/app/strings", diff --git a/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn b/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn index 2644bfed327..7644148124d 100644 --- a/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn @@ -67,13 +67,13 @@ source_set("eg_tests") { "//ios/chrome/app:app_internal", "//ios/chrome/app/strings", "//ios/chrome/browser", - "//ios/chrome/browser/ui:ui", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/icons", "//ios/chrome/browser/ui/location_bar", "//ios/chrome/browser/ui/omnibox", "//ios/chrome/browser/ui/toolbar", "//ios/chrome/browser/ui/toolbar/public:feature_flags", + "//ios/chrome/browser/ui/util", "//ios/chrome/browser/url_loading", "//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 a9157fdbe0f..c8dd5059dc1 100644 --- a/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn @@ -42,7 +42,6 @@ source_set("reading_list") { "//ios/chrome/browser/metrics:metrics_internal", "//ios/chrome/browser/reading_list", "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", @@ -103,7 +102,6 @@ source_set("reading_list_ui") { "//components/url_formatter", "//ios/chrome/app/strings", "//ios/chrome/browser", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/keyboard", "//ios/chrome/browser/ui/list_model", @@ -147,7 +145,6 @@ source_set("unit_tests") { "//ios/chrome/browser/feature_engagement", "//ios/chrome/browser/reading_list", "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/static_content", "//ios/chrome/test/fakes", "//ios/web", @@ -174,7 +171,6 @@ source_set("eg_tests") { "//ios/chrome/app/theme:theme_grit", "//ios/chrome/browser", "//ios/chrome/browser/reading_list", - "//ios/chrome/browser/ui:ui", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/popup_menu:constants", "//ios/chrome/browser/ui/table_view", diff --git a/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn b/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn index c94b317b24a..aa5c206a2a8 100644 --- a/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn @@ -68,7 +68,6 @@ source_set("recent_tabs_ui") { "//ios/chrome/browser/sessions", "//ios/chrome/browser/sessions:serialisation", "//ios/chrome/browser/sync", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/authentication", "//ios/chrome/browser/ui/authentication/cells", "//ios/chrome/browser/ui/commands", @@ -102,6 +101,7 @@ source_set("unit_tests") { "//components/browser_sync", "//components/sync:test_support_model", "//components/sync_sessions", + "//components/sync_user_events", "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/signin", "//ios/chrome/browser/sync", @@ -128,11 +128,12 @@ source_set("eg_tests") { "//components/strings", "//ios/chrome/app:app_internal", "//ios/chrome/app/strings", - "//ios/chrome/browser/ui", "//ios/chrome/browser/tabs", "//ios/chrome/browser/ui/authentication:eg_test_support", + "//ios/chrome/browser/ui/history:constants", "//ios/chrome/browser/ui/history:history_ui", "//ios/chrome/browser/ui/table_view", + "//ios/chrome/browser/ui/util", "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", "//ios/public/provider/chrome/browser/signin:test_support", diff --git a/chromium/ios/chrome/browser/ui/sad_tab/BUILD.gn b/chromium/ios/chrome/browser/ui/sad_tab/BUILD.gn index 6193e4d5e02..a030ec73a92 100644 --- a/chromium/ios/chrome/browser/ui/sad_tab/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/sad_tab/BUILD.gn @@ -16,11 +16,11 @@ source_set("sad_tab") { "//components/strings", "//components/ui_metrics", "//ios/chrome/browser", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/overscroll_actions", "//ios/chrome/browser/ui/util", + "//ios/chrome/common/ui_util", "//ios/third_party/material_components_ios", "//ios/third_party/material_roboto_font_loader_ios", "//ios/web", diff --git a/chromium/ios/chrome/browser/ui/safe_mode/BUILD.gn b/chromium/ios/chrome/browser/ui/safe_mode/BUILD.gn index 8bd15874c19..902dfa39f07 100644 --- a/chromium/ios/chrome/browser/ui/safe_mode/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/safe_mode/BUILD.gn @@ -19,8 +19,8 @@ source_set("safe_mode") { "//ios/chrome/browser", "//ios/chrome/browser/crash_report", "//ios/chrome/browser/safe_mode", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/fancy_ui", + "//ios/chrome/browser/ui/util", "//ui/gfx", ] diff --git a/chromium/ios/chrome/browser/ui/settings/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/BUILD.gn index 45cb9df4c78..37e8617182e 100644 --- a/chromium/ios/chrome/browser/ui/settings/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/BUILD.gn @@ -82,6 +82,7 @@ source_set("settings") { "resources:settings_content_settings", "resources:settings_debug", "resources:settings_error", + "resources:settings_language_settings", "resources:settings_passwords", "resources:settings_payment_methods", "resources:settings_privacy", @@ -136,7 +137,6 @@ source_set("settings") { "//ios/chrome/browser/signin", "//ios/chrome/browser/sync", "//ios/chrome/browser/translate", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/authentication", @@ -159,6 +159,8 @@ source_set("settings") { "//ios/chrome/browser/ui/settings/cells:public", "//ios/chrome/browser/ui/settings/clear_browsing_data", "//ios/chrome/browser/ui/settings/google_services", + "//ios/chrome/browser/ui/settings/language:language", + "//ios/chrome/browser/ui/settings/language:language_ui", "//ios/chrome/browser/ui/settings/password", "//ios/chrome/browser/ui/settings/sync", "//ios/chrome/browser/ui/settings/sync/utils", @@ -173,6 +175,7 @@ source_set("settings") { "//ios/chrome/browser/web:web", "//ios/chrome/common", "//ios/chrome/common/favicon", + "//ios/chrome/common/ui_util", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/images", "//ios/public/provider/chrome/browser/mailto", @@ -215,7 +218,7 @@ source_set("test_support") { "//components/keyed_service/core", "//components/pref_registry", "//components/sync", - "//components/sync:test_support_driver", + "//components/sync:test_support", "//components/sync_preferences", "//components/sync_preferences:test_support", "//google_apis", @@ -225,7 +228,6 @@ source_set("test_support") { "//ios/chrome/browser/signin", "//ios/chrome/browser/signin:test_support", "//ios/chrome/browser/sync", - "//ios/chrome/browser/sync", "//ios/chrome/browser/sync:test_support", "//ios/chrome/browser/ui/settings/password", "//ios/chrome/browser/ui/table_view:test_support", @@ -292,6 +294,7 @@ source_set("unit_tests") { "//ios/chrome/browser/signin:test_support", "//ios/chrome/browser/sync", "//ios/chrome/browser/translate", + "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/collection_view", "//ios/chrome/browser/ui/collection_view:test_support", "//ios/chrome/browser/ui/collection_view/cells", @@ -347,6 +350,7 @@ source_set("eg_tests") { "//components/search_engines", "//components/strings", "//components/ukm/ios:features", + "//components/unified_consent", "//ios/chrome/app:app_internal", "//ios/chrome/app/strings", "//ios/chrome/app/theme", @@ -359,6 +363,7 @@ source_set("eg_tests") { "//ios/chrome/browser/search_engines", "//ios/chrome/browser/signin", "//ios/chrome/browser/sync", + "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/authentication:eg_test_support", "//ios/chrome/browser/ui/authentication/cells", "//ios/chrome/browser/ui/settings:test_support", diff --git a/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn index d83867302e7..bd79bcd5c49 100644 --- a/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn @@ -33,6 +33,7 @@ source_set("autofill") { "//ios/chrome/browser/ui/autofill/cells", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/settings:settings_root", + "//ios/chrome/browser/ui/settings/autofill/cells", "//ios/chrome/browser/ui/settings/cells", "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/table_view/cells", diff --git a/chromium/ios/chrome/browser/ui/settings/autofill/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/autofill/cells/BUILD.gn new file mode 100644 index 00000000000..5ce2403dedb --- /dev/null +++ b/chromium/ios/chrome/browser/ui/settings/autofill/cells/BUILD.gn @@ -0,0 +1,16 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +source_set("cells") { + sources = [ + "autofill_data_item.h", + "autofill_data_item.mm", + ] + + deps = [ + "//ios/chrome/browser/ui/table_view/cells", + ] + + configs += [ "//build/config/compiler:enable_arc" ] +} diff --git a/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn index 88f3b8e9648..c440a845e4c 100644 --- a/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn @@ -6,8 +6,6 @@ source_set("cells") { sources = [ "account_sign_in_item.h", "account_sign_in_item.mm", - "autofill_data_item.h", - "autofill_data_item.mm", "byo_textfield_item.h", "byo_textfield_item.mm", "clear_browsing_data_constants.h", @@ -46,13 +44,14 @@ source_set("cells") { "//components/strings", "//ios/chrome/app/strings", "//ios/chrome/browser/browsing_data", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/collection_view/cells", "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/icons", "//ios/chrome/browser/ui/table_view:styler", "//ios/chrome/browser/ui/table_view/cells", + "//ios/chrome/browser/ui/util", + "//ios/chrome/common/ui_util", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/signin", "//ios/third_party/material_roboto_font_loader_ios", @@ -77,7 +76,6 @@ source_set("public") { source_set("unit_tests") { testonly = true sources = [ - "autofill_data_item_unittest.mm", "byo_textfield_item_unittest.mm", "clear_browsing_data_item_unittest.mm", "copied_to_chrome_item_unittest.mm", diff --git a/chromium/ios/chrome/browser/ui/settings/cells/legacy/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/cells/legacy/BUILD.gn index f050c516c13..8fbee99ff1d 100644 --- a/chromium/ios/chrome/browser/ui/settings/cells/legacy/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/cells/legacy/BUILD.gn @@ -11,10 +11,11 @@ source_set("legacy") { deps = [ "//components/strings", "//ios/chrome/app/strings", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/collection_view/cells", "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/icons", + "//ios/chrome/browser/ui/util", + "//ios/chrome/common/ui_util", "//ios/third_party/material_roboto_font_loader_ios", "//ui/base", ] diff --git a/chromium/ios/chrome/browser/ui/settings/clear_browsing_data/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/clear_browsing_data/BUILD.gn index e66362c6159..1fe6f1de309 100644 --- a/chromium/ios/chrome/browser/ui/settings/clear_browsing_data/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/clear_browsing_data/BUILD.gn @@ -5,6 +5,8 @@ source_set("clear_browsing_data") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ + "browsing_data_counter_wrapper_producer.h", + "browsing_data_counter_wrapper_producer.mm", "clear_browsing_data_collection_view_controller.h", "clear_browsing_data_collection_view_controller.mm", "clear_browsing_data_consumer.h", @@ -27,6 +29,7 @@ source_set("clear_browsing_data") { "//components/browsing_data/core", "//components/feature_engagement/public", "//components/history/core/browser", + "//components/prefs/ios", "//components/strings", "//ios/chrome/app/strings", "//ios/chrome/browser", @@ -69,12 +72,13 @@ source_set("unit_tests") { ] deps = [ ":clear_browsing_data", + ":test_support", "//base", "//base/test:test_support", "//components/browsing_data/core", "//components/pref_registry", "//components/prefs", - "//components/sync:test_support_driver", + "//components/sync:test_support", "//components/sync_preferences", "//components/sync_preferences:test_support", "//ios/chrome/app/strings", @@ -82,6 +86,7 @@ source_set("unit_tests") { "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/browsing_data:counters", "//ios/chrome/browser/browsing_data:feature_flags", + "//ios/chrome/browser/browsing_data:test_support", "//ios/chrome/browser/prefs:browser_prefs", "//ios/chrome/browser/signin:test_support", "//ios/chrome/browser/sync", @@ -99,6 +104,19 @@ source_set("unit_tests") { ] } +source_set("test_support") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ + "fake_browsing_data_counter_wrapper_producer.h", + "fake_browsing_data_counter_wrapper_producer.mm", + ] + deps = [ + ":clear_browsing_data", + "//base", + ] +} + source_set("eg_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true diff --git a/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn index 462a1bdbebe..95630840dc1 100644 --- a/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn @@ -11,8 +11,6 @@ source_set("google_services") { "advanced_signin_settings_coordinator.mm", "advanced_signin_settings_navigation_controller.h", "advanced_signin_settings_navigation_controller.mm", - "google_services_navigation_coordinator.h", - "google_services_navigation_coordinator.mm", "google_services_settings_command_handler.h", "google_services_settings_consumer.h", "google_services_settings_coordinator.h", @@ -90,6 +88,7 @@ source_set("eg_tests") { "//components/browser_sync", "//components/strings", "//components/sync", + "//components/unified_consent", "//ios/chrome/app/strings", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", @@ -117,6 +116,7 @@ source_set("unified_consent_eg_tests") { "//base", "//base/test:test_support", "//components/prefs", + "//components/unified_consent", "//ios/chrome/app:app_internal", "//ios/chrome/app/strings:ios_chromium_strings_grit", "//ios/chrome/app/strings:ios_strings_grit", diff --git a/chromium/ios/chrome/browser/ui/settings/language/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/language/BUILD.gn new file mode 100644 index 00000000000..c3d15652da2 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/settings/language/BUILD.gn @@ -0,0 +1,57 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +source_set("language") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "language_settings_mediator.h", + "language_settings_mediator.mm", + ] + deps = [ + ":language_ui", + "//components/language/core/browser", + "//components/language/core/common", + "//components/prefs", + "//components/prefs/ios", + "//components/translate/core/browser", + "//ios/chrome/app/strings:ios_strings", + "//ios/chrome/browser", + "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/language", + "//ios/chrome/browser/translate", + "//ios/chrome/browser/ui/settings/language/cells", + "//ios/chrome/browser/ui/settings/utils", + "//ui/base", + ] +} + +source_set("language_ui") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "add_language_table_view_controller.h", + "add_language_table_view_controller.mm", + "language_details_table_view_controller.h", + "language_details_table_view_controller.mm", + "language_settings_commands.h", + "language_settings_consumer.h", + "language_settings_data_source.h", + "language_settings_histograms.h", + "language_settings_table_view_controller.h", + "language_settings_table_view_controller.mm", + ] + deps = [ + "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/browser/ui/list_model", + "//ios/chrome/browser/ui/settings:settings_root", + "//ios/chrome/browser/ui/settings/cells", + "//ios/chrome/browser/ui/settings/cells:public", + "//ios/chrome/browser/ui/settings/language/cells", + "//ios/chrome/browser/ui/table_view", + "//ios/chrome/browser/ui/table_view/cells", + "//ios/chrome/browser/ui/util", + "//ios/chrome/common/ui_util", + "//ui/base", + ] +} diff --git a/chromium/ios/chrome/browser/ui/settings/language/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/language/cells/BUILD.gn new file mode 100644 index 00000000000..4df69d83f8f --- /dev/null +++ b/chromium/ios/chrome/browser/ui/settings/language/cells/BUILD.gn @@ -0,0 +1,14 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +source_set("cells") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "language_item.h", + "language_item.mm", + ] + deps = [ + "//ios/chrome/browser/ui/table_view/cells", + ] +} diff --git a/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn index bdad55e3afd..bb1a3149232 100644 --- a/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn @@ -94,6 +94,14 @@ imageset("settings_debug") { ] } +imageset("settings_language_settings") { + sources = [ + "settings_language_settings.imageset/Contents.json", + "settings_language_settings.imageset/settings_language_settings@2x.png", + "settings_language_settings.imageset/settings_language_settings@3x.png", + ] +} + imageset("settings_passwords") { sources = [ "settings_passwords.imageset/Contents.json", diff --git a/chromium/ios/chrome/browser/ui/settings/sync/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/sync/BUILD.gn index 8b1ae979208..5f17b99985e 100644 --- a/chromium/ios/chrome/browser/ui/settings/sync/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/sync/BUILD.gn @@ -68,10 +68,11 @@ source_set("unit_tests") { "//components/autofill/core/common", "//components/google/core/common", "//components/strings", - "//components/sync:test_support_driver", + "//components/sync:test_support", "//components/sync_preferences", "//components/sync_preferences:test_support", "//components/unified_consent", + "//components/unified_consent:test_support", "//ios/chrome/app/strings", "//ios/chrome/browser", "//ios/chrome/browser", 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 b08652bd2cd..dfd04004059 100644 --- a/chromium/ios/chrome/browser/ui/settings/sync/utils/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/sync/utils/BUILD.gn @@ -20,6 +20,7 @@ source_set("utils") { "//components/signin/core/browser", "//components/strings", "//components/sync", + "//components/unified_consent", "//google_apis", "//ios/chrome/app/strings", "//ios/chrome/browser/browser_state", diff --git a/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn b/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn index 3a7827d1559..c9907e2f534 100644 --- a/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn @@ -29,7 +29,6 @@ source_set("side_swipe") { "//ios/chrome/browser/reading_list", "//ios/chrome/browser/snapshots", "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/elements", "//ios/chrome/browser/ui/fullscreen", @@ -38,9 +37,11 @@ source_set("side_swipe") { "//ios/chrome/browser/ui/tab_grid/grid:grid_ui", "//ios/chrome/browser/ui/tabs/requirements", "//ios/chrome/browser/ui/toolbar/public", + "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web", "//ios/chrome/browser/web_state_list", "//ios/chrome/common", + "//ios/chrome/common/ui_util", "//ios/web/common", "//ui/base", "//url", diff --git a/chromium/ios/chrome/browser/ui/signin_interaction/BUILD.gn b/chromium/ios/chrome/browser/ui/signin_interaction/BUILD.gn index 0d48100f381..ccd205bf25b 100644 --- a/chromium/ios/chrome/browser/ui/signin_interaction/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/signin_interaction/BUILD.gn @@ -29,25 +29,49 @@ source_set("signin_interaction") { ] } +source_set("eg_test_support") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ + "signin_interaction_controller_egtest_util.h", + "signin_interaction_controller_egtest_util.mm", + ] + + deps = [ + "//base", + "//base/test:test_support", + "//components/unified_consent", + "//ios/chrome/app/strings", + "//ios/chrome/browser/ui/authentication:eg_test_support", + "//ios/chrome/test/app:test_support", + "//ios/chrome/test/earl_grey:test_support", + "//ios/public/provider/chrome/browser/signin:test_support", + "//ios/testing/earl_grey:earl_grey_support", + ] +} + source_set("eg_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ "signin_interaction_controller_egtest.mm", + "signin_interaction_controller_unity_disabled_egtest.mm", ] deps = [ + ":eg_test_support", "//base", "//base/test:test_support", + "//components/unified_consent", "//ios/chrome/app/strings", "//ios/chrome/browser", "//ios/chrome/browser/signin", - "//ios/chrome/browser/ui", + "//ios/chrome/browser/ui/authentication", "//ios/chrome/browser/ui/authentication:eg_test_support", "//ios/chrome/browser/ui/authentication/cells", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant", - "//ios/chrome/browser/ui/ntp:ntp_controller", "//ios/chrome/browser/ui/settings", + "//ios/chrome/browser/ui/util", "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", "//ios/public/provider/chrome/browser/signin:test_support", @@ -61,19 +85,45 @@ source_set("unity_eg_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ + "signin_interaction_controller_egtest.mm", "signin_interaction_controller_unity_egtest.mm", ] deps = [ + ":eg_test_support", "//base", "//base/test:test_support", "//components/unified_consent", + "//ios/chrome/app/strings", "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser", + "//ios/chrome/browser/signin", + "//ios/chrome/browser/ui/authentication", "//ios/chrome/browser/ui/authentication:eg_test_support", + "//ios/chrome/browser/ui/authentication/cells", "//ios/chrome/browser/ui/authentication/unified_consent/identity_chooser:identity_chooser_ui", + "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant", + "//ios/chrome/browser/ui/settings", + "//ios/chrome/browser/ui/util", + "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", "//ios/public/provider/chrome/browser/signin:test_support", "//ios/testing/earl_grey:earl_grey_support", + "//ios/third_party/earl_grey:earl_grey+link", "//ui/base", ] libs = [ "XCTest.framework" ] } + +source_set("unified_consent_enabled_hooks") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ + "unified_consent_enabled_egtests_hook.mm", + ] + deps = [ + "//components/unified_consent", + "//components/unified_consent:test_support", + "//ios/chrome/app:tests_hook", + ] +} diff --git a/chromium/ios/chrome/browser/ui/static_content/BUILD.gn b/chromium/ios/chrome/browser/ui/static_content/BUILD.gn index d0a03523617..e97a092a882 100644 --- a/chromium/ios/chrome/browser/ui/static_content/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/static_content/BUILD.gn @@ -13,9 +13,8 @@ source_set("static_content") { deps = [ "//base", "//ios/chrome/browser/browser_state", - "//ios/chrome/browser/ui", "//ios/chrome/browser/url_loading", - "//ios/web", + "//ios/web/public/deprecated", "//net", "//ui/base", ] @@ -34,10 +33,9 @@ source_set("unit_tests") { "//base/test:test_support", "//ios/chrome/app/strings", "//ios/chrome/browser/browser_state:test_support", - "//ios/chrome/browser/ui", "//ios/chrome/browser/url_loading", "//ios/testing:ocmock_support", - "//ios/web", + "//ios/web/public/deprecated", "//ios/web/public/test", "//ios/web/public/test/fakes", "//net", diff --git a/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn index 836814a9715..316e67c85e6 100644 --- a/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn @@ -12,6 +12,8 @@ source_set("tab_grid") { "tab_grid_coordinator.mm", "tab_grid_mediator.h", "tab_grid_mediator.mm", + "tab_switcher.h", + "view_controller_swapping.h", ] configs += [ "//build/config/compiler:enable_arc" ] @@ -28,13 +30,11 @@ source_set("tab_grid") { "//ios/chrome/browser/sessions:serialisation", "//ios/chrome/browser/snapshots", "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//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/url_loading", @@ -42,6 +42,7 @@ source_set("tab_grid") { "//ios/chrome/browser/web_state_list", "//ios/chrome/browser/web_state_list/web_usage_enabler", "//ios/web", + "//ui/base", "//ui/gfx", ] } @@ -108,8 +109,6 @@ source_set("unit_tests") { "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/ntp", "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui:feature_flags", - "//ios/chrome/browser/ui/main:tab_switcher", "//ios/chrome/browser/web", "//ios/chrome/browser/web:test_support", "//ios/chrome/browser/web_state_list", @@ -165,14 +164,3 @@ source_set("eg_tests") { ] libs = [ "XCTest.framework" ] } - -source_set("hooks") { - configs += [ "//build/config/compiler:enable_arc" ] - testonly = true - sources = [ - "tab_grid_egtests_hook.mm", - ] - deps = [ - "//ios/chrome/app:tests_hook", - ] -} diff --git a/chromium/ios/chrome/browser/ui/table_view/BUILD.gn b/chromium/ios/chrome/browser/ui/table_view/BUILD.gn index 69a9ebfdaef..ffe51bf3578 100644 --- a/chromium/ios/chrome/browser/ui/table_view/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/table_view/BUILD.gn @@ -71,9 +71,9 @@ source_set("views") { ] deps = [ "//base", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/material_components", + "//ios/chrome/browser/ui/util", "//ios/third_party/material_components_ios", ] } diff --git a/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn index a559b47d669..e64a21ef968 100644 --- a/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn @@ -24,6 +24,8 @@ source_set("cells") { "table_view_item.mm", "table_view_link_header_footer_item.h", "table_view_link_header_footer_item.mm", + "table_view_multi_detail_text_item.h", + "table_view_multi_detail_text_item.mm", "table_view_text_button_item.h", "table_view_text_button_item.mm", "table_view_text_edit_item.h", @@ -48,6 +50,7 @@ source_set("cells") { "//base:i18n", "//ios/chrome/app/strings", "//ios/chrome/browser/ui/colors:colors", + "//ios/chrome/browser/ui/elements", "//ios/chrome/browser/ui/list_model", "//ios/chrome/browser/ui/settings/cells:public", "//ios/chrome/browser/ui/table_view:styler", @@ -70,6 +73,7 @@ source_set("unit_tests") { "table_view_header_footer_item_unittest.mm", "table_view_image_item_unittest.mm", "table_view_item_unittest.mm", + "table_view_multi_detail_text_item_unittest.mm", "table_view_text_button_item_unittest.mm", "table_view_text_edit_item_unittest.mm", "table_view_text_header_footer_item_unittest.mm", diff --git a/chromium/ios/chrome/browser/ui/tabs/BUILD.gn b/chromium/ios/chrome/browser/ui/tabs/BUILD.gn index 9e6952066fd..9b5ffedbe60 100644 --- a/chromium/ios/chrome/browser/ui/tabs/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/tabs/BUILD.gn @@ -45,7 +45,6 @@ source_set("tabs") { "//ios/chrome/browser/browser_state", "//ios/chrome/browser/drag_and_drop", "//ios/chrome/browser/snapshots", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/bubble", "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/commands", @@ -62,6 +61,7 @@ source_set("tabs") { "//ios/chrome/browser/web_state_list", "//ios/chrome/common", "//ios/chrome/common:common_extension", + "//ios/chrome/common/ui_util", "//ios/third_party/material_components_ios", "//ios/web", "//third_party/google_toolbox_for_mac", @@ -100,7 +100,7 @@ source_set("unit_tests") { "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/sessions:test_support", "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui", + "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web_state_list", "//ios/chrome/browser/web_state_list:test_support", "//ios/web/public", @@ -121,7 +121,7 @@ source_set("eg_tests") { ":tabs", "//ios/chrome/app/strings", "//ios/chrome/browser", - "//ios/chrome/browser/ui", + "//ios/chrome/browser/ui/util", "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", "//ios/third_party/earl_grey:earl_grey+link", diff --git a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn index 775ae4b622f..b75aa7e19ef 100644 --- a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn @@ -33,7 +33,6 @@ source_set("toolbar") { "//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/commands", @@ -50,6 +49,7 @@ source_set("toolbar") { "//ios/chrome/browser/ui/toolbar/buttons", "//ios/chrome/browser/ui/toolbar/keyboard_assist", "//ios/chrome/browser/ui/toolbar/public", + "//ios/chrome/browser/ui/util", "//ios/chrome/browser/ui/voice", "//ios/chrome/browser/web_state_list", "//ios/chrome/common", @@ -84,7 +84,6 @@ source_set("toolbar_ui") { deps = [ "//base", "//ios/chrome/app/strings", - "//ios/chrome/browser/ui:ui", "//ios/chrome/browser/ui/activity_services/requirements", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/fullscreen:ui", @@ -160,11 +159,9 @@ source_set("eg_tests") { "//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", diff --git a/chromium/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn index 5697cdaf6ec..3883d929022 100644 --- a/chromium/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn @@ -36,12 +36,12 @@ source_set("buttons") { "//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/public", "//ios/chrome/browser/ui/toolbar/public:feature_flags", "//ios/chrome/browser/ui/util", + "//ios/chrome/common/ui_util", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/images", "//ios/third_party/material_components_ios", diff --git a/chromium/ios/chrome/browser/ui/toolbar/fullscreen/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/fullscreen/BUILD.gn index 92410e0ff71..115b48942f3 100644 --- a/chromium/ios/chrome/browser/ui/toolbar/fullscreen/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/toolbar/fullscreen/BUILD.gn @@ -49,9 +49,9 @@ source_set("unit_tests") { "//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/ui/util", "//ios/chrome/browser/web_state_list", "//ios/chrome/browser/web_state_list:test_support", "//ios/chrome/test:test_support", diff --git a/chromium/ios/chrome/browser/ui/toolbar/keyboard_assist/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/keyboard_assist/BUILD.gn index 951b9e3bf9e..69c4f7795fb 100644 --- a/chromium/ios/chrome/browser/ui/toolbar/keyboard_assist/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/toolbar/keyboard_assist/BUILD.gn @@ -25,12 +25,12 @@ source_set("keyboard_assist") { "//base:i18n", "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/location_bar:constants", "//ios/chrome/browser/ui/omnibox:omnibox_internal", "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/util/", + "//ios/chrome/common/ui_util", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/voice", "//ui/base", diff --git a/chromium/ios/chrome/browser/ui/toolbar/public/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/public/BUILD.gn index 3556fc9f672..093250ca7b9 100644 --- a/chromium/ios/chrome/browser/ui/toolbar/public/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/toolbar/public/BUILD.gn @@ -19,11 +19,11 @@ source_set("public") { deps = [ ":feature_flags", "//base", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/activity_services/requirements", "//ios/chrome/browser/ui/bubble", "//ios/chrome/browser/ui/fullscreen:ui", "//ios/chrome/browser/ui/ntp", + "//ios/chrome/browser/ui/util", "//ios/public/provider/chrome/browser/voice", ] } diff --git a/chromium/ios/chrome/browser/ui/translate/BUILD.gn b/chromium/ios/chrome/browser/ui/translate/BUILD.gn index ab67d428dc2..5bcf3107edd 100644 --- a/chromium/ios/chrome/browser/ui/translate/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/translate/BUILD.gn @@ -92,8 +92,8 @@ source_set("unit_tests") { "//ios/chrome/browser/ui/translate/cells", "//ios/chrome/browser/web_state_list", "//ios/chrome/browser/web_state_list:test_support", + "//ios/web/public/deprecated:test_doubles", "//ios/web/public/test", - "//ios/web/public/test/fakes", "//skia", "//testing/gmock", "//testing/gtest", diff --git a/chromium/ios/chrome/browser/ui/webui/BUILD.gn b/chromium/ios/chrome/browser/ui/webui/BUILD.gn index 9191715cb7d..634b672ce40 100644 --- a/chromium/ios/chrome/browser/ui/webui/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/webui/BUILD.gn @@ -63,12 +63,13 @@ source_set("webui") { "//ios/chrome/browser/passwords", "//ios/chrome/browser/suggestions", "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui", + "//ios/chrome/browser/ui/util", "//ios/chrome/browser/ui/util:terms_util", "//ios/chrome/browser/web:java_script_console", "//ios/chrome/browser/web_state_list", "//ios/chrome/common", - "//ios/web", + "//ios/web/public/js_messaging", + "//ios/web/public/webui", "//net", "//services/service_manager/public/cpp", "//third_party/brotli:dec", @@ -101,7 +102,7 @@ source_set("webui_internal") { "//ios/chrome/browser/ui/webui/net_export", "//ios/chrome/browser/ui/webui/sync_internals", "//ios/chrome/browser/ui/webui/translate_internals", - "//ios/web", + "//ios/web/public/webui", "//services/identity/public/cpp", "//url", ] diff --git a/chromium/ios/chrome/browser/ui/webui/gcm/BUILD.gn b/chromium/ios/chrome/browser/ui/webui/gcm/BUILD.gn index 12db2649c51..c9884047c58 100644 --- a/chromium/ios/chrome/browser/ui/webui/gcm/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/webui/gcm/BUILD.gn @@ -14,6 +14,6 @@ source_set("gcm") { "//ios/chrome/browser", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/gcm", - "//ios/web", + "//ios/web/public/webui", ] } diff --git a/chromium/ios/chrome/browser/ui/webui/net_export/BUILD.gn b/chromium/ios/chrome/browser/ui/webui/net_export/BUILD.gn index 25d8f49a18a..44de19971cd 100644 --- a/chromium/ios/chrome/browser/ui/webui/net_export/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/webui/net_export/BUILD.gn @@ -17,7 +17,7 @@ source_set("net_export") { "//ios/chrome/browser/browser_state", "//ios/chrome/browser/webui", "//ios/chrome/common:common", - "//ios/web", - "//net:net", + "//ios/web/public/webui", + "//net", ] } diff --git a/chromium/ios/chrome/browser/ui/webui/sync_internals/BUILD.gn b/chromium/ios/chrome/browser/ui/webui/sync_internals/BUILD.gn index bbfb58e1877..e9028adfbee 100644 --- a/chromium/ios/chrome/browser/ui/webui/sync_internals/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/webui/sync_internals/BUILD.gn @@ -20,6 +20,6 @@ source_set("sync_internals") { "//ios/chrome/browser/signin", "//ios/chrome/browser/sync", "//ios/chrome/common", - "//ios/web", + "//ios/web/public/webui", ] } diff --git a/chromium/ios/chrome/browser/ui/webui/translate_internals/BUILD.gn b/chromium/ios/chrome/browser/ui/webui/translate_internals/BUILD.gn index 0771ed4698a..dd5c8df051f 100644 --- a/chromium/ios/chrome/browser/ui/webui/translate_internals/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/webui/translate_internals/BUILD.gn @@ -20,6 +20,6 @@ source_set("translate_internals") { "//ios/chrome/browser/tabs", "//ios/chrome/browser/translate", "//ios/chrome/browser/web_state_list", - "//ios/web/public", + "//ios/web/public/webui", ] } diff --git a/chromium/ios/chrome/browser/url_loading/BUILD.gn b/chromium/ios/chrome/browser/url_loading/BUILD.gn index ffb5bf39cad..abfc2bf4102 100644 --- a/chromium/ios/chrome/browser/url_loading/BUILD.gn +++ b/chromium/ios/chrome/browser/url_loading/BUILD.gn @@ -7,6 +7,8 @@ source_set("url_loading") { sources = [ "app_url_loading_service.h", "app_url_loading_service.mm", + "image_search_param_generator.h", + "image_search_param_generator.mm", "test_app_url_loading_service.h", "test_app_url_loading_service.mm", "test_url_loading_service.h", @@ -29,6 +31,7 @@ source_set("url_loading") { deps = [ "//base", "//components/keyed_service/ios", + "//components/search_engines", "//components/sessions", "//ios/chrome/app:mode", "//ios/chrome/browser", @@ -39,7 +42,6 @@ source_set("url_loading") { "//ios/chrome/browser/sessions", "//ios/chrome/browser/snapshots", "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/ntp:util", "//ios/chrome/browser/web", @@ -54,6 +56,7 @@ source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ + "image_search_param_generator_unittest.mm", "url_loading_service_unittest.mm", ] deps = [ @@ -64,6 +67,7 @@ source_set("unit_tests") { "//ios/chrome/browser/browser_state", "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/main:test_support", + "//ios/chrome/browser/search_engines", "//ios/chrome/browser/tabs", "//ios/chrome/browser/web", "//ios/chrome/browser/web:web_internal", diff --git a/chromium/ios/chrome/browser/voice/BUILD.gn b/chromium/ios/chrome/browser/voice/BUILD.gn index ab2dda51253..d59fedf99f2 100644 --- a/chromium/ios/chrome/browser/voice/BUILD.gn +++ b/chromium/ios/chrome/browser/voice/BUILD.gn @@ -59,6 +59,7 @@ source_set("tts") { "//ios/chrome/browser/browser_state", "//ios/public/provider/chrome/browser/voice", "//ios/web", + "//ios/web/public/deprecated", "//net", "//third_party/google_toolbox_for_mac", "//url", diff --git a/chromium/ios/chrome/browser/web/BUILD.gn b/chromium/ios/chrome/browser/web/BUILD.gn index cd872c4f58e..3677cadaecf 100644 --- a/chromium/ios/chrome/browser/web/BUILD.gn +++ b/chromium/ios/chrome/browser/web/BUILD.gn @@ -40,7 +40,6 @@ source_set("web") { "//ios/chrome/browser/browser_state", "//ios/chrome/browser/ntp", "//ios/chrome/browser/snapshots", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/elements", "//ios/chrome/browser/ui/fullscreen", @@ -49,6 +48,7 @@ source_set("web") { "//ios/net", "//ios/web", "//ios/web/common", + "//third_party/zlib/google:compression_utils", "//ui/base", "//url", ] @@ -65,6 +65,7 @@ source_set("tab_id_tab_helper") { deps = [ "//base", "//ios/web/public", + "//ios/web/public/session", ] configs += [ "//build/config/compiler:enable_arc" ] } @@ -194,6 +195,7 @@ source_set("java_script_console") { deps = [ "//base", "//ios/web/public", + "//ios/web/public/js_messaging", ] libs = [ "Foundation.framework" ] } @@ -301,7 +303,6 @@ source_set("unit_tests_internal") { "//ios/chrome/browser/find_in_page", "//ios/chrome/browser/infobars", "//ios/chrome/browser/passwords", - "//ios/chrome/browser/ui", "//ios/chrome/browser/web", "//ios/chrome/test/fakes", "//ios/web", @@ -316,6 +317,7 @@ source_set("unit_tests_internal") { source_set("eg_tests") { configs += [ "//build/config/compiler:enable_arc" ] + defines = [ "CHROME_EARL_GREY_1" ] testonly = true sources = [ "browsing_egtest.mm", @@ -343,9 +345,10 @@ source_set("eg_tests") { "//ios/chrome/app/strings", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", - "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/popup_menu:constants", + "//ios/chrome/browser/ui/util", + "//ios/chrome/test:eg_test_support", "//ios/chrome/test:test_support", "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", @@ -370,6 +373,33 @@ source_set("eg_tests") { ] } +source_set("eg2_tests") { + defines = [ "CHROME_EARL_GREY_2" ] + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + testonly = true + + sources = [] + + deps = [ + "//components/content_settings/core/common", + "//ios/chrome/test/earl_grey:eg_test_support+eg2", + "//ios/net:test_support", + "//ios/testing:embedded_test_server_support", + "//ios/testing/earl_grey:eg_test_support+eg2", + "//ios/third_party/earl_grey2:test_lib", + "//ios/web/public/test:element_selector", + "//ios/web/public/test/http_server", + "//net:test_support", + "//ui/base", + "//url", + ] + + libs = [ "UIKit.framework" ] +} + source_set("perf_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true diff --git a/chromium/ios/chrome/browser/web_state_list/BUILD.gn b/chromium/ios/chrome/browser/web_state_list/BUILD.gn index 288f5964632..92a391b0b92 100644 --- a/chromium/ios/chrome/browser/web_state_list/BUILD.gn +++ b/chromium/ios/chrome/browser/web_state_list/BUILD.gn @@ -11,6 +11,8 @@ source_set("web_state_list") { "web_state_list.h", "web_state_list.mm", "web_state_list_delegate.h", + "web_state_list_favicon_driver_observer.h", + "web_state_list_favicon_driver_observer.mm", "web_state_list_metrics_observer.h", "web_state_list_metrics_observer.mm", "web_state_list_observer.h", @@ -26,8 +28,11 @@ source_set("web_state_list") { ] deps = [ "//base", + "//components/favicon/core", + "//components/favicon/ios", "//ios/chrome/browser/sessions:serialisation", "//ios/web", + "//ios/web/public/session", ] libs = [ "Foundation.framework" ] configs += [ "//build/config/compiler:enable_arc" ] @@ -51,6 +56,7 @@ source_set("unit_tests") { sources = [ "active_web_state_observation_forwarder_unittest.mm", "all_web_state_observation_forwarder_unittest.mm", + "web_state_list_favicon_driver_observer_unittest.mm", "web_state_list_order_controller_unittest.mm", "web_state_list_serialization_unittest.mm", "web_state_list_unittest.mm", @@ -60,11 +66,17 @@ source_set("unit_tests") { ":test_support", ":web_state_list", "//base", + "//components/favicon/ios", + "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/sessions:serialisation", + "//ios/chrome/browser/web", "//ios/web", + "//ios/web/public/session", + "//ios/web/public/test", "//ios/web/public/test/fakes", "//net", "//testing/gtest", + "//ui/gfx", "//url", ] configs += [ "//build/config/compiler:enable_arc" ] |