diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-16 11:45:35 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-17 08:59:23 +0000 |
| commit | 552906b0f222c5d5dd11b9fd73829d510980461a (patch) | |
| tree | 3a11e6ed0538a81dd83b20cf3a4783e297f26d91 /chromium/ios/chrome/browser/ui | |
| parent | 1b05827804eaf047779b597718c03e7d38344261 (diff) | |
| download | qtwebengine-chromium-552906b0f222c5d5dd11b9fd73829d510980461a.tar.gz | |
BASELINE: Update Chromium to 83.0.4103.122
Change-Id: Ie3a82f5bb0076eec2a7c6a6162326b4301ee291e
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/ios/chrome/browser/ui')
155 files changed, 2505 insertions, 1707 deletions
diff --git a/chromium/ios/chrome/browser/ui/BUILD.gn b/chromium/ios/chrome/browser/ui/BUILD.gn index 5ac87f4a4e2..d89170a2c0e 100644 --- a/chromium/ios/chrome/browser/ui/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/BUILD.gn @@ -10,7 +10,5 @@ source_set("feature_flags") { "ui_feature_flags.cc", "ui_feature_flags.h", ] - deps = [ - "//base", - ] + deps = [ "//base" ] } diff --git a/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn b/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn index 23900208905..f03fbbac30e 100644 --- a/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn @@ -38,6 +38,7 @@ source_set("activity_services") { "//ios/chrome/browser/snapshots", "//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", @@ -48,9 +49,7 @@ source_set("activity_services") { "//ui/base", "//url", ] - public_deps = [ - "//ios/third_party/material_components_ios", - ] + public_deps = [ "//ios/third_party/material_components_ios" ] libs = [ "MobileCoreServices.framework", "UIKit.framework", @@ -68,6 +67,7 @@ source_set("coordinator") { "//base", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/main:public", "//ios/chrome/browser/passwords", "//ios/chrome/browser/tabs", "//ios/chrome/browser/ui/activity_services/requirements", @@ -127,9 +127,7 @@ source_set("eg_tests") { configs += [ "//build/config/compiler:enable_arc" ] defines = [ "CHROME_EARL_GREY_1" ] testonly = true - sources = [ - "activity_service_controller_egtest.mm", - ] + sources = [ "activity_service_controller_egtest.mm" ] deps = [ "//base", "//components/strings", @@ -155,9 +153,7 @@ source_set("eg2_tests") { ] testonly = true - sources = [ - "activity_service_controller_egtest.mm", - ] + sources = [ "activity_service_controller_egtest.mm" ] deps = [ "//components/strings", 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 e52bcde7e78..2a73ce649ff 100644 --- a/chromium/ios/chrome/browser/ui/activity_services/activities/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/activity_services/activities/BUILD.gn @@ -11,6 +11,8 @@ source_set("activities") { "copy_activity.mm", "find_in_page_activity.h", "find_in_page_activity.mm", + "generate_qr_code_activity.h", + "generate_qr_code_activity.mm", "print_activity.h", "print_activity.mm", "reading_list_activity.h", @@ -25,6 +27,7 @@ source_set("activities") { "resources:activity_services_copy", "resources:activity_services_edit_bookmark", "resources:activity_services_find_in_page", + "resources:activity_services_generate_qr_code", "resources:activity_services_print", "resources:activity_services_read_later", "resources:activity_services_request_desktop_site", 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 a5197be28ea..970c4fb8020 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 @@ -40,6 +40,15 @@ imageset("activity_services_find_in_page") { ] } +imageset("activity_services_generate_qr_code") { + sources = [ + "activity_services_generate_qr_code.imageset/Contents.json", + "activity_services_generate_qr_code.imageset/activity_services_generate_qr_code-60@2x.png", + "activity_services_generate_qr_code.imageset/activity_services_generate_qr_code-60@3x.png", + "activity_services_generate_qr_code.imageset/activity_services_generate_qr_code-76@2x.png", + ] +} + imageset("activity_services_print") { sources = [ "activity_services_print.imageset/Contents.json", diff --git a/chromium/ios/chrome/browser/ui/alert_coordinator/BUILD.gn b/chromium/ios/chrome/browser/ui/alert_coordinator/BUILD.gn index ca012438ee3..41ac9fa1c46 100644 --- a/chromium/ios/chrome/browser/ui/alert_coordinator/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/alert_coordinator/BUILD.gn @@ -19,6 +19,7 @@ source_set("alert_coordinator") { "//components/strings", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/main:public", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/dialogs:completion_block_util", "//ios/web", @@ -41,6 +42,7 @@ source_set("unit_tests") { "//base", "//base/test:test_support", "//components/strings", + "//ios/chrome/browser/main:test_support", "//ios/chrome/browser/ui/util", "//ios/chrome/test:test_support", "//ios/web/public/test/fakes", @@ -50,23 +52,3 @@ source_set("unit_tests") { "//ui/strings", ] } - -source_set("alert_coordinator_internal") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "loading_alert_coordinator.h", - "loading_alert_coordinator.mm", - ] - deps = [ - "//base", - "//components/strings", - "//ios/chrome/browser", - "//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", - "//ui/base", - ] - libs = [ "UIKit.framework" ] -} diff --git a/chromium/ios/chrome/browser/ui/alert_view/BUILD.gn b/chromium/ios/chrome/browser/ui/alert_view/BUILD.gn index e7f5e8bf13c..32af28cbf49 100644 --- a/chromium/ios/chrome/browser/ui/alert_view/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/alert_view/BUILD.gn @@ -15,8 +15,8 @@ source_set("alert_view") { "//ios/chrome/browser/ui/elements", "//ios/chrome/browser/ui/presenters", "//ios/chrome/browser/ui/util", - "//ios/chrome/common/colors", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/util", ] libs = [ "UIKit.framework" ] configs += [ "//build/config/compiler:enable_arc" ] @@ -25,9 +25,7 @@ source_set("alert_view") { source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true - sources = [ - "alert_view_controller_unittest.mm", - ] + sources = [ "alert_view_controller_unittest.mm" ] deps = [ ":alert_view", "//testing/gtest:gtest", diff --git a/chromium/ios/chrome/browser/ui/app_launcher/BUILD.gn b/chromium/ios/chrome/browser/ui/app_launcher/BUILD.gn index d4c94a74222..52eae05eaed 100644 --- a/chromium/ios/chrome/browser/ui/app_launcher/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/app_launcher/BUILD.gn @@ -20,6 +20,7 @@ source_set("app_launcher") { "//ios/chrome/browser/app_launcher", "//ios/chrome/browser/overlays", "//ios/chrome/browser/overlays/public/web_content_area", + "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/dialogs:feature_flags", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/mailto", @@ -32,15 +33,14 @@ source_set("app_launcher") { source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true - sources = [ - "app_launcher_coordinator_unittest.mm", - ] + sources = [ "app_launcher_coordinator_unittest.mm" ] deps = [ ":app_launcher", "//base", "//base/test:test_support", "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser/app_launcher", + "//ios/chrome/browser/main:test_support", "//ios/chrome/browser/overlays", "//ios/chrome/browser/overlays/public/web_content_area", "//ios/chrome/browser/ui/dialogs:feature_flags", diff --git a/chromium/ios/chrome/browser/ui/appearance/BUILD.gn b/chromium/ios/chrome/browser/ui/appearance/BUILD.gn index ed90b799b71..f3a54444a84 100644 --- a/chromium/ios/chrome/browser/ui/appearance/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/appearance/BUILD.gn @@ -12,7 +12,7 @@ source_set("appearance") { deps = [ "//ios/chrome/browser/ui/settings:settings_root", "//ios/chrome/browser/ui/table_view", - "//ios/chrome/common/colors", + "//ios/chrome/common/ui/colors", ] configs += [ "//build/config/compiler:enable_arc" ] } diff --git a/chromium/ios/chrome/browser/ui/authentication/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/BUILD.gn index 397fec1cdf0..df18e10f792 100644 --- a/chromium/ios/chrome/browser/ui/authentication/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/BUILD.gn @@ -22,8 +22,6 @@ source_set("authentication") { "resized_avatar_cache.mm", "signed_in_accounts_view_controller.h", "signed_in_accounts_view_controller.mm", - "signin_account_selector_view_controller.h", - "signin_account_selector_view_controller.mm", "signin_promo_view_mediator.h", "signin_promo_view_mediator.mm", ] @@ -33,7 +31,6 @@ source_set("authentication") { "unified_consent", "//base", "//components/consent_auditor", - "//components/google/core/common", "//components/infobars/core", "//components/prefs", "//components/signin/public/base", @@ -46,35 +43,29 @@ source_set("authentication") { "//ios/chrome/browser", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/infobars", - "//ios/chrome/browser/main", + "//ios/chrome/browser/main:public", "//ios/chrome/browser/metrics", "//ios/chrome/browser/signin", "//ios/chrome/browser/sync", - "//ios/chrome/browser/tabs", "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/authentication/cells", "//ios/chrome/browser/ui/collection_view/cells", "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/commands", - "//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/browser/web_state_list", "//ios/chrome/common", - "//ios/chrome/common/colors", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/util", "//ios/public/provider/chrome/browser", - "//ios/public/provider/chrome/browser/images", "//ios/public/provider/chrome/browser/signin", "//ui/base", "//ui/gfx", - "//url", - ] - public_deps = [ - "//ios/chrome/browser/ui/collection_view", ] + public_deps = [ "//ios/chrome/browser/ui/collection_view" ] if (is_chrome_branded) { deps += [ "resources:signin_promo_logo_chrome_color" ] } else { @@ -119,8 +110,7 @@ source_set("unit_tests") { "//components/sync_preferences", "//components/sync_preferences:test_support", "//components/version_info", - "//ios/chrome/app/strings:ios_chromium_strings_grit", - "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/app/strings", "//ios/chrome/browser", "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/infobars", @@ -139,6 +129,7 @@ source_set("unit_tests") { "//ios/chrome/browser/ui/table_view:styler", "//ios/chrome/browser/unified_consent", "//ios/chrome/test:test_support", + "//ios/public/provider/chrome/browser/signin:fake_chrome_identity", "//ios/public/provider/chrome/browser/signin:test_support", "//ios/web/public/test", "//testing/gtest", @@ -163,8 +154,10 @@ source_set("eg_test_support") { ":authentication", "unified_consent", "//base/test:test_support", + "//components/bookmarks/browser", "//components/signin/public/identity_manager", - "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/app/strings", + "//ios/chrome/browser/bookmarks", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/signin", "//ios/chrome/browser/ui/authentication/cells", @@ -176,6 +169,7 @@ source_set("eg_test_support") { "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", "//ios/public/provider/chrome/browser/signin", + "//ios/public/provider/chrome/browser/signin:fake_chrome_identity", "//ios/public/provider/chrome/browser/signin:test_support", "//ios/testing/earl_grey:earl_grey_support", "//ios/third_party/earl_grey:earl_grey+link", @@ -196,8 +190,10 @@ source_set("eg_app_support+eg2") { deps = [ ":authentication", "unified_consent", + "//components/bookmarks/browser", "//components/signin/public/identity_manager", - "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/app/strings", + "//ios/chrome/browser/bookmarks", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/signin", "//ios/chrome/browser/ui/authentication/cells", @@ -206,6 +202,7 @@ source_set("eg_app_support+eg2") { "//ios/chrome/browser/ui/util", "//ios/chrome/test/app:test_support", "//ios/public/provider/chrome/browser/signin", + "//ios/public/provider/chrome/browser/signin:fake_chrome_identity", "//ios/public/provider/chrome/browser/signin:test_support", "//ios/testing/earl_grey:eg_app_support+eg2", "//ios/third_party/earl_grey2:app_framework+link", @@ -230,7 +227,7 @@ source_set("eg_test_support+eg2") { deps = [ "//base", "//base/test:test_support", - "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/app/strings", "//ios/chrome/browser/ui/authentication/cells:constants", "//ios/chrome/browser/ui/authentication/unified_consent:constants", "//ios/chrome/browser/ui/signin_interaction:eg_test_support+eg2", diff --git a/chromium/ios/chrome/browser/ui/authentication/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/cells/BUILD.gn index a2c6b025705..08da6266f5b 100644 --- a/chromium/ios/chrome/browser/ui/authentication/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/cells/BUILD.gn @@ -30,15 +30,13 @@ source_set("cells") { "//ios/chrome/browser/ui/table_view:styler", "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/browser/ui/table_view/cells:cells_constants", - "//ios/chrome/common/colors", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/util", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/signin", "//ui/base", ] - public_deps = [ - ":constants", - ] + public_deps = [ ":constants" ] libs = [ "UIKit.framework" ] } @@ -74,8 +72,7 @@ source_set("unit_tests") { "//ios/chrome/browser/ui/signin_interaction/public", "//ios/chrome/browser/ui/table_view:styler", "//ios/chrome/browser/ui/table_view/cells", - "//ios/chrome/browser/unified_consent", - "//ios/chrome/common/colors", + "//ios/chrome/common/ui/colors", "//ios/chrome/test:test_support", "//ios/public/provider/chrome/browser/signin:test_support", "//ios/third_party/material_components_ios", diff --git a/chromium/ios/chrome/browser/ui/authentication/signin/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/signin/BUILD.gn new file mode 100644 index 00000000000..8865f1a9a8d --- /dev/null +++ b/chromium/ios/chrome/browser/ui/authentication/signin/BUILD.gn @@ -0,0 +1,86 @@ +# Copyright 2020 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/chrome_build.gni") + +# Public target. +group("signin") { + public_deps = [ ":signin_headers" ] + deps = [ ":signin_impl" ] +} + +# Contains public headers. +source_set("signin_headers") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "signin_constants.h", + "signin_coordinator.h", + "signin_utils.h", + ] + public_deps = [ + "//base", + "//components/signin/public/base", + "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/ui/coordinators:chrome_coordinators", + ] +} + +source_set("signin_protected") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "signin_constants.mm", + "signin_coordinator+protected.h", + ] + deps = [ ":signin_headers" ] +} + +# Contains sign-in implementation. +source_set("signin_impl") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "signin_coordinator.mm", + "signin_utils.mm", + ] + deps = [ + ":signin_headers", + ":signin_protected", + "//components/signin/ios/browser", + "//components/version_info", + "//ios/chrome/app:tests_hook", + "//ios/chrome/browser/main:public", + "//ios/chrome/browser/signin", + "//ios/chrome/browser/ui/authentication/signin/add_account_signin", + "//ios/chrome/browser/ui/authentication/signin/advanced_settings_signin", + "//ios/chrome/browser/ui/authentication/signin/user_signin", + "//ios/chrome/browser/ui/authentication/signin/user_signin/logging", + "//ios/public/provider/chrome/browser", + "//ios/public/provider/chrome/browser/signin", + ] +} + +source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ "signin_utils_unittest.mm" ] + deps = [ + ":signin_impl", + "//base", + "//components/pref_registry", + "//components/sync_preferences", + "//components/sync_preferences:test_support", + "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/main:test_support", + "//ios/chrome/browser/prefs:browser_prefs", + "//ios/chrome/browser/signin", + "//ios/chrome/browser/signin:test_support", + "//ios/chrome/browser/ui/authentication/signin:signin_headers", + "//ios/chrome/browser/ui/authentication/signin/user_signin", + "//ios/chrome/test:test_support", + "//ios/public/provider/chrome/browser/signin:test_support", + "//ios/web/public/test", + "//net", + "//testing/gtest", + "//third_party/ocmock", + ] +} diff --git a/chromium/ios/chrome/browser/ui/authentication/signin/add_account_signin/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/signin/add_account_signin/BUILD.gn new file mode 100644 index 00000000000..54540f73a49 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/authentication/signin/add_account_signin/BUILD.gn @@ -0,0 +1,51 @@ +# Copyright 2020 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/chrome_build.gni") + +source_set("add_account_signin") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "add_account_signin_coordinator.h", + "add_account_signin_coordinator.mm", + "add_account_signin_enums.h", + "add_account_signin_mediator.h", + "add_account_signin_mediator.mm", + ] + deps = [ + "//components/prefs", + "//components/signin/public/identity_manager", + "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/main", + "//ios/chrome/browser/signin", + "//ios/chrome/browser/ui/alert_coordinator", + "//ios/chrome/browser/ui/authentication", + "//ios/chrome/browser/ui/authentication/signin:signin_protected", + "//ios/public/provider/chrome/browser", + "//ios/public/provider/chrome/browser/signin", + ] + public_deps = + [ "//ios/chrome/browser/ui/authentication/signin:signin_headers" ] +} + +source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ "add_account_signin_mediator_unittest.mm" ] + deps = [ + ":add_account_signin", + "//base/test:test_support", + "//components/prefs", + "//components/prefs:test_support", + "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/signin", + "//ios/public/provider/chrome/browser/signin", + "//ios/public/provider/chrome/browser/signin:fake_chrome_identity", + "//ios/public/provider/chrome/browser/signin:test_support", + "//ios/web/public/test", + "//testing/gmock", + "//testing/gtest", + "//third_party/ocmock", + ] +} diff --git a/chromium/ios/chrome/browser/ui/authentication/signin/advanced_settings_signin/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/signin/advanced_settings_signin/BUILD.gn new file mode 100644 index 00000000000..cc9c1761f18 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/authentication/signin/advanced_settings_signin/BUILD.gn @@ -0,0 +1,69 @@ +# Copyright 2020 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/chrome_build.gni") + +source_set("advanced_settings_signin") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "advanced_settings_signin_coordinator.h", + "advanced_settings_signin_coordinator.mm", + "advanced_settings_signin_mediator.h", + "advanced_settings_signin_mediator.mm", + "advanced_settings_signin_navigation_controller.h", + "advanced_settings_signin_navigation_controller.mm", + ] + public_deps = + [ "//ios/chrome/browser/ui/authentication/signin:signin_headers" ] + deps = [ + ":constants", + "//components/sync", + "//components/unified_consent", + "//ios/chrome/app/strings", + "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/signin", + "//ios/chrome/browser/sync", + "//ios/chrome/browser/ui/alert_coordinator", + "//ios/chrome/browser/ui/authentication/signin:signin_protected", + "//ios/chrome/browser/ui/settings/google_services:constants", + "//ios/web/public", + "//ui/base", + ] +} + +source_set("constants") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "advanced_settings_signin_constants.h", + "advanced_settings_signin_constants.mm", + ] +} + +source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ "advanced_settings_signin_mediator_unittest.mm" ] + deps = [ + ":advanced_settings_signin", + "//base/test:test_support", + "//components/autofill/core/common", + "//components/prefs", + "//components/prefs:test_support", + "//components/sync/driver:test_support", + "//components/sync_preferences", + "//components/sync_preferences:test_support", + "//ios/chrome/app/strings", + "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/main:test_support", + "//ios/chrome/browser/prefs:browser_prefs", + "//ios/chrome/browser/signin", + "//ios/chrome/browser/signin:test_support", + "//ios/chrome/browser/sync", + "//ios/chrome/browser/sync:test_support", + "//ios/chrome/browser/ui/authentication", + "//ios/public/provider/chrome/browser/signin:fake_chrome_identity", + "//ios/public/provider/chrome/browser/signin:test_support", + "//ios/web/public/test", + ] +} diff --git a/chromium/ios/chrome/browser/ui/authentication/signin/user_signin/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/signin/user_signin/BUILD.gn new file mode 100644 index 00000000000..bbf19257e75 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/authentication/signin/user_signin/BUILD.gn @@ -0,0 +1,78 @@ +# Copyright 2020 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/chrome_build.gni") + +source_set("user_signin") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "gradient_view.h", + "gradient_view.mm", + "user_signin_constants.h", + "user_signin_constants.mm", + "user_signin_coordinator.h", + "user_signin_coordinator.mm", + "user_signin_mediator.h", + "user_signin_mediator.mm", + "user_signin_view_controller.h", + "user_signin_view_controller.mm", + ] + deps = [ + "//components/consent_auditor", + "//components/sync/base", + "//components/unified_consent", + "//ios/chrome/app/strings", + "//ios/chrome/browser/main:public", + "//ios/chrome/browser/signin", + "//ios/chrome/browser/sync", + "//ios/chrome/browser/ui/authentication", + "//ios/chrome/browser/ui/authentication/signin:signin_headers", + "//ios/chrome/browser/ui/authentication/signin:signin_protected", + "//ios/chrome/browser/ui/authentication/signin/user_signin/logging", + "//ios/chrome/browser/ui/authentication/unified_consent", + "//ios/chrome/browser/ui/collection_view/cells", + "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/util", + "//ios/chrome/browser/unified_consent", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/util", + "//ios/public/provider/chrome/browser/signin", + "//ui/base", + ] + public_deps = + [ "//ios/chrome/browser/ui/authentication/signin:signin_headers" ] +} + +source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ "user_signin_mediator_unittest.mm" ] + deps = [ + ":user_signin", + "//base/test:test_support", + "//components/consent_auditor:test_support", + "//components/prefs", + "//components/prefs:test_support", + "//components/sync/driver:test_support", + "//components/sync_preferences", + "//components/sync_preferences:test_support", + "//ios/chrome/app/strings", + "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/main:test_support", + "//ios/chrome/browser/prefs:browser_prefs", + "//ios/chrome/browser/signin", + "//ios/chrome/browser/signin:test_support", + "//ios/chrome/browser/sync", + "//ios/chrome/browser/sync:test_support", + "//ios/chrome/browser/ui/authentication", + "//ios/chrome/browser/unified_consent", + "//ios/public/provider/chrome/browser/signin", + "//ios/public/provider/chrome/browser/signin:fake_chrome_identity", + "//ios/public/provider/chrome/browser/signin:test_support", + "//ios/web/public/test", + "//testing/gmock", + "//testing/gtest", + "//third_party/ocmock", + ] +} diff --git a/chromium/ios/chrome/browser/ui/authentication/signin/user_signin/logging/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/signin/user_signin/logging/BUILD.gn new file mode 100644 index 00000000000..3b0f9f501f0 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/authentication/signin/user_signin/logging/BUILD.gn @@ -0,0 +1,24 @@ +# Copyright 2020 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/chrome_build.gni") + +source_set("logging") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "first_run_signin_logger.h", + "first_run_signin_logger.mm", + "upgrade_signin_logger.h", + "upgrade_signin_logger.mm", + "user_signin_logger.h", + "user_signin_logger.mm", + ] + deps = [ + "//components/signin/public/base", + "//ios/public/provider/chrome/browser", + "//ios/public/provider/chrome/browser/signin", + ] + public_deps = + [ "//ios/chrome/browser/ui/authentication/signin:signin_headers" ] +} diff --git a/chromium/ios/chrome/browser/ui/authentication/unified_consent/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/unified_consent/BUILD.gn index 97be0ab9e62..cd2ce80ecef 100644 --- a/chromium/ios/chrome/browser/ui/authentication/unified_consent/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/unified_consent/BUILD.gn @@ -16,8 +16,10 @@ source_set("unified_consent") { ":unified_consent_ui", "//base", "//ios/chrome/browser", + "//ios/chrome/browser/main:public", "//ios/chrome/browser/signin", "//ios/chrome/browser/ui/authentication/unified_consent/identity_chooser", + "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/public/provider/chrome/browser/signin", ] } @@ -43,14 +45,12 @@ source_set("unified_consent_ui") { "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/util", "//ios/chrome/common", - "//ios/chrome/common/colors", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/util", "//ios/third_party/material_components_ios", "//ui/base", ] - public_deps = [ - ":constants", - ] + public_deps = [ ":constants" ] } source_set("constants") { diff --git a/chromium/ios/chrome/browser/ui/authentication/unified_consent/identity_chooser/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/unified_consent/identity_chooser/BUILD.gn index cde8ee882c3..5c57f3716e9 100644 --- a/chromium/ios/chrome/browser/ui/authentication/unified_consent/identity_chooser/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/unified_consent/identity_chooser/BUILD.gn @@ -62,12 +62,10 @@ source_set("identity_chooser_ui") { "//ios/chrome/browser/ui/util", "//ios/chrome/browser/ui/util", "//ios/chrome/common", - "//ios/chrome/common/colors", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/util", "//ios/third_party/material_components_ios", "//ui/base", ] - public_deps = [ - "//ios/chrome/browser/ui/table_view", - ] + public_deps = [ "//ios/chrome/browser/ui/table_view" ] } diff --git a/chromium/ios/chrome/browser/ui/autofill/BUILD.gn b/chromium/ios/chrome/browser/ui/autofill/BUILD.gn index 548bfbc8fa3..b390d00e652 100644 --- a/chromium/ios/chrome/browser/ui/autofill/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/autofill/BUILD.gn @@ -26,7 +26,8 @@ source_set("autofill") { "//components/prefs", "//components/security_state/ios", "//components/strings", - "//components/translate/core/browser:browser", + "//components/translate/core/browser", + "//components/variations/service", "//google_apis", "//ios/chrome/app/strings", "//ios/chrome/browser", @@ -62,9 +63,7 @@ source_set("autofill") { "//ios/web/public/js_messaging", "//ui/base", ] - public_deps = [ - "//ios/chrome/browser/ui/collection_view", - ] + public_deps = [ "//ios/chrome/browser/ui/collection_view" ] libs = [ "UIKit.framework" ] } @@ -89,14 +88,12 @@ source_set("bridges") { "//ios/chrome/browser/ui/list_model", "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/browser/ui/util", - "//ios/chrome/common/colors", + "//ios/chrome/common/ui/colors", "//ios/third_party/material_components_ios", "//ios/web", "//ui/base", ] - public_deps = [ - "//ios/chrome/browser/ui/collection_view", - ] + public_deps = [ "//ios/chrome/browser/ui/collection_view" ] libs = [ "UIKit.framework" ] } @@ -128,8 +125,8 @@ source_set("autofill_ui") { "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/util", "//ios/chrome/common", - "//ios/chrome/common/colors", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/util", "//ios/third_party/material_components_ios", "//ui/base", ] @@ -142,9 +139,16 @@ source_set("autofill_message") { "save_card_message_with_links.h", "save_card_message_with_links.mm", ] - deps = [ - "//url:url", + deps = [ "//url:url" ] +} + +source_set("autofill_metrics") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "save_card_infobar_metrics_recorder.h", + "save_card_infobar_metrics_recorder.mm", ] + deps = [ "//base" ] } source_set("eg_tests") { diff --git a/chromium/ios/chrome/browser/ui/autofill/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/autofill/cells/BUILD.gn index 067ab22f912..b7e3d29152a 100644 --- a/chromium/ios/chrome/browser/ui/autofill/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/autofill/cells/BUILD.gn @@ -26,7 +26,7 @@ source_set("cells") { "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/table_view:styler", "//ios/chrome/browser/ui/table_view/cells", - "//ios/chrome/common/ui_util", + "//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/autofill/form_input_accessory/BUILD.gn b/chromium/ios/chrome/browser/ui/autofill/form_input_accessory/BUILD.gn index ddbf88cf67b..8ad0c526b41 100644 --- a/chromium/ios/chrome/browser/ui/autofill/form_input_accessory/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/autofill/form_input_accessory/BUILD.gn @@ -26,13 +26,14 @@ source_set("form_input_accessory") { "//ios/chrome/browser/autofill:autofill_shared", "//ios/chrome/browser/autofill/manual_fill", "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/main", "//ios/chrome/browser/passwords", "//ios/chrome/browser/ui/autofill/manual_fill", "//ios/chrome/browser/ui/autofill/manual_fill:manual_fill_ui", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web_state_list", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/util", "//ios/web/common", "//ios/web/public", "//ios/web/public/deprecated", @@ -55,8 +56,8 @@ source_set("form_input_accessory_ui") { "//ios/chrome/browser/autofill:autofill_shared", "//ios/chrome/browser/ui/image_util", "//ios/chrome/browser/ui/util", - "//ios/chrome/common/colors", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/util", "//ui/base", ] libs = [ "UIKit.framework" ] 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 1ffa2d66e8b..de8ee5e8fd9 100644 --- a/chromium/ios/chrome/browser/ui/autofill/manual_fill/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/autofill/manual_fill/BUILD.gn @@ -47,7 +47,9 @@ source_set("manual_fill") { "//ios/chrome/browser/autofill", "//ios/chrome/browser/autofill:autofill_shared", "//ios/chrome/browser/autofill/manual_fill", + "//ios/chrome/browser/browser_state", "//ios/chrome/browser/favicon", + "//ios/chrome/browser/main", "//ios/chrome/browser/passwords", "//ios/chrome/browser/ui/autofill/manual_fill:manual_fill_ui", "//ios/chrome/browser/ui/commands", @@ -58,7 +60,7 @@ 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/chrome/common/colors", + "//ios/chrome/common/ui/colors", "//ios/web/public", "//ios/web/public/deprecated", "//ios/web/public/js_messaging", @@ -120,8 +122,8 @@ source_set("manual_fill_ui") { "//ios/chrome/browser/ui/list_model:list_model", "//ios/chrome/browser/ui/table_view:styler", "//ios/chrome/browser/ui/table_view:table_view", - "//ios/chrome/common/favicon", - "//ios/chrome/common/ui_util:ui_util", + "//ios/chrome/common/ui/favicon", + "//ios/chrome/common/ui/util", "//ios/third_party/material_components_ios", "//net:net", "//third_party/material_design_icons:ic_credit_card", @@ -138,6 +140,7 @@ source_set("unit_tests") { testonly = true sources = [ "form_observer_helper_unittest.mm", + "full_card_requester_unittest.mm", "manual_fill_address+AutofillProfile_unittest.mm", "manual_fill_address_unittest.mm", "manual_fill_credential+PasswordForm_unittest.mm", @@ -148,14 +151,27 @@ source_set("unit_tests") { deps = [ ":manual_fill", ":manual_fill_ui", + ":requesters", "//base", + "//base/test:test_support", "//components/autofill/core/browser", + "//components/autofill/core/browser:test_support", "//components/autofill/core/common", + "//components/autofill/ios/browser", "//components/autofill/ios/form_util:form_util", "//components/autofill/ios/form_util:test_support", + "//components/leveldb_proto:leveldb_proto", "//ios/chrome/browser", + "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/infobars", + "//ios/chrome/browser/ui/autofill", + "//ios/chrome/browser/ui/autofill:bridges", "//ios/chrome/browser/web_state_list:test_support", "//ios/chrome/browser/web_state_list:web_state_list", + "//ios/chrome/test:test_support", + "//ios/web/public/deprecated:test_doubles", + "//ios/web/public/js_messaging", + "//ios/web/public/test", "//ios/web/public/test/fakes", "//testing/gtest:gtest", "//third_party/ocmock:ocmock", @@ -167,6 +183,8 @@ source_set("requesters") { sources = [ "full_card_request_result_delegate_bridge.h", "full_card_request_result_delegate_bridge.mm", + "full_card_requester.h", + "full_card_requester.mm", "manual_fill_full_card_requester.h", "manual_fill_full_card_requester.mm", ] @@ -175,7 +193,8 @@ source_set("requesters") { "//components/autofill/core/browser", "//components/autofill/core/common", "//components/autofill/ios/browser", - "//ios/chrome/browser/ui/payments:requesters", + "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/ui/autofill:bridges", "//ios/chrome/browser/web_state_list:web_state_list", "//ios/web/public:public", "//ios/web/public/js_messaging", @@ -247,6 +266,7 @@ source_set("eg2_tests") { deps = [ "//base", "//base/test:test_support", + "//components/autofill/core/browser:test_support", "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser/ui/autofill:eg_test_support+eg2", "//ios/chrome/browser/ui/settings/autofill:feature_flags", diff --git a/chromium/ios/chrome/browser/ui/badges/BUILD.gn b/chromium/ios/chrome/browser/ui/badges/BUILD.gn index 6d8d560494e..baf34cd8c4d 100644 --- a/chromium/ios/chrome/browser/ui/badges/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/badges/BUILD.gn @@ -9,6 +9,21 @@ source_set("public") { "badge_constants.mm", "badge_item.h", "badge_type.h", + "badges_histograms.h", + "badges_histograms.mm", + ] +} + +source_set("util") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "badge_type_util.cc", + "badge_type_util.h", + ] + deps = [ + ":public", + "//base", + "//ios/chrome/browser/infobars:public", ] } @@ -32,25 +47,36 @@ source_set("badges") { ] deps = [ ":public", + ":util", "resources:incognito_badge", "resources:incognito_small_badge", "resources:wrench_badge", "//base:base", "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/infobars", "//ios/chrome/browser/infobars:badge", "//ios/chrome/browser/infobars:public", + "//ios/chrome/browser/infobars/overlays", + "//ios/chrome/browser/infobars/overlays:util", + "//ios/chrome/browser/main:public", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/common/infobars", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/elements", "//ios/chrome/browser/ui/fullscreen:ui", "//ios/chrome/browser/ui/infobars:feature_flags", + "//ios/chrome/browser/ui/infobars:infobars_ui", "//ios/chrome/browser/ui/infobars/resources:infobar_settings_icon", "//ios/chrome/browser/ui/list_model", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web", "//ios/chrome/browser/web_state_list", - "//ios/chrome/common/colors", - "//ios/chrome/common/ui_util", + "//ios/chrome/common:timing", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/util", "//ios/web/public", "//ui/base", ] @@ -70,6 +96,7 @@ source_set("badges_popup_menu") { "//base", "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser/infobars:public", + "//ios/chrome/browser/main:public", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", @@ -79,8 +106,8 @@ source_set("badges_popup_menu") { "//ios/chrome/browser/ui/table_view:styler", "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/browser/ui/util", - "//ios/chrome/common/colors", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/util", "//ui/base", ] } @@ -88,17 +115,22 @@ source_set("badges_popup_menu") { source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true - sources = [ - "badge_mediator_unittest.mm", - ] + sources = [ "badge_mediator_unittest.mm" ] deps = [ ":badges", ":public", + ":util", "//base/test:test_support", "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/infobars", "//ios/chrome/browser/infobars:badge", "//ios/chrome/browser/infobars:badge_public", + "//ios/chrome/browser/infobars/test", + "//ios/chrome/browser/main:test_support", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/common/infobars", + "//ios/chrome/browser/overlays/test", + "//ios/chrome/browser/ui/infobars:feature_flags", "//ios/chrome/browser/ui/infobars:test_support", "//ios/chrome/browser/web_state_list", "//ios/chrome/browser/web_state_list:test_support", diff --git a/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn index f2bf038c330..90b600ce8bd 100644 --- a/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn @@ -74,6 +74,7 @@ source_set("bookmarks") { "//ios/chrome/browser/bookmarks:bookmarks_utils", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/favicon", + "//ios/chrome/browser/main:public", "//ios/chrome/browser/metrics:metrics_internal", "//ios/chrome/browser/signin", "//ios/chrome/browser/sync", @@ -99,9 +100,9 @@ source_set("bookmarks") { "//ios/chrome/browser/undo", "//ios/chrome/browser/url_loading", "//ios/chrome/browser/web_state_list", - "//ios/chrome/common/colors", - "//ios/chrome/common/favicon", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/favicon", + "//ios/chrome/common/ui/util", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/ui", "//ios/web", @@ -146,6 +147,7 @@ source_set("unit_tests") { "//ios/chrome/browser", "//ios/chrome/browser/bookmarks", "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/main:test_support", "//ios/web/public/test", "//testing/gtest", ] @@ -159,9 +161,49 @@ source_set("eg_tests") { ] testonly = true sources = [ + "bookmarks_accessibility_egtest.mm", "bookmarks_egtest.mm", + "bookmarks_entries_egtest.mm", + "bookmarks_folders_egtest.mm", + "bookmarks_promo_egtest.mm", + "bookmarks_search_egtest.mm", ] deps = [ + ":bookmarks", + ":bookmarks_ui", + ":eg_test_support", + "//base", + "//base/test:test_support", + "//components/strings", + "//ios/chrome/app/strings", + "//ios/chrome/browser/ui/authentication:eg_test_support", + "//ios/chrome/browser/ui/popup_menu:constants", + "//ios/chrome/browser/ui/table_view:feature_flags", + "//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/public/test/http_server", + "//ui/base", + "//url", + ] + libs = [ "UIKit.framework" ] +} + +source_set("eg_test_support") { + defines = [ "CHROME_EARL_GREY_1" ] + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ + "bookmark_earl_grey.h", + "bookmark_earl_grey.mm", + "bookmark_earl_grey_app_interface.h", + "bookmark_earl_grey_app_interface.mm", + "bookmark_earl_grey_ui.h", + "bookmark_earl_grey_ui.mm", + ] + deps = [ + ":bookmarks", ":bookmarks_ui", "//base", "//base/test:test_support", @@ -171,26 +213,121 @@ source_set("eg_tests") { "//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/authentication:eg_test_support", - "//ios/chrome/browser/ui/authentication/cells", - "//ios/chrome/browser/ui/bookmarks:bookmarks", - "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/popup_menu:constants", - "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/table_view:feature_flags", - "//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:fake_chrome_identity", + "//ios/public/provider/chrome/browser/signin:test_support", "//ios/public/provider/chrome/browser/signin:test_support", + "//ios/testing:nserror_support", "//ios/testing/earl_grey:earl_grey_support", "//ios/third_party/earl_grey:earl_grey+link", "//ios/web/public/test/http_server", "//ui/base", "//url", ] +} + +source_set("eg2_tests") { + defines = [ "CHROME_EARL_GREY_2" ] + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + testonly = true + sources = [ + "bookmarks_accessibility_egtest.mm", + "bookmarks_egtest.mm", + "bookmarks_entries_egtest.mm", + "bookmarks_folders_egtest.mm", + "bookmarks_promo_egtest.mm", + "bookmarks_search_egtest.mm", + ] + deps = [ + ":bookmarks_ui", + ":eg_test_support+eg2", + "//base/test:test_support", + "//components/strings", + "//ios/chrome/app/strings", + "//ios/chrome/browser/ui/authentication:eg_test_support+eg2", + "//ios/chrome/browser/ui/popup_menu:constants", + "//ios/chrome/browser/ui/table_view:feature_flags", + "//ios/chrome/test/earl_grey:eg_test_support+eg2", + "//ios/testing/earl_grey:eg_test_support+eg2", + "//ios/third_party/earl_grey2:test_lib", + "//ios/web/public/test/http_server", + "//net", + "//ui/base", + ] libs = [ "UIKit.framework" ] } + +source_set("eg_app_support+eg2") { + defines = [ "CHROME_EARL_GREY_2" ] + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + testonly = true + sources = [ + "bookmark_earl_grey_app_interface.h", + "bookmark_earl_grey_app_interface.mm", + ] + deps = [ + ":bookmarks", + ":bookmarks_ui", + "//base", + "//base/test:test_support", + "//components/bookmarks/browser", + "//components/prefs", + "//components/strings", + "//ios/chrome/app/strings", + "//ios/chrome/browser", + "//ios/chrome/browser/bookmarks", + "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/ui/popup_menu:constants", + "//ios/chrome/browser/ui/table_view:feature_flags", + "//ios/chrome/test/app:test_support", + "//ios/public/provider/chrome/browser/signin:fake_chrome_identity", + "//ios/public/provider/chrome/browser/signin:test_support", + "//ios/testing:nserror_support", + "//ios/testing/earl_grey:eg_app_support+eg2", + "//ios/third_party/earl_grey2:app_framework+link", + "//ui/base", + "//url", + ] +} + +source_set("eg_test_support+eg2") { + defines = [ "CHROME_EARL_GREY_2" ] + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + testonly = true + sources = [ + "bookmark_earl_grey.h", + "bookmark_earl_grey.mm", + "bookmark_earl_grey_app_interface.h", + "bookmark_earl_grey_ui.h", + "bookmark_earl_grey_ui.mm", + ] + deps = [ + ":bookmarks_ui", + "//base", + "//base/test:test_support", + "//components/strings", + "//ios/chrome/app/strings", + "//ios/chrome/browser/ui/popup_menu:constants", + "//ios/chrome/test:eg_test_support+eg2", + "//ios/chrome/test/earl_grey:eg_test_support+eg2", + "//ios/testing/earl_grey:eg_test_support+eg2", + "//ios/third_party/earl_grey2:test_lib", + "//ios/web/public/test/http_server", + "//ui/base", + "//url", + ] +} diff --git a/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn index 9bf8467e272..2fbfdf0235d 100644 --- a/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn @@ -33,7 +33,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/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_container/BUILD.gn b/chromium/ios/chrome/browser/ui/browser_container/BUILD.gn index b939db9ed24..1b2f1dbc750 100644 --- a/chromium/ios/chrome/browser/ui/browser_container/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/browser_container/BUILD.gn @@ -16,7 +16,6 @@ source_set("browser_container") { "//ios/chrome/browser/main", "//ios/chrome/browser/overlays", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", - "//ios/chrome/browser/ui/fullscreen", "//ios/chrome/browser/ui/overlays", ] } @@ -32,7 +31,6 @@ source_set("ui") { deps = [ "//base", "//ios/chrome/browser/ui/dialogs:feature_flags", - "//ios/chrome/browser/ui/fullscreen:ui", "//ios/chrome/browser/ui/util", ] } @@ -40,28 +38,12 @@ source_set("ui") { source_set("unit_tests") { testonly = true - sources = [ - "browser_container_coordinator_unittest.mm", - "browser_container_view_controller_unittest.mm", - ] + sources = [ "browser_container_view_controller_unittest.mm" ] configs += [ "//build/config/compiler:enable_arc" ] deps = [ - ":browser_container", ":ui", - "//base", - "//ios/chrome/browser/browser_state:test_support", - "//ios/chrome/browser/main:test_support", - "//ios/chrome/browser/overlays", - "//ios/chrome/browser/overlays/public/web_content_area", - "//ios/chrome/browser/ui/fullscreen", - "//ios/chrome/browser/web_state_list", - "//ios/chrome/browser/web_state_list:test_support", - "//ios/chrome/common/ui_util", - "//ios/chrome/test:test_support", - "//ios/web/public/test", - "//ios/web/public/test/fakes", "//testing/gtest", ] } diff --git a/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn b/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn index 497ce49894a..3ac434353b8 100644 --- a/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn @@ -25,7 +25,6 @@ source_set("browser_view") { "//components/image_fetcher/ios", "//components/language/ios/browser", "//components/omnibox/browser", - "//components/payments/core", "//components/reading_list/core", "//components/search_engines", "//components/sessions", @@ -48,8 +47,10 @@ source_set("browser_view") { "//ios/chrome/browser/first_run", "//ios/chrome/browser/geolocation:geolocation_internal", "//ios/chrome/browser/infobars", + "//ios/chrome/browser/interstitials", "//ios/chrome/browser/language", "//ios/chrome/browser/main", + "//ios/chrome/browser/metrics:metrics_browser_agent", "//ios/chrome/browser/metrics:metrics_internal", "//ios/chrome/browser/net", "//ios/chrome/browser/ntp", @@ -64,6 +65,7 @@ source_set("browser_view") { "//ios/chrome/browser/search_engines", "//ios/chrome/browser/send_tab_to_self", "//ios/chrome/browser/sessions", + "//ios/chrome/browser/sessions:restoration_agent", "//ios/chrome/browser/sessions:serialisation", "//ios/chrome/browser/signin", "//ios/chrome/browser/snapshots", @@ -94,6 +96,7 @@ source_set("browser_view") { "//ios/chrome/browser/ui/dialogs:dialogs_internal", "//ios/chrome/browser/ui/dialogs:feature_flags", "//ios/chrome/browser/ui/download", + "//ios/chrome/browser/ui/download:features", "//ios/chrome/browser/ui/elements:elements_internal", "//ios/chrome/browser/ui/find_bar", "//ios/chrome/browser/ui/first_run", @@ -107,7 +110,6 @@ source_set("browser_view") { "//ios/chrome/browser/ui/infobars:public", "//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_content:main_content_ui", "//ios/chrome/browser/ui/main_content:main_content_ui_broadcasting_util", "//ios/chrome/browser/ui/ntp", @@ -116,11 +118,12 @@ source_set("browser_view") { "//ios/chrome/browser/ui/omnibox:omnibox_internal", "//ios/chrome/browser/ui/omnibox/popup", "//ios/chrome/browser/ui/open_in", + "//ios/chrome/browser/ui/overlays", "//ios/chrome/browser/ui/overscroll_actions", "//ios/chrome/browser/ui/page_info:coordinator", + "//ios/chrome/browser/ui/page_info:features", "//ios/chrome/browser/ui/page_info/requirements", "//ios/chrome/browser/ui/passwords", - "//ios/chrome/browser/ui/payments", "//ios/chrome/browser/ui/popup_menu", "//ios/chrome/browser/ui/presenters", "//ios/chrome/browser/ui/print", @@ -135,12 +138,14 @@ source_set("browser_view") { "//ios/chrome/browser/ui/side_swipe", "//ios/chrome/browser/ui/signin_interaction/public", "//ios/chrome/browser/ui/snackbar", - "//ios/chrome/browser/ui/static_content", "//ios/chrome/browser/ui/tabs", "//ios/chrome/browser/ui/tabs:coordinator", "//ios/chrome/browser/ui/tabs/requirements", + "//ios/chrome/browser/ui/text_zoom", + "//ios/chrome/browser/ui/text_zoom:text_zoom_ui", "//ios/chrome/browser/ui/toolbar", "//ios/chrome/browser/ui/toolbar:toolbar_ui", + "//ios/chrome/browser/ui/toolbar/accessory", "//ios/chrome/browser/ui/toolbar/buttons", "//ios/chrome/browser/ui/toolbar/fullscreen", "//ios/chrome/browser/ui/toolbar/fullscreen:fullscreen_broadcasting_util", @@ -150,19 +155,24 @@ source_set("browser_view") { "//ios/chrome/browser/ui/toolbar_container:feature_flags", "//ios/chrome/browser/ui/translate:legacy_translate", "//ios/chrome/browser/ui/util", + "//ios/chrome/browser/ui/util:multiwindow_util", "//ios/chrome/browser/ui/voice", "//ios/chrome/browser/upgrade", "//ios/chrome/browser/url_loading", "//ios/chrome/browser/voice:voice", "//ios/chrome/browser/web", + "//ios/chrome/browser/web:feature_flags", + "//ios/chrome/browser/web:page_placeholder", "//ios/chrome/browser/web:tab_helper_delegates", "//ios/chrome/browser/web:web_internal", "//ios/chrome/browser/web_state_list", + "//ios/chrome/browser/web_state_list:agents", "//ios/chrome/browser/web_state_list/web_usage_enabler", "//ios/chrome/browser/webui", "//ios/chrome/common", - "//ios/chrome/common/colors", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/util", + "//ios/components/webui:url_constants", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/ui", "//ios/public/provider/chrome/browser/voice", @@ -191,6 +201,7 @@ source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ + "browser_coordinator_unittest.mm", "browser_view_controller_helper_unittest.mm", "browser_view_controller_unittest.mm", "key_commands_provider_unittest.mm", @@ -207,10 +218,13 @@ source_set("unit_tests") { "//ios/chrome/browser", "//ios/chrome/browser/bookmarks", "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/download", "//ios/chrome/browser/favicon", "//ios/chrome/browser/main:test_support", "//ios/chrome/browser/search_engines", "//ios/chrome/browser/sessions", + "//ios/chrome/browser/sessions:restoration_agent", + "//ios/chrome/browser/sessions:test_support", "//ios/chrome/browser/snapshots", "//ios/chrome/browser/tabs", "//ios/chrome/browser/ui:feature_flags", @@ -218,9 +232,12 @@ 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/download:features", + "//ios/chrome/browser/ui/fullscreen:feature_flags", "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/toolbar/test", "//ios/chrome/browser/ui/util", + "//ios/chrome/browser/url_loading:url_loading", "//ios/chrome/browser/web", "//ios/chrome/browser/web_state_list", "//ios/chrome/browser/web_state_list:test_support", @@ -245,11 +262,10 @@ source_set("unit_tests") { } source_set("eg_tests") { + defines = [ "CHROME_EARL_GREY_1" ] configs += [ "//build/config/compiler:enable_arc" ] testonly = true - sources = [ - "browser_view_controller_egtest.mm", - ] + sources = [ "browser_view_controller_egtest.mm" ] deps = [ ":browser_view", "//base", @@ -269,7 +285,6 @@ source_set("eg_tests") { "//ios/testing/earl_grey:earl_grey_support", "//ios/third_party/earl_grey:earl_grey+link", "//ios/third_party/webkit", - "//ios/web:earl_grey_test_support", "//ios/web/public/test", "//ios/web/public/test/http_server", "//ui/base", @@ -280,3 +295,29 @@ source_set("eg_tests") { "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 = [ "browser_view_controller_egtest.mm" ] + deps = [ + "//base", + "//base/test:test_support", + "//components/strings", + "//ios/chrome/app/strings", + "//ios/chrome/browser/ntp:features", + "//ios/chrome/browser/ui/popup_menu:constants", + "//ios/chrome/test:eg_test_support+eg2", + "//ios/chrome/test/earl_grey:eg_test_support+eg2", + "//ios/testing/earl_grey:eg_test_support+eg2", + "//ios/third_party/earl_grey2:test_lib", + "//ios/web/public/test/http_server", + "//ui/base", + "//url", + ] + libs = [ "UIKit.framework" ] +} diff --git a/chromium/ios/chrome/browser/ui/bubble/BUILD.gn b/chromium/ios/chrome/browser/ui/bubble/BUILD.gn index 9794d5a2002..d4474720854 100644 --- a/chromium/ios/chrome/browser/ui/bubble/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/bubble/BUILD.gn @@ -22,14 +22,15 @@ source_set("bubble") { "//base:i18n", "//components/feature_engagement/public", "//ios/chrome/app/strings", - "//ios/chrome/browser", + "//ios/chrome/browser:chrome_url_constants", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/feature_engagement", "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/toolbar/public:feature_flags", "//ios/chrome/browser/ui/util", "//ios/chrome/common", - "//ios/chrome/common/colors", + "//ios/chrome/common/ui/colors", "//ios/third_party/material_components_ios", "//net", "//ui/base", diff --git a/chromium/ios/chrome/browser/ui/collection_view/BUILD.gn b/chromium/ios/chrome/browser/ui/collection_view/BUILD.gn index 89eb06e19bf..51ea6c13a69 100644 --- a/chromium/ios/chrome/browser/ui/collection_view/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/collection_view/BUILD.gn @@ -14,7 +14,7 @@ source_set("collection_view") { "//base", "//ios/chrome/browser/ui/list_model", "//ios/chrome/browser/ui/material_components", - "//ios/chrome/common/colors", + "//ios/chrome/common/ui/colors", ] public_deps = [ "//ios/chrome/browser/ui/collection_view/cells", @@ -43,9 +43,7 @@ source_set("test_support") { source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true - sources = [ - "collection_view_controller_unittest.mm", - ] + sources = [ "collection_view_controller_unittest.mm" ] deps = [ ":collection_view", "//base", diff --git a/chromium/ios/chrome/browser/ui/collection_view/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/collection_view/cells/BUILD.gn index f8005baf812..3b8a593111e 100644 --- a/chromium/ios/chrome/browser/ui/collection_view/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/collection_view/cells/BUILD.gn @@ -6,12 +6,9 @@ source_set("cells") { sources = [ "MDCCollectionViewCell+Chrome.h", "MDCCollectionViewCell+Chrome.mm", - "activity_indicator_cell.h", - "activity_indicator_cell.mm", "collection_view_account_item.h", "collection_view_account_item.mm", "collection_view_cell_constants.h", - "collection_view_cell_style.h", "collection_view_footer_item.h", "collection_view_footer_item.mm", "collection_view_item.h", @@ -32,14 +29,12 @@ source_set("cells") { "//ios/chrome/browser/ui/util", "//ios/chrome/browser/ui/util", "//ios/chrome/common", - "//ios/chrome/common/colors", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/util", "//ui/base", "//url", ] - public_deps = [ - "//ios/third_party/material_components_ios", - ] + public_deps = [ "//ios/third_party/material_components_ios" ] configs += [ "//build/config/compiler:enable_arc" ] } @@ -57,7 +52,6 @@ source_set("unit_tests") { testonly = true sources = [ "MDCCollectionViewCell+Chrome_unittest.mm", - "activity_indicator_cell_unittest.mm", "collection_view_account_item_unittest.mm", "collection_view_footer_item_unittest.mm", "collection_view_item_unittest.mm", diff --git a/chromium/ios/chrome/browser/ui/commands/BUILD.gn b/chromium/ios/chrome/browser/ui/commands/BUILD.gn index 6bdec259538..ffc9a21defd 100644 --- a/chromium/ios/chrome/browser/ui/commands/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/commands/BUILD.gn @@ -13,23 +13,29 @@ source_set("commands") { "browsing_data_commands.h", "command_dispatcher.h", "command_dispatcher.mm", + "find_in_page_commands.h", + "generate_qr_code_command.h", + "generate_qr_code_command.mm", + "help_commands.h", "infobar_commands.h", "load_query_commands.h", + "omnibox_commands.h", "omnibox_suggestion_commands.h", "open_new_tab_command.h", "open_new_tab_command.mm", "page_info_commands.h", "password_breach_commands.h", "popup_menu_commands.h", + "qr_generation_commands.h", "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", "snackbar_commands.h", + "text_zoom_commands.h", "toolbar_commands.h", ] @@ -51,9 +57,7 @@ source_set("commands") { source_set("unit_tests") { testonly = true configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "command_dispatcher_unittest.mm", - ] + sources = [ "command_dispatcher_unittest.mm" ] deps = [ ":commands", "//base", diff --git a/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn b/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn index bf2dd658b67..af9ea0197fe 100644 --- a/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn @@ -30,6 +30,7 @@ source_set("content_suggestions") { deps = [ "//base", "//components/favicon/core", + "//components/feed/core/shared_prefs:feed_shared_prefs", "//components/ntp_snippets", "//components/ntp_tiles", "//components/reading_list/core", @@ -41,6 +42,7 @@ source_set("content_suggestions") { "//ios/chrome/browser", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/favicon", + "//ios/chrome/browser/main:public", "//ios/chrome/browser/metrics:metrics_internal", "//ios/chrome/browser/ntp", "//ios/chrome/browser/ntp_snippets", @@ -61,7 +63,6 @@ source_set("content_suggestions") { "//ios/chrome/browser/ui/content_suggestions/identifier", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/favicon", - "//ios/chrome/browser/ui/location_bar:notifications", "//ios/chrome/browser/ui/ntp", "//ios/chrome/browser/ui/ntp:ntp_internal", "//ios/chrome/browser/ui/overscroll_actions", @@ -70,10 +71,11 @@ source_set("content_suggestions") { "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/url_loading", + "//ios/chrome/browser/voice", "//ios/chrome/browser/web_state_list", "//ios/chrome/common/app_group", - "//ios/chrome/common/favicon", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/favicon", + "//ios/chrome/common/ui/util", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/images", "//ios/public/provider/chrome/browser/signin", @@ -133,6 +135,7 @@ source_set("content_suggestions_ui") { "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/content_suggestions/cells:cells_ui", "//ios/chrome/browser/ui/content_suggestions/identifier", + "//ios/chrome/browser/ui/elements", "//ios/chrome/browser/ui/list_model", "//ios/chrome/browser/ui/ntp", "//ios/chrome/browser/ui/ntp_tile_views", @@ -142,15 +145,13 @@ source_set("content_suggestions_ui") { "//ios/chrome/browser/ui/toolbar/buttons", "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/util:util", - "//ios/chrome/common/colors", - "//ios/chrome/common/favicon", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/favicon", + "//ios/chrome/common/ui/util", "//ios/web/common", "//ui/base", ] - public_deps = [ - "//ios/third_party/material_components_ios", - ] + public_deps = [ "//ios/third_party/material_components_ios" ] configs += [ "//build/config/compiler:enable_arc" ] } @@ -159,9 +160,7 @@ source_set("content_suggestions_constant") { "ntp_home_constant.h", "ntp_home_constant.mm", ] - deps = [ - "//ios/chrome/common/colors", - ] + deps = [ "//ios/chrome/common/ui/colors" ] configs += [ "//build/config/compiler:enable_arc" ] } @@ -183,7 +182,8 @@ source_set("content_suggestions_ui_util") { "//ios/chrome/browser/ui/ntp_tile_views:constants", "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/util", - "//ios/chrome/common/colors", + "//ios/chrome/common/ui/colors", + "//ios/components/ui_util", "//ios/third_party/material_components_ios", "//ios/web/common", "//ui/base", @@ -209,6 +209,8 @@ source_set("unit_tests") { "//components/signin/public/identity_manager", "//ios/chrome/browser", "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/main:public", + "//ios/chrome/browser/main:test_support", "//ios/chrome/browser/ntp_snippets", "//ios/chrome/browser/search_engines", "//ios/chrome/browser/signin", @@ -220,12 +222,14 @@ source_set("unit_tests") { "//ios/chrome/browser/ui/content_suggestions/cells", "//ios/chrome/browser/ui/content_suggestions/cells:cells_ui", "//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/url_loading:test_support", + "//ios/chrome/browser/voice:test_support", "//ios/chrome/browser/web_state_list", "//ios/chrome/browser/web_state_list:test_support", + "//ios/public/provider/chrome/browser:test_support", "//ios/public/provider/chrome/browser/ui", "//ios/testing:block_swizzler", "//ios/web/public/test", @@ -257,6 +261,7 @@ source_set("eg2_tests") { "//base/test:test_support", "//components/strings", "//ios/chrome/app/strings", + "//ios/chrome/browser/ui/settings:constants", "//ios/chrome/browser/ui/toolbar/public:constants", "//ios/chrome/test:eg_test_support+eg2", "//ios/chrome/test/earl_grey:eg_test_support+eg2", @@ -299,6 +304,7 @@ source_set("eg_tests") { "//ios/chrome/browser/ui/content_suggestions/cells:cells_ui", "//ios/chrome/browser/ui/location_bar:location_bar", "//ios/chrome/browser/ui/settings", + "//ios/chrome/browser/ui/settings:constants", "//ios/chrome/browser/ui/toolbar/buttons", "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/util", @@ -328,13 +334,9 @@ source_set("eg_test_support+eg2") { ] testonly = true - sources = [ - "content_suggestions_app_interface.h", - ] + sources = [ "content_suggestions_app_interface.h" ] - deps = [ - "//ios/third_party/earl_grey2:test_lib", - ] + deps = [ "//ios/third_party/earl_grey2:test_lib" ] } source_set("eg_app_support+eg2") { 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 947de7810f2..27201983ed7 100644 --- a/chromium/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn @@ -20,7 +20,7 @@ source_set("cells") { "//ios/chrome/browser/ui/collection_view", "//ios/chrome/browser/ui/content_suggestions/identifier", "//ios/chrome/browser/ui/ntp_tile_views:constants", - "//ios/chrome/common/favicon", + "//ios/chrome/common/ui/favicon", "//ui/base", "//url", ] @@ -64,14 +64,12 @@ source_set("cells_ui") { "//ios/chrome/browser/ui/ntp_tile_views:constants", "//ios/chrome/browser/ui/util", "//ios/chrome/common", - "//ios/chrome/common/colors", - "//ios/chrome/common/favicon", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/favicon", + "//ios/chrome/common/ui/util", "//ui/base", ] - public_deps = [ - "//ios/third_party/material_components_ios", - ] + public_deps = [ "//ios/third_party/material_components_ios" ] configs += [ "//build/config/compiler:enable_arc" ] } @@ -92,7 +90,7 @@ source_set("unit_tests") { "//ios/chrome/app/strings", "//ios/chrome/browser/ui/collection_view", "//ios/chrome/browser/ui/util", - "//ios/chrome/common/favicon", + "//ios/chrome/common/ui/favicon", "//testing/gtest", "//third_party/ocmock", "//ui/base", diff --git a/chromium/ios/chrome/browser/ui/content_suggestions/identifier/BUILD.gn b/chromium/ios/chrome/browser/ui/content_suggestions/identifier/BUILD.gn index 494e7178bc2..d01df79fe09 100644 --- a/chromium/ios/chrome/browser/ui/content_suggestions/identifier/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/content_suggestions/identifier/BUILD.gn @@ -9,17 +9,13 @@ source_set("identifier") { "content_suggestions_section_information.h", "content_suggestions_section_information.mm", ] - deps = [ - "//base", - ] + deps = [ "//base" ] configs += [ "//build/config/compiler:enable_arc" ] } source_set("unit_tests") { testonly = true - sources = [ - "content_suggestion_identifier_unittest.mm", - ] + sources = [ "content_suggestion_identifier_unittest.mm" ] deps = [ ":identifier", "//testing/gtest", diff --git a/chromium/ios/chrome/browser/ui/context_menu/BUILD.gn b/chromium/ios/chrome/browser/ui/context_menu/BUILD.gn index 3950903f8a5..d02973ffc13 100644 --- a/chromium/ios/chrome/browser/ui/context_menu/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/context_menu/BUILD.gn @@ -21,12 +21,12 @@ source_set("context_menu") { source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true - sources = [ - "context_menu_coordinator_unittest.mm", - ] + sources = [ "context_menu_coordinator_unittest.mm" ] deps = [ ":context_menu", "//base", + "//base/test:test_support", + "//ios/chrome/browser/main:test_support", "//testing/gtest", ] } diff --git a/chromium/ios/chrome/browser/ui/coordinators/BUILD.gn b/chromium/ios/chrome/browser/ui/coordinators/BUILD.gn index effb8fa6cdc..6969e04dea2 100644 --- a/chromium/ios/chrome/browser/ui/coordinators/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/coordinators/BUILD.gn @@ -12,6 +12,6 @@ source_set("chrome_coordinators") { deps = [ "//base", - "//ios/chrome/browser/main", + "//ios/chrome/browser/main:public", ] } diff --git a/chromium/ios/chrome/browser/ui/dialogs/BUILD.gn b/chromium/ios/chrome/browser/ui/dialogs/BUILD.gn index 71ad2b3324d..01f14cb6d64 100644 --- a/chromium/ios/chrome/browser/ui/dialogs/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/dialogs/BUILD.gn @@ -33,9 +33,7 @@ source_set("feature_flags") { source_set("unit_tests") { testonly = true - sources = [ - "java_script_dialog_blocking_state_unittest.mm", - ] + sources = [ "java_script_dialog_blocking_state_unittest.mm" ] deps = [ ":dialogs", @@ -81,7 +79,6 @@ source_set("dialogs_internal") { "//ios/chrome/browser/overlays/public/web_content_area", "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/alert_coordinator", - "//ios/chrome/browser/ui/dialogs/non_modal", "//ios/chrome/browser/ui/util", "//ios/web", "//ui/base", @@ -96,9 +93,7 @@ source_set("completion_block_util") { "completion_block_util.h", "completion_block_util.mm", ] - deps = [ - "//base", - ] + deps = [ "//base" ] } source_set("unit_tests_internal") { @@ -132,9 +127,7 @@ source_set("eg_tests") { defines = [ "CHROME_EARL_GREY_1" ] configs += [ "//build/config/compiler:enable_arc" ] testonly = true - sources = [ - "javascript_dialog_egtest.mm", - ] + sources = [ "javascript_dialog_egtest.mm" ] deps = [ ":constants", ":feature_flags", @@ -171,9 +164,7 @@ source_set("eg2_tests") { "//build/config/ios:xctest_config", ] testonly = true - sources = [ - "javascript_dialog_egtest.mm", - ] + sources = [ "javascript_dialog_egtest.mm" ] deps = [ ":constants", ":feature_flags", diff --git a/chromium/ios/chrome/browser/ui/dialogs/non_modal/BUILD.gn b/chromium/ios/chrome/browser/ui/dialogs/non_modal/BUILD.gn deleted file mode 100644 index 2c97712aa7f..00000000000 --- a/chromium/ios/chrome/browser/ui/dialogs/non_modal/BUILD.gn +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 2018 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -source_set("non_modal") { - sources = [ - "non_modal_alert_coordinator.h", - "non_modal_alert_coordinator.mm", - ] - - configs += [ "//build/config/compiler:enable_arc" ] - - deps = [ - ":ui", - "//base", - "//ios/chrome/browser/ui/alert_coordinator", - "//ios/chrome/browser/ui/fullscreen", - "//ios/chrome/browser/ui/fullscreen:coordinators", - ] -} - -source_set("ui") { - sources = [ - "non_modal_alert_presentation_updater.h", - "non_modal_alert_presentation_updater.mm", - "non_modal_alert_touch_forwarder.h", - "non_modal_alert_touch_forwarder.mm", - ] - - configs += [ "//build/config/compiler:enable_arc" ] - - deps = [ - "//base", - "//ios/chrome/browser/ui/fullscreen:ui", - ] -} - -source_set("unit_tests") { - testonly = true - sources = [ - "non_modal_alert_presentation_updater_unittest.mm", - "non_modal_alert_touch_forwarder_unittest.mm", - ] - - configs += [ "//build/config/compiler:enable_arc" ] - - deps = [ - ":ui", - "//base", - "//base/test:test_support", - "//ios/chrome/browser/ui/fullscreen", - "//ios/chrome/browser/ui/fullscreen/test", - "//testing/gtest", - ] -} diff --git a/chromium/ios/chrome/browser/ui/download/BUILD.gn b/chromium/ios/chrome/browser/ui/download/BUILD.gn index 989ca05a350..468cad90bcc 100644 --- a/chromium/ios/chrome/browser/ui/download/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/download/BUILD.gn @@ -41,18 +41,21 @@ source_set("download") { "//ios/chrome/browser/store_kit", "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/colors", + "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", + "//ios/chrome/browser/ui/download/activities", "//ios/chrome/browser/ui/presenters", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web:web_internal", "//ios/chrome/browser/web_state_list:web_state_list", - "//ios/chrome/common/colors", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/util", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/images", "//ios/third_party/material_components_ios", "//ios/web", "//ios/web:core", + "//ios/web/common", "//net", "//ui/base", "//ui/gfx", @@ -90,6 +93,7 @@ source_set("unit_tests") { "//ios/chrome/test:test_support", "//ios/chrome/test/app:test_support", "//ios/chrome/test/fakes", + "//ios/web/common:features", "//ios/web/public/test", "//ios/web/public/test/fakes", "//net:test_support", @@ -118,12 +122,15 @@ source_set("eg_tests") { deps = [ "//base", "//base/test:test_support", + "//components/infobars/core:feature_flags", "//ios/chrome/app:app_internal", "//ios/chrome/app/strings", "//ios/chrome/browser:browser", "//ios/chrome/browser/download", "//ios/chrome/browser/download:test_support", "//ios/chrome/browser/ui/browser_view", + "//ios/chrome/browser/ui/infobars:feature_flags", + "//ios/chrome/browser/ui/infobars/banners:public", "//ios/chrome/browser/ui/util", "//ios/chrome/test:eg_test_support", "//ios/chrome/test:test_support", @@ -133,6 +140,7 @@ source_set("eg_tests") { "//ios/testing/earl_grey:earl_grey_support", "//ios/third_party/earl_grey:earl_grey+link", "//ios/web:earl_grey_test_support", + "//ios/web/common", "//ios/web/public", "//ios/web/public/test:element_selector", "//net:test_support", @@ -156,15 +164,19 @@ source_set("eg2_tests") { ] deps = [ + "//components/infobars/core:feature_flags", "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser:chrome_url_constants", "//ios/chrome/browser/download:mime_types", "//ios/chrome/browser/download:test_support", + "//ios/chrome/browser/ui/infobars:feature_flags", + "//ios/chrome/browser/ui/infobars/banners:public", "//ios/chrome/test:eg_test_support+eg2", "//ios/chrome/test/earl_grey:eg_test_support+eg2", "//ios/testing:embedded_test_server_support", "//ios/testing/earl_grey:eg_test_support+eg2", "//ios/third_party/earl_grey2:test_lib", + "//ios/web/common", "//ios/web/public/test:element_selector", "//net:test_support", "//ui/base", @@ -172,3 +184,12 @@ source_set("eg2_tests") { libs = [ "UIKit.framework" ] } + +source_set("features") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "features.h", + "features.mm", + ] + deps = [ "//base" ] +} diff --git a/chromium/ios/chrome/browser/ui/download/activities/BUILD.gn b/chromium/ios/chrome/browser/ui/download/activities/BUILD.gn new file mode 100644 index 00000000000..bd39c240ed8 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/download/activities/BUILD.gn @@ -0,0 +1,21 @@ +# Copyright 2020 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("activities") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "open_downloads_folder_activity.h", + "open_downloads_folder_activity.mm", + ] + deps = [ + "resources:activity_services_downloads", + "//base", + "//ios/chrome/app/strings", + "//ios/chrome/browser/download", + "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/popup_menu/public:popup_menu_ui", + "//ui/base", + ] + libs = [ "UIKit.framework" ] +} diff --git a/chromium/ios/chrome/browser/ui/download/activities/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/download/activities/resources/BUILD.gn new file mode 100644 index 00000000000..7324916afc7 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/download/activities/resources/BUILD.gn @@ -0,0 +1,14 @@ +# Copyright 2020 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/ios/asset_catalog.gni") + +imageset("activity_services_downloads") { + sources = [ + "activity_services_downloads.imageset/Contents.json", + "activity_services_downloads.imageset/activity_services_downloads-60@2x.png", + "activity_services_downloads.imageset/activity_services_downloads-60@3x.png", + "activity_services_downloads.imageset/activity_services_downloads-76@2x.png", + ] +} diff --git a/chromium/ios/chrome/browser/ui/elements/BUILD.gn b/chromium/ios/chrome/browser/ui/elements/BUILD.gn index eb818cebffb..27a065f9456 100644 --- a/chromium/ios/chrome/browser/ui/elements/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/elements/BUILD.gn @@ -11,8 +11,6 @@ source_set("elements") { "fade_truncating_label.mm", "gray_highlight_button.h", "gray_highlight_button.mm", - "selector_coordinator.h", - "selector_coordinator.mm", "selector_picker_presentation_controller.h", "selector_picker_presentation_controller.mm", "selector_picker_view_controller.h", @@ -27,10 +25,24 @@ source_set("elements") { ] deps = [ "//base", + "//ios/chrome/browser/ui/util", + "//ios/chrome/common/ui/colors", + ] +} + +source_set("selector_coordinator") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "selector_coordinator.h", + "selector_coordinator.mm", + ] + deps = [ + ":elements", + "//base", "//ios/chrome/browser", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/util", - "//ios/chrome/common/colors", + "//ios/chrome/common/ui/colors", ] } @@ -48,8 +60,10 @@ source_set("unit_tests") { deps = [ ":elements", ":elements_internal", + ":selector_coordinator", "//base", "//base/test:test_support", + "//ios/chrome/browser/main:test_support", "//ios/chrome/test:test_support", "//testing/gtest", "//third_party/ocmock", @@ -74,8 +88,8 @@ source_set("elements_internal") { "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/material_components", "//ios/chrome/browser/ui/util", - "//ios/chrome/common/colors", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/util", "//ios/third_party/material_components_ios", ] libs = [ "UIKit.framework" ] diff --git a/chromium/ios/chrome/browser/ui/fancy_ui/BUILD.gn b/chromium/ios/chrome/browser/ui/fancy_ui/BUILD.gn index fe8377f0844..cf0070c1a31 100644 --- a/chromium/ios/chrome/browser/ui/fancy_ui/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/fancy_ui/BUILD.gn @@ -14,19 +14,15 @@ source_set("fancy_ui") { "//base", "//base:i18n", "//ios/chrome/browser/ui/colors", - "//ios/chrome/common/colors", - ] - public_deps = [ - "//ios/third_party/material_components_ios", + "//ios/chrome/common/ui/colors", ] + public_deps = [ "//ios/third_party/material_components_ios" ] libs = [ "UIKit.framework" ] } source_set("unit_tests") { testonly = true - sources = [ - "bidi_container_view_unittest.mm", - ] + sources = [ "bidi_container_view_unittest.mm" ] deps = [ ":fancy_ui", "//base", diff --git a/chromium/ios/chrome/browser/ui/favicon/BUILD.gn b/chromium/ios/chrome/browser/ui/favicon/BUILD.gn index ea369bb4e27..46d07c2f9bb 100644 --- a/chromium/ios/chrome/browser/ui/favicon/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/favicon/BUILD.gn @@ -19,7 +19,7 @@ source_set("favicon") { "//components/favicon_base", "//ios/chrome/browser/favicon", "//ios/chrome/browser/ui/util", - "//ios/chrome/common/favicon", + "//ios/chrome/common/ui/favicon", "//url", ] configs += [ "//build/config/compiler:enable_arc" ] diff --git a/chromium/ios/chrome/browser/ui/find_bar/BUILD.gn b/chromium/ios/chrome/browser/ui/find_bar/BUILD.gn index c2ce7283b85..f59a2f0ba32 100644 --- a/chromium/ios/chrome/browser/ui/find_bar/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/find_bar/BUILD.gn @@ -7,8 +7,14 @@ source_set("find_bar") { sources = [ "find_bar_controller_ios.h", "find_bar_controller_ios.mm", + "find_bar_coordinator.h", + "find_bar_coordinator.mm", + "find_bar_mediator.h", + "find_bar_mediator.mm", "find_bar_view.h", "find_bar_view.mm", + "find_bar_view_controller.h", + "find_bar_view_controller.mm", ] deps = [ ":constants", @@ -18,14 +24,20 @@ source_set("find_bar") { "//base:i18n", "//components/strings", "//ios/chrome/app/strings", + "//ios/chrome/browser/browser_state", "//ios/chrome/browser/find_in_page", + "//ios/chrome/browser/main", "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/image_util", + "//ios/chrome/browser/ui/presenters", "//ios/chrome/browser/ui/resources:menu_shadow", + "//ios/chrome/browser/ui/toolbar/accessory", "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/util", - "//ios/chrome/common/colors", - "//ios/chrome/common/ui_util", + "//ios/chrome/browser/web_state_list", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/util", "//ios/third_party/material_components_ios", "//ui/base", "//ui/gfx", @@ -48,9 +60,7 @@ source_set("eg2_tests") { "//build/config/ios:xctest_config", ] testonly = true - sources = [ - "find_in_page_egtest.mm", - ] + sources = [ "find_in_page_egtest.mm" ] deps = [ ":constants", ":eg_test_support+eg2", @@ -59,6 +69,7 @@ source_set("eg2_tests") { "//components/strings", "//ios/chrome/app/strings", "//ios/chrome/browser/ui/popup_menu:constants", + "//ios/chrome/browser/ui/toolbar/accessory:constants", "//ios/chrome/test/earl_grey:eg_test_support+eg2", "//ios/testing/earl_grey:eg_test_support+eg2", "//ios/third_party/earl_grey2:test_lib", @@ -72,9 +83,7 @@ source_set("eg_tests") { defines = [ "CHROME_EARL_GREY_1" ] configs += [ "//build/config/compiler:enable_arc" ] testonly = true - sources = [ - "find_in_page_egtest.mm", - ] + sources = [ "find_in_page_egtest.mm" ] deps = [ ":constants", ":test_support", @@ -83,6 +92,7 @@ source_set("eg_tests") { "//components/strings", "//ios/chrome/app/strings", "//ios/chrome/browser/ui/popup_menu:constants", + "//ios/chrome/browser/ui/toolbar/accessory:constants", "//ios/chrome/test/earl_grey:test_support", "//ios/testing/earl_grey:earl_grey_support", "//ios/web/public/test/http_server", @@ -99,9 +109,7 @@ source_set("test_support") { "find_in_page_controller_app_interface.h", "find_in_page_controller_app_interface.mm", ] - deps = [ - "//ios/chrome/browser/find_in_page", - ] + deps = [ "//ios/chrome/browser/find_in_page" ] } source_set("eg_app_support+eg2") { @@ -115,9 +123,7 @@ source_set("eg_app_support+eg2") { "find_in_page_controller_app_interface.h", "find_in_page_controller_app_interface.mm", ] - deps = [ - "//ios/chrome/browser/find_in_page", - ] + deps = [ "//ios/chrome/browser/find_in_page" ] } source_set("eg_test_support+eg2") { @@ -127,7 +133,5 @@ source_set("eg_test_support+eg2") { "//build/config/ios:xctest_config", ] testonly = true - sources = [ - "find_in_page_controller_app_interface.h", - ] + sources = [ "find_in_page_controller_app_interface.h" ] } diff --git a/chromium/ios/chrome/browser/ui/first_run/BUILD.gn b/chromium/ios/chrome/browser/ui/first_run/BUILD.gn index 6e3fe97c63b..e1adf9bb1b8 100644 --- a/chromium/ios/chrome/browser/ui/first_run/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/first_run/BUILD.gn @@ -7,7 +7,6 @@ source_set("first_run") { sources = [ "first_run_chrome_signin_view_controller.h", "first_run_chrome_signin_view_controller.mm", - "first_run_histograms.h", "first_run_util.h", "first_run_util.mm", "orientation_limiting_navigation_controller.h", @@ -35,20 +34,20 @@ source_set("first_run") { "//ios/chrome/browser/first_run", "//ios/chrome/browser/main", "//ios/chrome/browser/signin", + "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/authentication", + "//ios/chrome/browser/ui/authentication/signin", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/fancy_ui", "//ios/chrome/browser/ui/icons", "//ios/chrome/browser/ui/material_components", - "//ios/chrome/browser/ui/promos", - "//ios/chrome/browser/ui/settings", "//ios/chrome/browser/ui/settings/sync/utils", "//ios/chrome/browser/ui/settings/utils", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/ui/util:terms_util", "//ios/chrome/browser/web_state_list", "//ios/chrome/common", - "//ios/chrome/common/colors", + "//ios/chrome/common/ui/colors", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/signin", "//ios/third_party/material_components_ios", @@ -71,10 +70,7 @@ source_set("constants") { source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true - sources = [ - "first_run_util_unittest.mm", - "welcome_to_chrome_view_controller_unittest.mm", - ] + sources = [ "welcome_to_chrome_view_controller_unittest.mm" ] deps = [ ":first_run", "//base", @@ -96,9 +92,7 @@ source_set("eg_tests") { defines = [ "CHROME_EARL_GREY_1" ] configs += [ "//build/config/compiler:enable_arc" ] testonly = true - sources = [ - "first_run_egtest.mm", - ] + sources = [ "first_run_egtest.mm" ] deps = [ ":constants", ":eg_test_support", @@ -131,9 +125,7 @@ source_set("eg2_tests") { "//build/config/ios:xctest_config", ] testonly = true - sources = [ - "first_run_egtest.mm", - ] + sources = [ "first_run_egtest.mm" ] deps = [ ":constants", ":eg_test_support+eg2", @@ -143,7 +135,7 @@ source_set("eg2_tests") { "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser/ui/authentication:eg_test_support+eg2", "//ios/chrome/test/earl_grey:eg_test_support+eg2", - "//ios/public/provider/chrome/browser/signin:test_support", + "//ios/public/provider/chrome/browser/signin:fake_chrome_identity", "//ios/testing/earl_grey:eg_test_support+eg2", "//ios/third_party/earl_grey2:test_lib", "//ui/base", diff --git a/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn b/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn index 1871dca4e19..42e4cf7380d 100644 --- a/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn @@ -7,7 +7,6 @@ source_set("fullscreen") { "animated_scoped_fullscreen_disabler.h", "animated_scoped_fullscreen_disabler.mm", "fullscreen_controller.h", - "fullscreen_controller_factory.h", "fullscreen_controller_observer.h", "fullscreen_ui_updater.h", "scoped_fullscreen_disabler.h", @@ -23,6 +22,7 @@ source_set("fullscreen") { "//base", "//components/keyed_service/core", "//components/keyed_service/ios", + "//ios/chrome/browser/ui/fullscreen:feature_flags", "//ios/chrome/browser/web_state_list", "//ios/chrome/common", ] @@ -54,6 +54,7 @@ source_set("coordinators") { ":fullscreen", "//base", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", + "//ios/chrome/browser/ui/fullscreen:feature_flags", ] } @@ -61,7 +62,6 @@ source_set("internal") { sources = [ "fullscreen_content_adjustment_util.h", "fullscreen_content_adjustment_util.mm", - "fullscreen_controller_factory.mm", "fullscreen_controller_impl.h", "fullscreen_controller_impl.mm", "fullscreen_mediator.h", @@ -91,6 +91,7 @@ source_set("internal") { "//components/keyed_service/ios", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/main:public", "//ios/chrome/browser/ui/broadcaster", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/ui/util", @@ -159,9 +160,7 @@ source_set("unit_tests") { source_set("eg_tests") { defines = [ "CHROME_EARL_GREY_1" ] testonly = true - sources = [ - "fullscreen_egtest.mm", - ] + sources = [ "fullscreen_egtest.mm" ] configs += [ "//build/config/compiler:enable_arc" ] @@ -192,9 +191,7 @@ source_set("eg2_tests") { "//build/config/ios:xctest_config", ] testonly = true - sources = [ - "fullscreen_egtest.mm", - ] + sources = [ "fullscreen_egtest.mm" ] deps = [ "//base", "//base/test:test_support", diff --git a/chromium/ios/chrome/browser/ui/fullscreen/test/BUILD.gn b/chromium/ios/chrome/browser/ui/fullscreen/test/BUILD.gn index 44e056fad65..60c66112b87 100644 --- a/chromium/ios/chrome/browser/ui/fullscreen/test/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/fullscreen/test/BUILD.gn @@ -39,7 +39,9 @@ source_set("eg_test_support") { ] deps = [ "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/main:public", "//ios/chrome/browser/ui/fullscreen", + "//ios/chrome/browser/ui/fullscreen:feature_flags", "//ios/chrome/test/app:test_support", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/ui", @@ -56,7 +58,9 @@ source_set("eg_app_support+eg2") { ] deps = [ "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/main:public", "//ios/chrome/browser/ui/fullscreen", + "//ios/chrome/browser/ui/fullscreen:feature_flags", "//ios/chrome/test/app:test_support", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/ui", diff --git a/chromium/ios/chrome/browser/ui/history/BUILD.gn b/chromium/ios/chrome/browser/ui/history/BUILD.gn index 16d8c47aede..f13380b71e0 100644 --- a/chromium/ios/chrome/browser/ui/history/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/history/BUILD.gn @@ -23,6 +23,7 @@ source_set("history") { "//ios/chrome/browser/browser_state", "//ios/chrome/browser/favicon", "//ios/chrome/browser/history", + "//ios/chrome/browser/main:public", "//ios/chrome/browser/sync", "//ios/chrome/browser/ui/context_menu", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", @@ -58,11 +59,11 @@ source_set("history_ui") { "history_entry_item.mm", "history_entry_item_delegate.h", "history_entry_item_interface.h", - "history_local_commands.h", "history_table_view_controller.h", "history_table_view_controller.mm", "history_transitioning_delegate.h", "history_transitioning_delegate.mm", + "history_ui_delegate.h", "history_util.h", "history_util.mm", ] @@ -80,6 +81,7 @@ source_set("history_ui") { "//ios/chrome/app/strings", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/main:public", "//ios/chrome/browser/metrics:metrics_internal", "//ios/chrome/browser/sync", "//ios/chrome/browser/ui/collection_view/cells", @@ -93,8 +95,9 @@ source_set("history_ui") { "//ios/chrome/browser/ui/table_view/cells:cells_constants", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/url_loading", - "//ios/chrome/common/favicon", - "//ios/chrome/common/ui_util", + "//ios/chrome/browser/web_state_list", + "//ios/chrome/common/ui/favicon", + "//ios/chrome/common/ui/util", "//ui/base", ] } @@ -108,6 +111,7 @@ source_set("clear_browsing_data") { deps = [ ":history_ui", "//base", + "//ios/chrome/browser/main:public", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/history/public", @@ -124,9 +128,7 @@ source_set("clear_browsing_data") { source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true - sources = [ - "history_entry_inserter_unittest.mm", - ] + sources = [ "history_entry_inserter_unittest.mm" ] deps = [ ":history_ui", "//base", @@ -140,46 +142,51 @@ source_set("unit_tests") { } source_set("eg_tests") { + defines = [ "CHROME_EARL_GREY_1" ] configs += [ "//build/config/compiler:enable_arc" ] testonly = true - sources = [ - "history_ui_egtest.mm", - ] + sources = [ "history_ui_egtest.mm" ] deps = [ ":constants", - ":history", - ":history_ui", "//base", - "//components/browsing_data/core", - "//components/prefs", - "//components/strings", - "//components/url_formatter:url_formatter", "//ios/chrome/app/strings", - "//ios/chrome/browser", - "//ios/chrome/browser/browser_state", - "//ios/chrome/browser/ui/authentication:eg_test_support", - "//ios/chrome/browser/ui/authentication/cells", "//ios/chrome/browser/ui/popup_menu:constants", - "//ios/chrome/browser/ui/settings", - "//ios/chrome/browser/ui/settings/cells", - "//ios/chrome/browser/ui/table_view", + "//ios/chrome/browser/ui/settings/cells:clear_browsing_data_constants", "//ios/chrome/browser/ui/table_view:feature_flags", - "//ios/chrome/browser/ui/table_view/cells", - "//ios/chrome/browser/ui/util", "//ios/chrome/common", - "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", - "//ios/public/provider/chrome/browser/signin", - "//ios/public/provider/chrome/browser/signin:test_support", + "//ios/testing/earl_grey:earl_grey_support", "//ios/third_party/earl_grey:earl_grey+link", - "//ios/web/public/test", "//ios/web/public/test/http_server", - "//net", "//net:test_support", - "//ui/base", ] libs = [ "UIKit.framework", "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 = [ "history_ui_egtest.mm" ] + deps = [ + ":constants", + "//base", + "//ios/chrome/app/strings", + "//ios/chrome/browser/ui/popup_menu:constants", + "//ios/chrome/browser/ui/settings/cells:clear_browsing_data_constants", + "//ios/chrome/browser/ui/table_view:feature_flags", + "//ios/chrome/common", + "//ios/chrome/test/earl_grey:eg_test_support+eg2", + "//ios/testing/earl_grey:eg_test_support+eg2", + "//ios/third_party/earl_grey2:test_lib", + "//ios/web/public/test/http_server", + "//net:test_support", + ] + libs = [ "UIKit.framework" ] +} diff --git a/chromium/ios/chrome/browser/ui/history/public/BUILD.gn b/chromium/ios/chrome/browser/ui/history/public/BUILD.gn index 6136001b603..521969b5a98 100644 --- a/chromium/ios/chrome/browser/ui/history/public/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/history/public/BUILD.gn @@ -4,7 +4,5 @@ source_set("public") { configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "history_presentation_delegate.h", - ] + sources = [ "history_presentation_delegate.h" ] } diff --git a/chromium/ios/chrome/browser/ui/icons/BUILD.gn b/chromium/ios/chrome/browser/ui/icons/BUILD.gn index af58f4c2d2f..c80ecb91621 100644 --- a/chromium/ios/chrome/browser/ui/icons/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/icons/BUILD.gn @@ -26,9 +26,7 @@ source_set("icons") { source_set("unit_tests") { testonly = true - sources = [ - "chrome_icon_unittest.mm", - ] + sources = [ "chrome_icon_unittest.mm" ] deps = [ ":icons", "//ios/chrome/app/strings", diff --git a/chromium/ios/chrome/browser/ui/image_util/BUILD.gn b/chromium/ios/chrome/browser/ui/image_util/BUILD.gn index c0e484e5e6b..50f4f717421 100644 --- a/chromium/ios/chrome/browser/ui/image_util/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/image_util/BUILD.gn @@ -7,9 +7,7 @@ source_set("image_util") { "image_util.h", "image_util.mm", ] - deps = [ - "//ui/base", - ] + deps = [ "//ui/base" ] configs += [ "//build/config/compiler:enable_arc" ] } diff --git a/chromium/ios/chrome/browser/ui/infobars/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/BUILD.gn index ba6e74ea43a..a169480bf0a 100644 --- a/chromium/ios/chrome/browser/ui/infobars/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/infobars/BUILD.gn @@ -19,9 +19,11 @@ source_set("infobars") { "//ios/chrome/browser/infobars", "//ios/chrome/browser/infobars:badge", "//ios/chrome/browser/infobars:public", + "//ios/chrome/browser/main:public", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/fullscreen", + "//ios/chrome/browser/ui/fullscreen:feature_flags", "//ios/chrome/browser/ui/infobars/banners:public", "//ios/chrome/browser/ui/infobars/coordinators", "//ios/chrome/browser/upgrade", @@ -51,9 +53,8 @@ source_set("feature_flags") { "infobar_feature.h", "infobar_feature.mm", ] - deps = [ - "//base", - ] + public_deps = [ "//base" ] + deps = [ "//components/infobars/core:feature_flags" ] } source_set("infobars_ui") { @@ -90,16 +91,14 @@ source_set("infobars_ui") { "//ios/chrome/browser/ui/fullscreen:ui", "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/util", - "//ios/chrome/common/colors", + "//ios/chrome/common/ui/colors", "//ios/public/provider/chrome/browser/ui", "//ios/third_party/material_components_ios", "//ui/base", "//ui/gfx", "//url", ] - public_deps = [ - ":constants", - ] + public_deps = [ ":constants" ] libs = [ "CoreGraphics.framework", "QuartzCore.framework", @@ -125,6 +124,7 @@ source_set("unit_tests") { "//ios/chrome/browser/infobars", "//ios/chrome/browser/infobars:badge", "//ios/chrome/browser/infobars:public", + "//ios/chrome/browser/main:test_support", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/infobars/coordinators", "//ios/chrome/browser/ui/infobars/test", @@ -147,14 +147,32 @@ source_set("eg2_tests") { testonly = true sources = [ "infobar_egtest.mm", + "translate_infobar_egtest.mm", ] deps = [ ":eg_test_support+eg2", "//base", + "//base/test:test_support", + "//components/infobars/core:feature_flags", + "//components/strings:components_strings_grit", + "//components/translate/core/browser:translate_pref_names", + "//components/translate/core/common", + "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser:chrome_url_constants", + "//ios/chrome/browser/translate:eg_test_support+eg2", + "//ios/chrome/browser/ui/badges:public", + "//ios/chrome/browser/ui/infobars:constants", + "//ios/chrome/browser/ui/infobars:feature_flags", + "//ios/chrome/browser/ui/infobars/banners:public", + "//ios/chrome/browser/ui/infobars/modals:public", + "//ios/chrome/browser/ui/popup_menu:constants", "//ios/chrome/test/earl_grey:eg_test_support+eg2", + "//ios/components/webui:url_constants", "//ios/testing/earl_grey:eg_test_support+eg2", "//ios/third_party/earl_grey2:test_lib", "//ios/web/public/test/http_server", + "//net", + "//ui/base", "//url", ] libs = [ "UIKit.framework" ] @@ -166,13 +184,29 @@ source_set("eg_tests") { testonly = true sources = [ "infobar_egtest.mm", + "translate_infobar_egtest.mm", ] deps = [ ":eg_test_support", "//base", + "//base/test:test_support", + "//components/infobars/core:feature_flags", + "//components/translate/core/browser:translate_pref_names", + "//components/translate/core/common", + "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser:chrome_url_constants", + "//ios/chrome/browser/translate:test_support", + "//ios/chrome/browser/ui/badges:public", + "//ios/chrome/browser/ui/infobars:constants", + "//ios/chrome/browser/ui/infobars:feature_flags", + "//ios/chrome/browser/ui/infobars/banners:public", + "//ios/chrome/browser/ui/infobars/modals:public", + "//ios/chrome/browser/ui/popup_menu:constants", "//ios/chrome/test/earl_grey:test_support", + "//ios/components/webui:url_constants", "//ios/testing/earl_grey:earl_grey_support", "//ios/web/public/test/http_server", + "//ui/base", "//url", ] libs = [ "XCTest.framework" ] @@ -243,7 +277,5 @@ source_set("eg_test_support+eg2") { "//build/config/ios:xctest_config", ] testonly = true - sources = [ - "infobar_manager_app_interface.h", - ] + sources = [ "infobar_manager_app_interface.h" ] } diff --git a/chromium/ios/chrome/browser/ui/infobars/banners/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/banners/BUILD.gn index 7e9dcd0b422..7fd81fb4328 100644 --- a/chromium/ios/chrome/browser/ui/infobars/banners/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/infobars/banners/BUILD.gn @@ -5,6 +5,9 @@ source_set("banners") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ + "infobar_banner_accessibility_util.h", + "infobar_banner_accessibility_util.mm", + "infobar_banner_consumer.h", "infobar_banner_delegate.h", "infobar_banner_view_controller.h", "infobar_banner_view_controller.mm", @@ -14,8 +17,9 @@ source_set("banners") { "//base", "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser/infobars:public", + "//ios/chrome/browser/ui/infobars:feature_flags", "//ios/chrome/browser/ui/util", - "//ios/chrome/common/colors", + "//ios/chrome/common/ui/colors", "//ui/base", ] } @@ -25,6 +29,7 @@ source_set("public") { sources = [ "infobar_banner_constants.h", "infobar_banner_constants.mm", + "infobar_banner_container.h", "infobar_banner_interaction_delegate.h", "infobar_banner_presentation_state.h", ] @@ -33,9 +38,7 @@ source_set("public") { source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true - sources = [ - "infobar_banner_view_controller_unittest.mm", - ] + sources = [ "infobar_banner_view_controller_unittest.mm" ] deps = [ ":banners", "//ios/chrome/browser/infobars:public", diff --git a/chromium/ios/chrome/browser/ui/infobars/banners/test/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/banners/test/BUILD.gn new file mode 100644 index 00000000000..dd71e841fc4 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/infobars/banners/test/BUILD.gn @@ -0,0 +1,18 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +source_set("test") { + testonly = true + sources = [ + "fake_infobar_banner_consumer.h", + "fake_infobar_banner_consumer.mm", + ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + "//base", + "//ios/chrome/browser/ui/infobars/banners", + ] +} diff --git a/chromium/ios/chrome/browser/ui/infobars/coordinators/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/coordinators/BUILD.gn index 7cb8f7745e6..6a655c7853a 100644 --- a/chromium/ios/chrome/browser/ui/infobars/coordinators/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/infobars/coordinators/BUILD.gn @@ -7,6 +7,7 @@ source_set("coordinators") { sources = [ "infobar_confirm_coordinator.h", "infobar_confirm_coordinator.mm", + "infobar_coordinator+subclassing.h", "infobar_coordinator.h", "infobar_coordinator.mm", "infobar_coordinator_implementation.h", @@ -23,6 +24,7 @@ source_set("coordinators") { "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser/infobars:public", "//ios/chrome/browser/infobars:public", + "//ios/chrome/browser/main:public", "//ios/chrome/browser/passwords:infobar_delegates", "//ios/chrome/browser/passwords:public", "//ios/chrome/browser/translate:public", @@ -30,12 +32,14 @@ source_set("coordinators") { "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/fullscreen", + "//ios/chrome/browser/ui/fullscreen:feature_flags", "//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/toolbar/public:feature_flags", "//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 1cffb61ba28..7277a598555 100644 --- a/chromium/ios/chrome/browser/ui/infobars/modals/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/infobars/modals/BUILD.gn @@ -8,6 +8,7 @@ source_set("modals") { "infobar_modal_delegate.h", "infobar_modal_view_controller.h", "infobar_modal_view_controller.mm", + "infobar_password_modal_consumer.h", "infobar_password_modal_delegate.h", "infobar_password_table_view_controller.h", "infobar_password_table_view_controller.mm", @@ -29,6 +30,7 @@ source_set("modals") { "//ios/chrome/browser/infobars:public", "//ios/chrome/browser/passwords:public", "//ios/chrome/browser/ui/autofill:autofill_message", + "//ios/chrome/browser/ui/autofill:autofill_metrics", "//ios/chrome/browser/ui/infobars/coordinators:translate_public", "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/table_view:styler", @@ -44,5 +46,7 @@ source_set("public") { sources = [ "infobar_modal_constants.h", "infobar_modal_constants.mm", + "infobar_translate_modal_constants.h", + "infobar_translate_modal_constants.mm", ] } diff --git a/chromium/ios/chrome/browser/ui/infobars/modals/test/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/modals/test/BUILD.gn new file mode 100644 index 00000000000..8f8c62452b9 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/infobars/modals/test/BUILD.gn @@ -0,0 +1,13 @@ +# Copyright 2020 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 + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "fake_infobar_password_modal_consumer.h", + "fake_infobar_password_modal_consumer.mm", + ] + deps = [ "//ios/chrome/browser/ui/infobars/modals" ] +} diff --git a/chromium/ios/chrome/browser/ui/infobars/presentation/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/presentation/BUILD.gn index 7d31a0af188..abdddf96fcd 100644 --- a/chromium/ios/chrome/browser/ui/infobars/presentation/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/infobars/presentation/BUILD.gn @@ -22,8 +22,10 @@ source_set("presentation") { ] deps = [ "//base", + "//ios/chrome/browser/ui/infobars:feature_flags", "//ios/chrome/browser/ui/infobars/banners:public", + "//ios/chrome/browser/ui/overlays:presentation_controller", "//ios/chrome/browser/ui/util", - "//ios/chrome/common/colors", + "//ios/chrome/common/ui/colors", ] } diff --git a/chromium/ios/chrome/browser/ui/infobars/test/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/test/BUILD.gn index 743608022fb..9c522b512d7 100644 --- a/chromium/ios/chrome/browser/ui/infobars/test/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/infobars/test/BUILD.gn @@ -6,6 +6,8 @@ source_set("test") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ + "fake_infobar_ui_delegate.h", + "fake_infobar_ui_delegate.mm", "test_infobar_password_delegate.h", "test_infobar_password_delegate.mm", ] @@ -16,6 +18,7 @@ source_set("test") { "//components/password_manager/core/browser:test_support", "//ios/chrome/browser/passwords:infobar_delegates", "//ios/chrome/browser/passwords:public", + "//ios/chrome/browser/ui/infobars:infobars_ui", "//testing/gmock", "//testing/gtest", ] diff --git a/chromium/ios/chrome/browser/ui/integration_tests/BUILD.gn b/chromium/ios/chrome/browser/ui/integration_tests/BUILD.gn index 4754c29cc5d..4c1e8fa5151 100644 --- a/chromium/ios/chrome/browser/ui/integration_tests/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/integration_tests/BUILD.gn @@ -9,9 +9,7 @@ source_set("eg2_tests") { "//build/config/ios:xctest_config", ] testonly = true - sources = [ - "pdf_egtest.mm", - ] + sources = [ "pdf_egtest.mm" ] deps = [ "//ios/chrome/test/earl_grey:eg_test_support+eg2", "//ios/testing/earl_grey:eg_test_support+eg2", diff --git a/chromium/ios/chrome/browser/ui/keyboard/BUILD.gn b/chromium/ios/chrome/browser/ui/keyboard/BUILD.gn index dd5a110bf15..7ec88026f03 100644 --- a/chromium/ios/chrome/browser/ui/keyboard/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/keyboard/BUILD.gn @@ -17,9 +17,7 @@ source_set("keyboard") { source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true - sources = [ - "UIKeyCommand+ChromeTest.mm", - ] + sources = [ "UIKeyCommand+ChromeTest.mm" ] deps = [ ":keyboard", "//base", @@ -32,9 +30,7 @@ source_set("eg_tests") { defines = [ "CHROME_EARL_GREY_1" ] configs += [ "//build/config/compiler:enable_arc" ] testonly = true - sources = [ - "keyboard_commands_egtest.mm", - ] + sources = [ "keyboard_commands_egtest.mm" ] deps = [ "//components/strings", "//ios/chrome/app/strings", @@ -58,9 +54,7 @@ source_set("eg2_tests") { "//build/config/ios:xctest_config", ] testonly = true - sources = [ - "keyboard_commands_egtest.mm", - ] + sources = [ "keyboard_commands_egtest.mm" ] deps = [ "//components/strings", "//ios/chrome/app/strings", diff --git a/chromium/ios/chrome/browser/ui/list_model/BUILD.gn b/chromium/ios/chrome/browser/ui/list_model/BUILD.gn index 44f2a899121..eb8d9f0b780 100644 --- a/chromium/ios/chrome/browser/ui/list_model/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/list_model/BUILD.gn @@ -11,9 +11,7 @@ source_set("list_model") { "list_model.h", "list_model.mm", ] - deps = [ - "//base", - ] + deps = [ "//base" ] } source_set("unit_tests") { diff --git a/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn b/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn index c33e351257c..3371c2689c4 100644 --- a/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn @@ -19,10 +19,10 @@ source_set("location_bar") { ] deps = [ ":constants", - "resources:location_bar_info", - "resources:location_bar_not_secure_warning", - "resources:location_bar_offline", - "resources:location_bar_secure", + "resources:location_bar_connection_dangerous", + "resources:location_bar_connection_info", + "resources:location_bar_connection_offline", + "resources:location_bar_connection_secure", "resources:location_bar_share", "resources:location_bar_voice", "//base", @@ -51,8 +51,10 @@ source_set("location_bar") { "//ios/chrome/browser/ui/badges", "//ios/chrome/browser/ui/badges:public", "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/elements", "//ios/chrome/browser/ui/fullscreen", + "//ios/chrome/browser/ui/fullscreen:feature_flags", "//ios/chrome/browser/ui/fullscreen:ui", "//ios/chrome/browser/ui/infobars:feature_flags", "//ios/chrome/browser/ui/infobars/badge", @@ -73,8 +75,8 @@ source_set("location_bar") { "//ios/chrome/browser/web", "//ios/chrome/browser/web_state_list", "//ios/chrome/common:timing", - "//ios/chrome/common/colors", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/util", "//ios/public/provider/chrome/browser:browser", "//ios/public/provider/chrome/browser/voice", "//ios/third_party/material_components_ios", @@ -114,6 +116,7 @@ source_set("location_bar_model_delegate") { "//ios/chrome/browser/reading_list", "//ios/chrome/browser/ssl", "//ios/chrome/browser/web_state_list", + "//ios/components/webui:url_constants", "//ios/web/public", "//ios/web/public/security", ] @@ -132,15 +135,6 @@ source_set("constants") { ] } -# TODO(crbug.com/778008): Remove this target. -source_set("notifications") { - sources = [ - "location_bar_notification_names.h", - "location_bar_notification_names.mm", - ] - configs += [ "//build/config/compiler:enable_arc" ] -} - source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true @@ -158,6 +152,7 @@ source_set("unit_tests") { "//ios/chrome/browser", "//ios/chrome/browser/autocomplete", "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/favicon", "//ios/chrome/browser/main:test_support", "//ios/chrome/browser/overlays", "//ios/chrome/browser/overlays/public/web_content_area", @@ -168,6 +163,7 @@ source_set("unit_tests") { "//ios/chrome/browser/ui/toolbar", "//ios/chrome/browser/ui/toolbar/test", "//ios/chrome/browser/url_loading", + "//ios/chrome/browser/url_loading:test_support", "//ios/chrome/browser/web_state_list", "//ios/chrome/browser/web_state_list:test_support", "//ios/chrome/test/fakes", diff --git a/chromium/ios/chrome/browser/ui/location_bar/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/location_bar/resources/BUILD.gn index 66d9855f78a..48f54a7a611 100644 --- a/chromium/ios/chrome/browser/ui/location_bar/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/location_bar/resources/BUILD.gn @@ -4,55 +4,9 @@ import("//build/config/ios/asset_catalog.gni") -imageset("omnibox_connection_secure") { - sources = [ - "omnibox_connection_secure.imageset/Contents.json", - "omnibox_connection_secure.imageset/omnibox_connection_secure.png", - "omnibox_connection_secure.imageset/omnibox_connection_secure@2x.png", - "omnibox_connection_secure.imageset/omnibox_connection_secure@3x.png", - ] -} - -imageset("omnibox_connection_dangerous") { - sources = [ - "omnibox_connection_dangerous.imageset/Contents.json", - "omnibox_connection_dangerous.imageset/omnibox_connection_dangerous.png", - "omnibox_connection_dangerous.imageset/omnibox_connection_dangerous@2x.png", - "omnibox_connection_dangerous.imageset/omnibox_connection_dangerous@3x.png", - ] -} - -imageset("omnibox_connection_insecure") { - sources = [ - "omnibox_connection_insecure.imageset/Contents.json", - "omnibox_connection_insecure.imageset/omnibox_connection_insecure.png", - "omnibox_connection_insecure.imageset/omnibox_connection_insecure@2x.png", - "omnibox_connection_insecure.imageset/omnibox_connection_insecure@3x.png", - ] -} - -imageset("omnibox_connection_offline") { - sources = [ - "omnibox_connection_offline.imageset/Contents.json", - "omnibox_connection_offline.imageset/omnibox_connection_offline.png", - "omnibox_connection_offline.imageset/omnibox_connection_offline@2x.png", - "omnibox_connection_offline.imageset/omnibox_connection_offline@3x.png", - ] -} - -imageset("omnibox_voice") { - sources = [ - "omnibox_voice.imageset/Contents.json", - "omnibox_voice.imageset/omnibox_voice.png", - "omnibox_voice.imageset/omnibox_voice@2x.png", - "omnibox_voice.imageset/omnibox_voice@3x.png", - ] -} - imageset("location_bar_share") { sources = [ "location_bar_share.imageset/Contents.json", - "location_bar_share.imageset/location_bar_share.png", "location_bar_share.imageset/location_bar_share@2x.png", "location_bar_share.imageset/location_bar_share@3x.png", ] @@ -61,44 +15,39 @@ imageset("location_bar_share") { imageset("location_bar_voice") { sources = [ "location_bar_voice.imageset/Contents.json", - "location_bar_voice.imageset/location_bar_voice.png", "location_bar_voice.imageset/location_bar_voice@2x.png", "location_bar_voice.imageset/location_bar_voice@3x.png", ] } -imageset("location_bar_offline") { +imageset("location_bar_connection_offline") { sources = [ - "location_bar_offline.imageset/Contents.json", - "location_bar_offline.imageset/location_bar_offline.png", - "location_bar_offline.imageset/location_bar_offline@2x.png", - "location_bar_offline.imageset/location_bar_offline@3x.png", + "location_bar_connection_offline.imageset/Contents.json", + "location_bar_connection_offline.imageset/location_bar_connection_offline@2x.png", + "location_bar_connection_offline.imageset/location_bar_connection_offline@3x.png", ] } -imageset("location_bar_secure") { +imageset("location_bar_connection_secure") { sources = [ - "location_bar_secure.imageset/Contents.json", - "location_bar_secure.imageset/location_bar_secure.png", - "location_bar_secure.imageset/location_bar_secure@2x.png", - "location_bar_secure.imageset/location_bar_secure@3x.png", + "location_bar_connection_secure.imageset/Contents.json", + "location_bar_connection_secure.imageset/location_bar_connection_secure@2x.png", + "location_bar_connection_secure.imageset/location_bar_connection_secure@3x.png", ] } -imageset("location_bar_not_secure_warning") { +imageset("location_bar_connection_dangerous") { sources = [ - "location_bar_not_secure_warning.imageset/Contents.json", - "location_bar_not_secure_warning.imageset/location_bar_not_secure_warning.png", - "location_bar_not_secure_warning.imageset/location_bar_not_secure_warning@2x.png", - "location_bar_not_secure_warning.imageset/location_bar_not_secure_warning@3x.png", + "location_bar_connection_dangerous.imageset/Contents.json", + "location_bar_connection_dangerous.imageset/location_bar_connection_dangerous@2x.png", + "location_bar_connection_dangerous.imageset/location_bar_connection_dangerous@3x.png", ] } -imageset("location_bar_info") { +imageset("location_bar_connection_info") { sources = [ - "location_bar_info.imageset/Contents.json", - "location_bar_info.imageset/location_bar_info.png", - "location_bar_info.imageset/location_bar_info@2x.png", - "location_bar_info.imageset/location_bar_info@3x.png", + "location_bar_connection_info.imageset/Contents.json", + "location_bar_connection_info.imageset/location_bar_connection_info@2x.png", + "location_bar_connection_info.imageset/location_bar_connection_info@3x.png", ] } diff --git a/chromium/ios/chrome/browser/ui/location_bar/test/BUILD.gn b/chromium/ios/chrome/browser/ui/location_bar/test/BUILD.gn index 02cb9cb8c32..9993a1f6b47 100644 --- a/chromium/ios/chrome/browser/ui/location_bar/test/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/location_bar/test/BUILD.gn @@ -9,7 +9,5 @@ source_set("test") { "fake_location_bar_consumer.h", "fake_location_bar_consumer.mm", ] - deps = [ - "//ios/chrome/browser/ui/location_bar", - ] + deps = [ "//ios/chrome/browser/ui/location_bar" ] } diff --git a/chromium/ios/chrome/browser/ui/main/BUILD.gn b/chromium/ios/chrome/browser/ui/main/BUILD.gn index 787b0b2bf33..ae656e181ed 100644 --- a/chromium/ios/chrome/browser/ui/main/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/main/BUILD.gn @@ -4,6 +4,19 @@ import("//ios/build/chrome_build.gni") +source_set("scene_guts") { + sources = [ "scene_controller_guts.h" ] + deps = [ + "//ios/chrome/app/application_delegate:tab_opening", + "//ios/chrome/browser:utils", + "//ios/chrome/browser/ui/tab_grid", + "//ios/chrome/browser/url_loading", + "//ios/chrome/browser/web_state_list", + ] + + libs = [ "UIKit.framework" ] +} + source_set("scene") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ @@ -17,27 +30,47 @@ source_set("scene") { deps = [ ":main", + ":scene_guts", "//base", "//components/signin/public/identity_manager", "//components/url_formatter", "//ios/chrome/app:app", - "//ios/chrome/app/application_delegate:application_delegate_internal", + "//ios/chrome/app:mode", + "//ios/chrome/app:tests_hook", + "//ios/chrome/app/application_delegate:tab_opening", + "//ios/chrome/browser", + "//ios/chrome/browser:chrome_url_constants", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/browsing_data", + "//ios/chrome/browser/crash_report", + "//ios/chrome/browser/crash_report:crash_report_internal", + "//ios/chrome/browser/crash_report/breadcrumbs", + "//ios/chrome/browser/crash_report/breadcrumbs:feature_flags", + "//ios/chrome/browser/first_run", "//ios/chrome/browser/main", + "//ios/chrome/browser/ntp:features", "//ios/chrome/browser/signin", "//ios/chrome/browser/snapshots", "//ios/chrome/browser/tabs:tabs", + "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/browser/ui/authentication", + "//ios/chrome/browser/ui/authentication/signin", "//ios/chrome/browser/ui/browser_view", "//ios/chrome/browser/ui/commands:commands", + "//ios/chrome/browser/ui/first_run", "//ios/chrome/browser/ui/history", + "//ios/chrome/browser/ui/promos", "//ios/chrome/browser/ui/settings:settings_root", "//ios/chrome/browser/ui/signin_interaction", "//ios/chrome/browser/ui/tab_grid", + "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/ui/util:multiwindow_util", "//ios/chrome/browser/url_loading", "//ios/chrome/browser/web_state_list", + "//ios/public/provider/chrome/browser", + "//ios/public/provider/chrome/browser/mailto", + "//ios/public/provider/chrome/browser/signin", "//ios/public/provider/chrome/browser/user_feedback", ] @@ -56,6 +89,7 @@ source_set("main") { deps = [ "//base", "//components/translate/core/browser", + "//ios/chrome/app:mode", "//ios/chrome/app/resources:launchscreen_xib", "//ios/chrome/browser", "//ios/chrome/browser/app_launcher", @@ -68,7 +102,9 @@ source_set("main") { "//ios/chrome/browser/main", "//ios/chrome/browser/reading_list", "//ios/chrome/browser/sessions", + "//ios/chrome/browser/sessions:restoration_agent", "//ios/chrome/browser/sessions:serialisation", + "//ios/chrome/browser/sessions:session_service", "//ios/chrome/browser/store_kit", "//ios/chrome/browser/tabs", "//ios/chrome/browser/tabs:tabs_internal", @@ -118,6 +154,8 @@ source_set("unit_tests") { "//components/bookmarks/test", "//ios/chrome/browser/bookmarks", "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/main", + "//ios/chrome/browser/main:test_support", "//ios/chrome/browser/tabs", "//ios/chrome/browser/ui/browser_view", "//ios/chrome/test:block_cleanup_test", diff --git a/chromium/ios/chrome/browser/ui/main/test/BUILD.gn b/chromium/ios/chrome/browser/ui/main/test/BUILD.gn index 6af2ba79a8b..a2e9ab29d83 100644 --- a/chromium/ios/chrome/browser/ui/main/test/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/main/test/BUILD.gn @@ -4,13 +4,21 @@ source_set("test") { configs += [ "//build/config/compiler:enable_arc" ] + testonly = true sources = [ + "fake_scene_state.h", + "fake_scene_state.mm", "stub_browser_interface.h", "stub_browser_interface.mm", "stub_browser_interface_provider.h", "stub_browser_interface_provider.mm", ] deps = [ + "//ios/chrome/browser/main:public", + "//ios/chrome/browser/main:test_support", "//ios/chrome/browser/ui/main", + "//ios/chrome/browser/ui/main:scene", + "//ios/chrome/browser/web_state_list", + "//ios/web/public/test/fakes", ] } diff --git a/chromium/ios/chrome/browser/ui/material_components/BUILD.gn b/chromium/ios/chrome/browser/ui/material_components/BUILD.gn index 391c14e2475..07f22df79bd 100644 --- a/chromium/ios/chrome/browser/ui/material_components/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/material_components/BUILD.gn @@ -17,7 +17,7 @@ source_set("material_components") { "//base", "//build:branding_buildflags", "//ios/chrome/browser/ui/colors", - "//ios/chrome/common/colors", + "//ios/chrome/common/ui/colors", "//ios/third_party/material_components_ios", ] libs = [ "UIKit.framework" ] diff --git a/chromium/ios/chrome/browser/ui/ntp/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp/BUILD.gn index 1c8f76bc4b2..0a1daea76b6 100644 --- a/chromium/ios/chrome/browser/ui/ntp/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/ntp/BUILD.gn @@ -9,9 +9,7 @@ source_set("ntp") { "new_tab_page_header_constants.mm", ] configs += [ "//build/config/compiler:enable_arc" ] - deps = [ - "//ios/chrome/browser/ui/util", - ] + deps = [ "//ios/chrome/browser/ui/util" ] } source_set("coordinator") { @@ -24,6 +22,7 @@ source_set("coordinator") { ":ntp", ":ntp_internal", "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/main:public", "//ios/chrome/browser/ui/content_suggestions", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/url_loading", @@ -41,6 +40,7 @@ source_set("util") { ] deps = [ "//ios/chrome/browser", + "//ios/chrome/browser/ntp", "//ios/web/public", ] } @@ -48,6 +48,8 @@ source_set("util") { source_set("ntp_internal") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ + "incognito_cookies_view.h", + "incognito_cookies_view.mm", "incognito_view.h", "incognito_view.mm", "incognito_view_controller.h", @@ -104,8 +106,9 @@ source_set("ntp_internal") { "//ios/chrome/browser/ui/content_suggestions/cells", "//ios/chrome/browser/ui/context_menu", "//ios/chrome/browser/ui/favicon", - "//ios/chrome/browser/ui/location_bar:notifications", "//ios/chrome/browser/ui/overscroll_actions", + "//ios/chrome/browser/ui/page_info:features", + "//ios/chrome/browser/ui/settings/cells", "//ios/chrome/browser/ui/toolbar/buttons", "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/util", @@ -113,10 +116,10 @@ source_set("ntp_internal") { "//ios/chrome/browser/web_state_list", "//ios/chrome/common", "//ios/chrome/common/app_group", - "//ios/chrome/common/colors", - "//ios/chrome/common/favicon", "//ios/chrome/common/ntp_tile", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/favicon", + "//ios/chrome/common/ui/util", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/images", "//ios/public/provider/chrome/browser/ui", @@ -163,6 +166,7 @@ source_set("unit_tests") { "//ios/chrome/browser/bookmarks", "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/favicon", + "//ios/chrome/browser/main:test_support", "//ios/chrome/browser/ntp_snippets:ntp_snippets", "//ios/chrome/browser/search_engines", "//ios/chrome/browser/sessions", @@ -175,8 +179,8 @@ source_set("unit_tests") { "//ios/chrome/browser/web_state_list:test_support", "//ios/chrome/browser/web_state_list:web_state_list", "//ios/chrome/common/app_group", - "//ios/chrome/common/favicon", "//ios/chrome/common/ntp_tile", + "//ios/chrome/common/ui/favicon", "//ios/chrome/test:test_support", "//ios/public/provider/chrome/browser/images", "//ios/web/public/test", @@ -192,9 +196,7 @@ source_set("eg_tests") { configs += [ "//build/config/compiler:enable_arc" ] defines = [ "CHROME_EARL_GREY_1" ] testonly = true - sources = [ - "new_tab_page_egtest.mm", - ] + sources = [ "new_tab_page_egtest.mm" ] deps = [ "//base/test:test_support", "//components/strings", @@ -219,9 +221,7 @@ source_set("eg2_tests") { "//build/config/ios:xctest_config", ] testonly = true - sources = [ - "new_tab_page_egtest.mm", - ] + sources = [ "new_tab_page_egtest.mm" ] deps = [ "//base/test:test_support", "//components/strings", @@ -238,9 +238,7 @@ source_set("eg2_tests") { source_set("perf_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true - sources = [ - "new_tab_page_perftest.mm", - ] + sources = [ "new_tab_page_perftest.mm" ] deps = [ "//base/test:test_support", "//ios/chrome/browser/sessions", diff --git a/chromium/ios/chrome/browser/ui/ntp_tile_views/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp_tile_views/BUILD.gn index 70af4d1d4c8..f5e179b65b4 100644 --- a/chromium/ios/chrome/browser/ui/ntp_tile_views/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/ntp_tile_views/BUILD.gn @@ -23,18 +23,17 @@ source_set("ntp_tile_views") { "resources:ntp_recent_icon", "//base", "//ios/chrome/browser/ui/util", - "//ios/chrome/common/colors", - "//ios/chrome/common/favicon", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/favicon", + "//ios/chrome/common/ui/util", + "//ios/chrome/common/ui/util:dynamic_type_util", "//ios/third_party/material_components_ios", ] } source_set("unit_tests") { testonly = true - sources = [ - "ntp_tile_layout_util_unittest.mm", - ] + sources = [ "ntp_tile_layout_util_unittest.mm" ] deps = [ ":ntp_tile_views", "//base", diff --git a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn index e389fcc301d..9c9bc405f7d 100644 --- a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn @@ -97,9 +97,7 @@ source_set("omnibox_icon_type_constants") { "omnibox_icon_type.h", "omnibox_icon_type.mm", ] - deps = [ - "//base", - ] + deps = [ "//base" ] } source_set("omnibox_internal") { @@ -147,12 +145,14 @@ source_set("omnibox_internal") { "//ios/chrome/browser/bookmarks:bookmarks_utils", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/favicon", + "//ios/chrome/browser/main:public", "//ios/chrome/browser/net", "//ios/chrome/browser/prerender", "//ios/chrome/browser/search_engines", "//ios/chrome/browser/sessions", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/fullscreen", "//ios/chrome/browser/ui/location_bar:constants", "//ios/chrome/browser/ui/omnibox/popup", @@ -161,8 +161,9 @@ source_set("omnibox_internal") { "//ios/chrome/browser/ui/toolbar/public:feature_flags", "//ios/chrome/browser/ui/util", "//ios/chrome/common", - "//ios/chrome/common/colors", - "//ios/chrome/common/favicon", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/favicon", + "//ios/chrome/common/ui/util:dynamic_type_util", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/images", "//ios/web", @@ -185,17 +186,96 @@ source_set("omnibox_internal") { ] } -source_set("eg_tests") { +source_set("test_support") { defines = [ "CHROME_EARL_GREY_1" ] + configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ "omnibox_app_interface.h", "omnibox_app_interface.mm", - "omnibox_egtest.mm", ] deps = [ + "//base", + "//components/google/core/common", + "//components/variations:variations", + "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/ui/omnibox/popup:popup_ui", + "//ios/chrome/test/app:test_support", + "//ios/testing/earl_grey:earl_grey_support", + "//ios/third_party/earl_grey:earl_grey+link", + "//ios/web/public", + "//ios/web/public/navigation", + "//net:test_support", + "//ui/base", + "//ui/base:test_support", + ] +} +source_set("app_support+eg2") { + defines = [ "CHROME_EARL_GREY_2" ] + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + testonly = true + sources = [ + "omnibox_app_interface.h", + "omnibox_app_interface.mm", + ] + deps = [ + "//base", + "//components/google/core/common", + "//components/variations:variations", + "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/ui/omnibox/popup:popup_ui", + "//ios/chrome/test/app:test_support", + "//ios/testing/earl_grey:eg_app_support+eg2", + "//ios/third_party/earl_grey2:app_framework+link", + "//ios/web/public", + "//ios/web/public/navigation", + "//net:test_support", + "//ui/base", + "//ui/base:test_support", + ] +} +source_set("test_support+eg2") { + defines = [ "CHROME_EARL_GREY_2" ] + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + testonly = true + sources = [ "omnibox_app_interface.h" ] +} + +source_set("eg2_tests") { + defines = [ "CHROME_EARL_GREY_2" ] + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + testonly = true + sources = [ "omnibox_egtest.mm" ] + deps = [ + ":test_support+eg2", + "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant", + "//ios/chrome/test/earl_grey:eg_test_support+eg2", + "//ios/testing/earl_grey:eg_test_support+eg2", + "//ios/third_party/earl_grey2:test_lib", + "//net:test_support", + "//ui/base", + ] + libs = [ "UIKit.framework" ] +} + +source_set("eg_tests") { + defines = [ "CHROME_EARL_GREY_1" ] + testonly = true + sources = [ "omnibox_egtest.mm" ] + deps = [ ":omnibox", ":omnibox_internal", + ":test_support", "//base", "//base/test:test_support", "//components/google/core/common", @@ -244,21 +324,15 @@ source_set("unit_tests") { bundle_data("resources_unit_tests") { visibility = [ ":unit_tests" ] testonly = true - sources = [ - "//ios/chrome/test/data/omnibox/selected_ranges.txt", - ] - outputs = [ - "{{bundle_resources_dir}}/" + - "ios/chrome/test/data/omnibox/{{source_file_part}}", - ] + sources = [ "//ios/chrome/test/data/omnibox/selected_ranges.txt" ] + outputs = [ "{{bundle_resources_dir}}/" + + "ios/chrome/test/data/omnibox/{{source_file_part}}" ] } source_set("perf_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true - sources = [ - "omnibox_perftest.mm", - ] + sources = [ "omnibox_perftest.mm" ] deps = [ ":omnibox_internal", "//base", diff --git a/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn index 32bca74c5a8..690d0a6931d 100644 --- a/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn @@ -27,20 +27,21 @@ source_set("popup") { "//ios/chrome/browser", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/favicon", + "//ios/chrome/browser/main:public", "//ios/chrome/browser/search_engines", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/ntp:util", "//ios/chrome/browser/ui/omnibox:omnibox_util", - "//ios/chrome/browser/ui/omnibox/popup/shortcuts", "//ios/chrome/browser/ui/toolbar/buttons", "//ios/chrome/browser/ui/toolbar/public", "//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/colors", - "//ios/chrome/common/favicon", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/favicon", + "//ios/chrome/common/ui/util", "//ios/web/public:public", "//net", "//ui/base", @@ -65,13 +66,6 @@ source_set("popup_ui") { "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", - "omnibox_popup_legacy_view_controller.h", - "omnibox_popup_legacy_view_controller.mm", - "omnibox_popup_row.h", - "omnibox_popup_row.mm", "omnibox_popup_row_cell.h", "omnibox_popup_row_cell.mm", "omnibox_popup_view_controller.h", @@ -102,8 +96,8 @@ source_set("popup_ui") { "//ios/chrome/browser/ui/toolbar/buttons", "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/util", - "//ios/chrome/common/colors", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/util", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/images", "//ui/base", @@ -128,7 +122,7 @@ source_set("popup_internal") { "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/omnibox:omnibox_util", "//ios/chrome/browser/ui/util", - "//ios/chrome/common/colors", + "//ios/chrome/common/ui/colors", "//ios/third_party/material_components_ios", ] configs += [ "//build/config/compiler:enable_arc" ] @@ -137,10 +131,7 @@ source_set("popup_internal") { source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true - sources = [ - "omnibox_popup_row_cell_unittest.mm", - "omnibox_popup_view_controller_unittest.mm", - ] + sources = [ "omnibox_popup_row_cell_unittest.mm" ] deps = [ ":popup", ":popup_internal", @@ -156,9 +147,7 @@ source_set("unit_tests") { source_set("eg_tests") { testonly = true - sources = [ - "omnibox_popup_egtest.mm", - ] + sources = [ "omnibox_popup_egtest.mm" ] deps = [ ":popup_accessibility_identifier_constants", ":popup_internal", @@ -187,9 +176,7 @@ source_set("eg2_tests") { "//build/config/ios:xctest_config", ] testonly = true - sources = [ - "omnibox_popup_egtest.mm", - ] + sources = [ "omnibox_popup_egtest.mm" ] deps = [ ":popup_accessibility_identifier_constants", "//base", diff --git a/chromium/ios/chrome/browser/ui/omnibox/popup/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/popup/resources/BUILD.gn index f2dbee1dd8a..2c0db9b096d 100644 --- a/chromium/ios/chrome/browser/ui/omnibox/popup/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/omnibox/popup/resources/BUILD.gn @@ -5,27 +5,20 @@ import("//build/config/ios/asset_catalog.gni") colorset("omnibox_suggestion_answer_icon_color") { - sources = [ - "omnibox_suggestion_answer_icon_color.colorset/Contents.json", - ] + sources = [ "omnibox_suggestion_answer_icon_color.colorset/Contents.json" ] } colorset("omnibox_suggestion_answer_icon_dark_color") { - sources = [ - "omnibox_suggestion_answer_icon_dark_color.colorset/Contents.json", - ] + sources = + [ "omnibox_suggestion_answer_icon_dark_color.colorset/Contents.json" ] } colorset("omnibox_suggestion_icon_color") { - sources = [ - "omnibox_suggestion_icon_color.colorset/Contents.json", - ] + sources = [ "omnibox_suggestion_icon_color.colorset/Contents.json" ] } colorset("omnibox_suggestion_icon_dark_color") { - sources = [ - "omnibox_suggestion_icon_dark_color.colorset/Contents.json", - ] + sources = [ "omnibox_suggestion_icon_dark_color.colorset/Contents.json" ] } imageset("omnibox_popup_tab_match") { diff --git a/chromium/ios/chrome/browser/ui/omnibox/popup/shortcuts/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/popup/shortcuts/BUILD.gn deleted file mode 100644 index 0f0ebd069a0..00000000000 --- a/chromium/ios/chrome/browser/ui/omnibox/popup/shortcuts/BUILD.gn +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 2018 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -source_set("shortcuts") { - sources = [ - "collection_shortcut_cell.h", - "collection_shortcut_cell.mm", - "most_visited_shortcut_cell.h", - "most_visited_shortcut_cell.mm", - "shortcuts_coordinator.h", - "shortcuts_coordinator.mm", - "shortcuts_view_controller.h", - "shortcuts_view_controller.mm", - ] - deps = [ - ":shortcuts_internal", - "//base", - "//components/ntp_tiles", - "//ios/chrome/browser/favicon", - "//ios/chrome/browser/ntp_tiles", - "//ios/chrome/browser/reading_list", - "//ios/chrome/browser/ui/coordinators:chrome_coordinators", - "//ios/chrome/browser/ui/ntp_tile_views", - "//ios/chrome/browser/ui/ntp_tile_views:constants", - "//ios/chrome/browser/url_loading", - "//ios/chrome/common/favicon", - "//ios/chrome/common/ui_util", - ] - configs += [ "//build/config/compiler:enable_arc" ] -} - -source_set("shortcuts_internal") { - sources = [ - "shortcuts_consumer.h", - "shortcuts_mediator.h", - "shortcuts_mediator.mm", - "shortcuts_most_visited_item.h", - "shortcuts_most_visited_item.mm", - "shortcuts_view_controller_delegate.h", - ] - configs += [ "//build/config/compiler:enable_arc" ] - - deps = [ - "//components/ntp_tiles", - "//components/reading_list/core", - "//components/reading_list/ios", - "//ios/chrome/browser/ntp_tiles", - "//ios/chrome/browser/ui/commands:commands", - "//ios/chrome/browser/ui/coordinators:chrome_coordinators", - "//ios/chrome/browser/ui/favicon", - "//ios/chrome/browser/ui/toolbar/public", - "//ios/chrome/browser/url_loading", - "//ios/web/public", - ] -} - -source_set("unit_tests") { - configs += [ "//build/config/compiler:enable_arc" ] - testonly = true - sources = [ - "shortcuts_coordinator_unittest.mm", - "shortcuts_view_controller_unittest.mm", - ] - deps = [ - ":shortcuts", - ":shortcuts_internal", - "//base", - "//ios/chrome/app/strings", - "//ios/chrome/browser", - "//testing/gtest", - "//ui/base", - ] -} - -source_set("eg_tests") { - defines = [ "CHROME_EARL_GREY_1" ] - testonly = true - sources = [ - "shortcuts_egtest.mm", - ] - deps = [ - "//base", - "//base/test:test_support", - "//components/strings", - "//ios/chrome/browser/ui:feature_flags", - "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant", - "//ios/chrome/browser/ui/omnibox:omnibox_popup_shared", - "//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", - "//net:test_support", - ] - libs = [ - "UIKit.framework", - "XCTest.framework", - ] - configs += [ "//build/config/compiler:enable_arc" ] -} - -source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] - configs += [ - "//build/config/compiler:enable_arc", - "//build/config/ios:xctest_config", - ] - - testonly = true - sources = [ - "shortcuts_egtest.mm", - ] - deps = [ - "//base", - "//base/test:test_support", - "//components/strings", - "//ios/chrome/browser/ui:feature_flags", - "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant", - "//ios/chrome/browser/ui/omnibox:omnibox_popup_shared", - "//ios/chrome/test/earl_grey:eg_test_support+eg2", - "//ios/testing/earl_grey:eg_test_support+eg2", - "//ios/third_party/earl_grey2:test_lib", - "//net:test_support", - ] - libs = [ "UIKit.framework" ] -} diff --git a/chromium/ios/chrome/browser/ui/open_in/BUILD.gn b/chromium/ios/chrome/browser/ui/open_in/BUILD.gn index 3345c3936d4..72f37b66794 100644 --- a/chromium/ios/chrome/browser/ui/open_in/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/open_in/BUILD.gn @@ -23,8 +23,8 @@ source_set("open_in") { "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web_state_list", - "//ios/chrome/common/colors", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/util", "//ios/third_party/material_components_ios", "//ios/web/public", "//net", @@ -67,9 +67,7 @@ source_set("eg2_tests") { ] testonly = true - sources = [ - "open_in_controller_egtest.mm", - ] + sources = [ "open_in_controller_egtest.mm" ] deps = [ "//base", "//ios/chrome/app/strings", diff --git a/chromium/ios/chrome/browser/ui/overlays/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/BUILD.gn index 12124877b14..c64c4d0e15c 100644 --- a/chromium/ios/chrome/browser/ui/overlays/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/overlays/BUILD.gn @@ -8,11 +8,17 @@ source_set("overlays") { "overlay_coordinator_factory.h", ] sources = [ + "overlay_container_coordinator+initialization.h", "overlay_container_coordinator.mm", "overlay_coordinator_factory+initialization.h", "overlay_coordinator_factory.mm", + "overlay_presentation_context_coordinator.h", + "overlay_presentation_context_coordinator.mm", + "overlay_presentation_context_fullscreen_disabler.h", + "overlay_presentation_context_fullscreen_disabler.mm", "overlay_presentation_context_impl.h", "overlay_presentation_context_impl.mm", + "overlay_presentation_context_impl_delegate.h", "overlay_request_ui_state.h", "overlay_request_ui_state.mm", ] @@ -22,53 +28,98 @@ source_set("overlays") { friend = [ ":unit_tests", "//ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/test", + "//ios/chrome/browser/ui/overlays/test", ] deps = [ - ":container_ui", ":coordinators", + ":ui", "//base", "//ios/chrome/browser/main", "//ios/chrome/browser/overlays", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", + "//ios/chrome/browser/ui/fullscreen", + "//ios/chrome/browser/ui/fullscreen:feature_flags", "//ios/chrome/browser/ui/overlays/infobar_banner", "//ios/chrome/browser/ui/overlays/infobar_modal", "//ios/chrome/browser/ui/overlays/web_content_area", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/util", ] } -source_set("container_ui") { +source_set("ui") { sources = [ "overlay_container_view_controller.h", "overlay_container_view_controller.mm", + "overlay_presentation_context_view_controller.h", + "overlay_presentation_context_view_controller.mm", ] configs += [ "//build/config/compiler:enable_arc" ] deps = [ + ":presentation_controller", "//base", ] } +source_set("presentation_controller") { + sources = [ + "overlay_presentation_controller.h", + "overlay_presentation_controller.mm", + ] + + configs += [ "//build/config/compiler:enable_arc" ] +} + source_set("coordinators") { sources = [ + "overlay_request_coordinator+subclassing.h", "overlay_request_coordinator.h", "overlay_request_coordinator.mm", "overlay_request_coordinator_delegate.h", + "overlay_request_mediator+subclassing.h", + "overlay_request_mediator.h", + "overlay_request_mediator.mm", ] configs += [ "//build/config/compiler:enable_arc" ] deps = [ "//base", + "//ios/chrome/browser/overlays", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", ] } +source_set("util") { + sources = [ + "overlay_presentation_context_util.h", + "overlay_presentation_context_util.mm", + "overlay_request_mediator_util.h", + "overlay_request_mediator_util.mm", + ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + ":coordinators", + "//base", + "//ios/chrome/browser/overlays", + ] +} + source_set("unit_tests") { testonly = true sources = [ + "overlay_container_coordinator_unittest.mm", + "overlay_container_view_controller_unittest.mm", + "overlay_presentation_context_coordinator_unittest.mm", + "overlay_presentation_context_fullscreen_disabler_unittest.mm", + "overlay_presentation_context_impl_unittest.mm", + "overlay_presentation_context_view_controller_unittest.mm", + "overlay_request_mediator_unittest.mm", + "overlay_request_mediator_util_unittest.mm", "overlay_request_ui_state_unittest.mm", ] @@ -77,10 +128,24 @@ source_set("unit_tests") { deps = [ ":coordinators", ":overlays", + ":ui", + ":util", "//base/test:test_support", + "//ios/chrome/browser/main:test_support", "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/test_modality", + "//ios/chrome/browser/overlays/public/web_content_area", "//ios/chrome/browser/overlays/test", + "//ios/chrome/browser/ui/fullscreen", + "//ios/chrome/browser/ui/fullscreen:feature_flags", "//ios/chrome/browser/ui/overlays/test", + "//ios/chrome/browser/ui/overlays/test_modality", + "//ios/chrome/browser/web_state_list", + "//ios/chrome/test:test_support", + "//ios/web/public/test", + "//ios/web/public/test/fakes", + "//testing/gmock", "//testing/gtest", + "//third_party/ocmock", ] } diff --git a/chromium/ios/chrome/browser/ui/overlays/common/alerts/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/common/alerts/BUILD.gn index 0f9f74f26ab..f81c902c0c8 100644 --- a/chromium/ios/chrome/browser/ui/overlays/common/alerts/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/overlays/common/alerts/BUILD.gn @@ -4,10 +4,10 @@ source_set("alerts") { sources = [ - "alert_overlay_coordinator+subclassing.h", + "alert_overlay_coordinator+alert_mediator_creation.h", "alert_overlay_coordinator.h", "alert_overlay_coordinator.mm", - "alert_overlay_mediator+subclassing.h", + "alert_overlay_mediator+alert_consumer_support.h", "alert_overlay_mediator.h", "alert_overlay_mediator.mm", ] @@ -25,14 +25,14 @@ source_set("alerts") { source_set("unit_tests") { testonly = true - sources = [ - "alert_overlay_mediator_unittest.mm", - ] + sources = [ "alert_overlay_mediator_unittest.mm" ] configs += [ "//build/config/compiler:enable_arc" ] deps = [ ":alerts", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/test", "//ios/chrome/browser/ui/alert_view", "//ios/chrome/browser/ui/alert_view/test", "//ios/chrome/browser/ui/elements", diff --git a/chromium/ios/chrome/browser/ui/overlays/infobar_banner/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/BUILD.gn index 66118981d54..e7f1b106947 100644 --- a/chromium/ios/chrome/browser/ui/overlays/infobar_banner/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/BUILD.gn @@ -3,14 +3,74 @@ # found in the LICENSE file. source_set("infobar_banner") { - public = [ - "infobar_banner_supported_overlay_coordinator_classes.h", + public = [ "infobar_banner_supported_overlay_coordinator_classes.h" ] + sources = [ "infobar_banner_supported_overlay_coordinator_classes.mm" ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ ":coordinators" ] +} + +source_set("coordinators") { + sources = [ + "infobar_banner_overlay_coordinator.h", + "infobar_banner_overlay_coordinator.mm", + ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + ":mediators", + "//base", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/common/infobars", + "//ios/chrome/browser/ui/infobars:constants", + "//ios/chrome/browser/ui/infobars/banners", + "//ios/chrome/browser/ui/infobars/presentation", + "//ios/chrome/browser/ui/overlays:coordinators", + "//ios/chrome/browser/ui/overlays:util", + "//ios/chrome/browser/ui/overlays/infobar_banner/passwords", + "//ios/chrome/browser/ui/util", ] +} + +source_set("mediators") { sources = [ - "infobar_banner_supported_overlay_coordinator_classes.mm", + "infobar_banner_overlay_mediator+consumer_support.h", + "infobar_banner_overlay_mediator.h", + "infobar_banner_overlay_mediator.mm", ] configs += [ "//build/config/compiler:enable_arc" ] - deps = [] + deps = [ + "//base", + "//components/infobars/core", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/infobar_banner", + "//ios/chrome/browser/ui/infobars/banners", + "//ios/chrome/browser/ui/infobars/banners:public", + "//ios/chrome/browser/ui/overlays:coordinators", + ] +} + +source_set("unit_tests") { + testonly = true + sources = [ "infobar_banner_overlay_mediator_unittest.mm" ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + ":mediators", + "//components/infobars/core", + "//ios/chrome/browser/infobars/test", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/infobar_banner", + "//ios/chrome/browser/overlays/test", + "//ios/chrome/browser/ui/overlays/test", + "//testing/gmock", + "//testing/gtest", + "//third_party/ocmock", + "//ui/base", + ] } diff --git a/chromium/ios/chrome/browser/ui/overlays/infobar_banner/passwords/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/passwords/BUILD.gn new file mode 100644 index 00000000000..199a1f952f5 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/passwords/BUILD.gn @@ -0,0 +1,53 @@ +# 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("passwords") { + sources = [ + "save_password_infobar_banner_overlay_mediator.h", + "save_password_infobar_banner_overlay_mediator.mm", + ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + "//base", + "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/infobar_banner", + "//ios/chrome/browser/ui/infobars/banners", + "//ios/chrome/browser/ui/overlays/infobar_banner:mediators", + "//ui/base", + ] +} + +source_set("unit_tests") { + testonly = true + sources = [ "save_password_infobar_banner_overlay_mediator_unittest.mm" ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + ":passwords", + "//base/test:test_support", + "//components/autofill/core/common", + "//components/infobars/core", + "//components/password_manager/core/browser:test_support", + "//components/strings:components_strings_grit", + "//components/url_formatter", + "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser/infobars", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/infobar_banner", + "//ios/chrome/browser/overlays/test", + "//ios/chrome/browser/passwords:infobar_delegates", + "//ios/chrome/browser/passwords/test", + "//ios/chrome/browser/ui/infobars:feature_flags", + "//ios/chrome/browser/ui/infobars/banners/test", + "//ios/chrome/browser/ui/infobars/test", + "//ios/chrome/browser/ui/overlays/test", + "//testing/gmock", + "//testing/gtest", + "//ui/base", + ] +} diff --git a/chromium/ios/chrome/browser/ui/overlays/infobar_modal/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/infobar_modal/BUILD.gn index 7e7803a6159..3088738bf32 100644 --- a/chromium/ios/chrome/browser/ui/overlays/infobar_modal/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/overlays/infobar_modal/BUILD.gn @@ -3,14 +3,81 @@ # found in the LICENSE file. source_set("infobar_modal") { - public = [ - "infobar_modal_supported_overlay_coordinator_classes.h", + public = [ "infobar_modal_supported_overlay_coordinator_classes.h" ] + sources = [ "infobar_modal_supported_overlay_coordinator_classes.mm" ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ "//ios/chrome/browser/ui/overlays/infobar_modal/passwords" ] +} + +source_set("coordinators") { + sources = [ + "infobar_modal_overlay_coordinator+modal_configuration.h", + "infobar_modal_overlay_coordinator.h", + "infobar_modal_overlay_coordinator.mm", ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + ":mediators", + "//base", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/common/infobars", + "//ios/chrome/browser/ui/infobars/modals", + "//ios/chrome/browser/ui/infobars/presentation", + "//ios/chrome/browser/ui/overlays:coordinators", + ] +} + +source_set("mediators") { + sources = [ + "infobar_modal_overlay_mediator.h", + "infobar_modal_overlay_mediator.mm", + ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + "//base", + "//components/infobars/core", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/infobar_modal", + "//ios/chrome/browser/ui/infobars/modals", + "//ios/chrome/browser/ui/overlays:coordinators", + ] +} + +source_set("unit_tests") { + testonly = true sources = [ - "infobar_modal_supported_overlay_coordinator_classes.mm", + "infobar_modal_overlay_coordinator_unittest.mm", + "infobar_modal_overlay_mediator_unittest.mm", ] configs += [ "//build/config/compiler:enable_arc" ] - deps = [] + deps = [ + ":coordinators", + ":mediators", + "//base/test:test_support", + "//components/infobars/core", + "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/infobars/test", + "//ios/chrome/browser/main:test_support", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/infobar_modal", + "//ios/chrome/browser/overlays/test", + "//ios/chrome/browser/ui/overlays:coordinators", + "//ios/chrome/browser/ui/overlays/test", + "//ios/chrome/browser/web_state_list", + "//ios/chrome/browser/web_state_list:test_support", + "//ios/chrome/test:test_support", + "//ios/web/public/test", + "//testing/gmock", + "//testing/gtest", + "//third_party/ocmock", + "//ui/base", + ] } diff --git a/chromium/ios/chrome/browser/ui/overlays/infobar_modal/passwords/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/infobar_modal/passwords/BUILD.gn new file mode 100644 index 00000000000..f23ddeb7ec8 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/overlays/infobar_modal/passwords/BUILD.gn @@ -0,0 +1,55 @@ +# Copyright 2020 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("passwords") { + sources = [ + "password_infobar_modal_overlay_coordinator.h", + "password_infobar_modal_overlay_coordinator.mm", + "password_infobar_modal_overlay_mediator.h", + "password_infobar_modal_overlay_mediator.mm", + ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + "//base", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/common/infobars", + "//ios/chrome/browser/overlays/public/infobar_modal", + "//ios/chrome/browser/ui/infobars/modals", + "//ios/chrome/browser/ui/overlays:coordinators", + "//ios/chrome/browser/ui/overlays/infobar_modal:coordinators", + "//ios/chrome/browser/ui/overlays/infobar_modal:mediators", + ] +} + +source_set("unit_tests") { + testonly = true + sources = [ "password_infobar_modal_overlay_mediator_unittest.mm" ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + ":passwords", + "//base/test:test_support", + "//components/infobars/core", + "//components/infobars/core:feature_flags", + "//ios/chrome/browser/infobars", + "//ios/chrome/browser/infobars/test", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/infobar_modal", + "//ios/chrome/browser/overlays/test", + "//ios/chrome/browser/passwords/test", + "//ios/chrome/browser/passwords/test", + "//ios/chrome/browser/ui/infobars:feature_flags", + "//ios/chrome/browser/ui/infobars/modals/test", + "//ios/chrome/browser/ui/infobars/test", + "//ios/chrome/browser/ui/overlays/test", + "//testing/gmock", + "//testing/gtest", + "//third_party/ocmock", + "//ui/base", + "//url", + ] +} diff --git a/chromium/ios/chrome/browser/ui/overlays/test/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/test/BUILD.gn index a01a5d8b29a..73a1a2ff9b9 100644 --- a/chromium/ios/chrome/browser/ui/overlays/test/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/overlays/test/BUILD.gn @@ -9,13 +9,23 @@ source_set("test") { "fake_overlay_request_coordinator.mm", "fake_overlay_request_coordinator_delegate.cc", "fake_overlay_request_coordinator_delegate.h", + "mock_overlay_coordinator_delegate.h", + "mock_overlay_coordinator_delegate.mm", + "test_overlay_presentation_context.h", + "test_overlay_presentation_context.mm", + "test_overlay_request_coordinator_factory.h", + "test_overlay_request_coordinator_factory.mm", ] configs += [ "//build/config/compiler:enable_arc" ] deps = [ "//base", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/ui/overlays", "//ios/chrome/browser/ui/overlays:coordinators", + "//ios/chrome/browser/ui/overlays/test_modality", + "//testing/gmock", "//testing/gtest", ] } diff --git a/chromium/ios/chrome/browser/ui/overlays/test_modality/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/test_modality/BUILD.gn new file mode 100644 index 00000000000..be6d01eaa0f --- /dev/null +++ b/chromium/ios/chrome/browser/ui/overlays/test_modality/BUILD.gn @@ -0,0 +1,49 @@ +# Copyright 2020 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_modality") { + testonly = true + sources = [ + "test_contained_overlay_coordinator.h", + "test_contained_overlay_coordinator.mm", + "test_presented_overlay_coordinator.h", + "test_presented_overlay_coordinator.mm", + "test_resizing_presented_overlay_coordinator.h", + "test_resizing_presented_overlay_coordinator.mm", + ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + "//base", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/test_modality", + "//ios/chrome/browser/ui/overlays:coordinators", + "//ios/chrome/browser/ui/overlays:presentation_controller", + "//ios/chrome/common/ui/util", + ] +} + +source_set("unit_tests") { + testonly = true + sources = [ + "test_contained_overlay_coordinator_unittest.mm", + "test_presented_overlay_coordinator_unittest.mm", + "test_resizing_presented_overlay_coordinator_unittest.mm", + ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + ":test_modality", + "//base/test:test_support", + "//ios/chrome/browser/main:test_support", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/test_modality", + "//ios/chrome/browser/ui/overlays/test", + "//ios/chrome/test:test_support", + "//ios/web/public/test", + "//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 index 31a18c63b54..68d13925d2e 100644 --- a/chromium/ios/chrome/browser/ui/overlays/web_content_area/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/overlays/web_content_area/BUILD.gn @@ -3,12 +3,8 @@ # 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", - ] + public = [ "web_content_area_supported_overlay_coordinator_classes.h" ] + sources = [ "web_content_area_supported_overlay_coordinator_classes.mm" ] configs += [ "//build/config/compiler:enable_arc" ] diff --git a/chromium/ios/chrome/browser/ui/overlays/web_content_area/app_launcher/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/web_content_area/app_launcher/BUILD.gn index d79c5cbebe7..1592f536126 100644 --- a/chromium/ios/chrome/browser/ui/overlays/web_content_area/app_launcher/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/overlays/web_content_area/app_launcher/BUILD.gn @@ -28,9 +28,7 @@ source_set("app_launcher") { source_set("unit_tests") { testonly = true - sources = [ - "app_launcher_alert_overlay_mediator_unittest.mm", - ] + sources = [ "app_launcher_alert_overlay_mediator_unittest.mm" ] configs += [ "//build/config/compiler:enable_arc" ] diff --git a/chromium/ios/chrome/browser/ui/overlays/web_content_area/http_auth_dialogs/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/web_content_area/http_auth_dialogs/BUILD.gn index 5f9fb15a7a4..c177542d648 100644 --- a/chromium/ios/chrome/browser/ui/overlays/web_content_area/http_auth_dialogs/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/overlays/web_content_area/http_auth_dialogs/BUILD.gn @@ -29,9 +29,7 @@ source_set("http_auth_dialogs") { source_set("unit_tests") { testonly = true - sources = [ - "http_auth_dialog_overlay_mediator_unittest.mm", - ] + sources = [ "http_auth_dialog_overlay_mediator_unittest.mm" ] configs += [ "//build/config/compiler:enable_arc" ] diff --git a/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn b/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn index 8b1ea856af9..16b576cd020 100644 --- a/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn @@ -27,14 +27,12 @@ source_set("overscroll_actions") { "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant", "//ios/chrome/browser/ui/fullscreen", "//ios/chrome/browser/ui/fullscreen:feature_flags", - "//ios/chrome/browser/ui/location_bar:notifications", - "//ios/chrome/browser/ui/page_info:coordinator", + "//ios/chrome/browser/ui/page_info:constants", "//ios/chrome/browser/ui/side_swipe", - "//ios/chrome/browser/ui/static_content", "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/ui/voice", - "//ios/chrome/common/colors", + "//ios/chrome/common/ui/colors", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/ui", "//ios/web/common", @@ -42,7 +40,6 @@ source_set("overscroll_actions") { "//ui/base", "//ui/gfx", ] - allow_circular_includes_from = [ "//ios/chrome/browser/ui/static_content" ] libs = [ "QuartzCore.framework", "UIKit.framework", diff --git a/chromium/ios/chrome/browser/ui/page_info/BUILD.gn b/chromium/ios/chrome/browser/ui/page_info/BUILD.gn index d4c2e23ad12..f651c117ece 100644 --- a/chromium/ios/chrome/browser/ui/page_info/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/page_info/BUILD.gn @@ -5,9 +5,18 @@ source_set("page_info") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ - "page_info_model.cc", - "page_info_model.h", - "page_info_model_observer.h", + "legacy_page_info_view_controller.h", + "legacy_page_info_view_controller.mm", + "page_info_consumer.h", + "page_info_cookies_view_controller.h", + "page_info_cookies_view_controller.mm", + "page_info_description.h", + "page_info_description.mm", + "page_info_navigation_commands.h", + "page_info_site_security_description.h", + "page_info_site_security_description.mm", + "page_info_site_security_view_controller.h", + "page_info_site_security_view_controller.mm", "page_info_view_controller.h", "page_info_view_controller.mm", ] @@ -24,20 +33,23 @@ source_set("page_info") { "//ios/chrome/browser/browser_state", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/fancy_ui", + "//ios/chrome/browser/ui/page_info:features", "//ios/chrome/browser/ui/page_info/requirements", "//ios/chrome/browser/ui/popup_menu", + "//ios/chrome/browser/ui/settings/cells", + "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/util", "//ios/chrome/common", - "//ios/chrome/common/colors", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/util", + "//ios/components/webui:url_constants", "//ios/web", "//ios/web/public/security", "//ui/base", "//ui/gfx", "//url", ] - public_deps = [ - ":constants", - ] + public_deps = [ ":constants" ] libs = [ "UIKit.framework" ] } @@ -49,27 +61,53 @@ source_set("constants") { ] } +source_set("features") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "features.h", + "features.mm", + ] + deps = [ "//base" ] +} + source_set("coordinator") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ + "page_info_coordinator.h", + "page_info_coordinator.mm", "page_info_legacy_coordinator.h", "page_info_legacy_coordinator.mm", + "page_info_mediator.h", + "page_info_mediator.mm", + "page_info_site_security_mediator.h", + "page_info_site_security_mediator.mm", ] deps = [ ":page_info", + "resources:page_info_bad", + "resources:page_info_good", + "resources:page_info_info", + "resources:page_info_offline", "//base", + "//components/security_state/core", + "//components/ssl_errors", + "//components/strings", + "//ios/chrome/app/strings", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/main", "//ios/chrome/browser/reading_list", "//ios/chrome/browser/tabs", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/fullscreen:coordinators", "//ios/chrome/browser/ui/page_info/requirements", - "//ios/chrome/browser/url_loading", "//ios/chrome/browser/web_state_list", + "//ios/components/webui:url_constants", "//ios/web", "//ios/web/public", + "//ios/web/public/security", + "//ui/base", ] libs = [ "UIKit.framework" ] } @@ -78,9 +116,7 @@ source_set("eg_tests") { configs += [ "//build/config/compiler:enable_arc" ] defines = [ "CHROME_EARL_GREY_1" ] testonly = true - sources = [ - "page_info_egtest.mm", - ] + sources = [ "legacy_page_info_egtest.mm" ] deps = [ ":page_info", "//ios/chrome/browser/ui/popup_menu:constants", @@ -101,9 +137,7 @@ source_set("eg2_tests") { "//build/config/ios:xctest_config", ] testonly = true - sources = [ - "page_info_egtest.mm", - ] + sources = [ "legacy_page_info_egtest.mm" ] deps = [ ":constants", "//ios/chrome/browser/ui/popup_menu:constants", diff --git a/chromium/ios/chrome/browser/ui/page_info/requirements/BUILD.gn b/chromium/ios/chrome/browser/ui/page_info/requirements/BUILD.gn index 82032f28f2e..1c74fce9e90 100644 --- a/chromium/ios/chrome/browser/ui/page_info/requirements/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/page_info/requirements/BUILD.gn @@ -4,8 +4,5 @@ source_set("requirements") { configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "page_info_presentation.h", - "page_info_reloading.h", - ] + sources = [ "page_info_presentation.h" ] } diff --git a/chromium/ios/chrome/browser/ui/page_info/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/page_info/resources/BUILD.gn new file mode 100644 index 00000000000..47541afa890 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/page_info/resources/BUILD.gn @@ -0,0 +1,37 @@ +# Copyright 2018 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/ios/asset_catalog.gni") + +imageset("page_info_bad") { + sources = [ + "page_info_bad.imageset/Contents.json", + "page_info_bad.imageset/page_info_bad@2x.png", + "page_info_bad.imageset/page_info_bad@3x.png", + ] +} + +imageset("page_info_good") { + sources = [ + "page_info_good.imageset/Contents.json", + "page_info_good.imageset/page_info_good@2x.png", + "page_info_good.imageset/page_info_good@3x.png", + ] +} + +imageset("page_info_offline") { + sources = [ + "page_info_offline.imageset/Contents.json", + "page_info_offline.imageset/page_info_offline@2x.png", + "page_info_offline.imageset/page_info_offline@3x.png", + ] +} + +imageset("page_info_info") { + sources = [ + "page_info_info.imageset/Contents.json", + "page_info_info.imageset/page_info_info@2x.png", + "page_info_info.imageset/page_info_info@3x.png", + ] +} diff --git a/chromium/ios/chrome/browser/ui/passwords/BUILD.gn b/chromium/ios/chrome/browser/ui/passwords/BUILD.gn index d9625e6daf8..960f911f038 100644 --- a/chromium/ios/chrome/browser/ui/passwords/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/passwords/BUILD.gn @@ -5,7 +5,8 @@ source_set("passwords") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ - "password_breach_action_handler.h", + "password_breach_constants.h", + "password_breach_constants.mm", "password_breach_consumer.h", "password_breach_coordinator.h", "password_breach_coordinator.mm", @@ -23,12 +24,77 @@ source_set("passwords") { "//components/password_manager/core/browser", "//components/strings:components_strings_grit", "//ios/chrome/app/strings", + "//ios/chrome/browser/main:public", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/util", - "//ios/chrome/common/colors", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/confirmation_alert", + "//ios/chrome/common/ui/util", "//ui/base", ] libs = [ "UIKit.framework" ] } + +source_set("app_support+eg2") { + defines = [ "CHROME_EARL_GREY_2" ] + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + testonly = true + sources = [ + "password_breach_app_interface.h", + "password_breach_app_interface.mm", + ] + deps = [ + "//base", + "//base/test:test_support", + "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/ui/commands", + "//ios/chrome/test/app:test_support", + ] +} + +source_set("test_support+eg2") { + defines = [ "CHROME_EARL_GREY_2" ] + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + testonly = true + sources = [ + "password_breach_app_interface.h", + "password_breach_constants.h", + "password_breach_constants.mm", + ] + deps = [ "//base" ] +} + +source_set("eg2_tests") { + defines = [ "CHROME_EARL_GREY_2" ] + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + testonly = true + sources = [ "password_breach_egtest.mm" ] + deps = [ + ":test_support+eg2", + "//base", + "//base/test:test_support", + "//components/password_manager/core/common", + "//ios/chrome/browser/ui/authentication:eg_test_support+eg2", + "//ios/chrome/test:eg_test_support+eg2", + "//ios/chrome/test/earl_grey:eg_test_support+eg2", + "//ios/testing/earl_grey:eg_test_support+eg2", + "//ios/third_party/earl_grey2:test_lib", + "//ios/web/public/test/http_server", + "//net:test_support", + "//testing/gtest", + ] + libs = [ + "UIKit.framework", + "XCTest.framework", + ] +} diff --git a/chromium/ios/chrome/browser/ui/passwords/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/passwords/resources/BUILD.gn index d56f0150f80..97882463549 100644 --- a/chromium/ios/chrome/browser/ui/passwords/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/passwords/resources/BUILD.gn @@ -6,18 +6,7 @@ import("//build/config/ios/asset_catalog.gni") import("//build/config/ios/rules.gni") group("resources") { - deps = [ - ":password_breach_ic_help", - ":password_breach_illustration", - ] -} - -imageset("password_breach_ic_help") { - sources = [ - "password_breach_ic_help.imageset/Contents.json", - "password_breach_ic_help.imageset/password_breach_ic_help@2x.png", - "password_breach_ic_help.imageset/password_breach_ic_help@3x.png", - ] + deps = [ ":password_breach_illustration" ] } imageset("password_breach_illustration") { diff --git a/chromium/ios/chrome/browser/ui/payments/BUILD.gn b/chromium/ios/chrome/browser/ui/payments/BUILD.gn deleted file mode 100644 index 3b56da51b25..00000000000 --- a/chromium/ios/chrome/browser/ui/payments/BUILD.gn +++ /dev/null @@ -1,327 +0,0 @@ -# Copyright 2016 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//ios/web/js_compile.gni") - -source_set("payments") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "address_edit_coordinator.h", - "address_edit_coordinator.mm", - "address_edit_mediator.h", - "address_edit_mediator.mm", - "billing_address_selection_coordinator.h", - "billing_address_selection_coordinator.mm", - "billing_address_selection_mediator.h", - "billing_address_selection_mediator.mm", - "contact_info_edit_coordinator.h", - "contact_info_edit_coordinator.mm", - "contact_info_edit_mediator.h", - "contact_info_edit_mediator.mm", - "contact_info_selection_coordinator.h", - "contact_info_selection_coordinator.mm", - "contact_info_selection_mediator.h", - "contact_info_selection_mediator.mm", - "country_selection_coordinator.h", - "country_selection_coordinator.mm", - "credit_card_edit_coordinator.h", - "credit_card_edit_coordinator.mm", - "credit_card_edit_mediator.h", - "credit_card_edit_mediator.mm", - "js_payment_request_manager.h", - "js_payment_request_manager.mm", - "payment_items_display_coordinator.h", - "payment_items_display_coordinator.mm", - "payment_items_display_mediator.h", - "payment_items_display_mediator.mm", - "payment_method_selection_coordinator.h", - "payment_method_selection_coordinator.mm", - "payment_method_selection_mediator.h", - "payment_method_selection_mediator.mm", - "payment_request_coordinator.h", - "payment_request_coordinator.mm", - "payment_request_error_coordinator.h", - "payment_request_error_coordinator.mm", - "payment_request_manager.h", - "payment_request_manager.mm", - "payment_request_mediator.h", - "payment_request_mediator.mm", - "region_data_loader.h", - "region_data_loader.mm", - "shipping_address_selection_coordinator.h", - "shipping_address_selection_coordinator.mm", - "shipping_address_selection_mediator.h", - "shipping_address_selection_mediator.mm", - "shipping_option_selection_coordinator.h", - "shipping_option_selection_coordinator.mm", - "shipping_option_selection_mediator.h", - "shipping_option_selection_mediator.mm", - ] - deps = [ - ":payments_ui", - ":requesters", - "resources:ic_add", - "//base", - "//components/autofill/core/browser", - "//components/autofill/ios/browser", - "//components/omnibox/browser", - "//components/payments/core", - "//components/payments/mojom", - "//components/prefs", - "//components/strings", - "//components/url_formatter", - "//ios/chrome/app/strings", - "//ios/chrome/app/theme", - "//ios/chrome/browser", - "//ios/chrome/browser/autofill", - "//ios/chrome/browser/browser_state", - "//ios/chrome/browser/payments", - "//ios/chrome/browser/signin", - "//ios/chrome/browser/ui/autofill", - "//ios/chrome/browser/ui/autofill:autofill_ui", - "//ios/chrome/browser/ui/autofill/cells", - "//ios/chrome/browser/ui/collection_view", - "//ios/chrome/browser/ui/collection_view/cells", - "//ios/chrome/browser/ui/colors", - "//ios/chrome/browser/ui/commands", - "//ios/chrome/browser/ui/coordinators:chrome_coordinators", - "//ios/chrome/browser/ui/icons", - "//ios/chrome/browser/ui/payments/cells", - "//ios/chrome/browser/ui/util", - "//ios/chrome/common/colors", - "//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", - ] - libs = [ "UIKit.framework" ] -} - -source_set("requesters") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "full_card_requester.h", - "full_card_requester.mm", - ] - deps = [ - ":payments_ui", - "resources:ic_add", - "//base", - "//components/autofill/core/browser", - "//components/autofill/ios/browser", - "//ios/chrome/browser/browser_state", - "//ios/chrome/browser/ui/autofill:bridges", - "//ui/base", - ] - libs = [ "UIKit.framework" ] -} - -source_set("payments_ui") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "payment_items_display_view_controller.h", - "payment_items_display_view_controller.mm", - "payment_items_display_view_controller_actions.h", - "payment_items_display_view_controller_data_source.h", - "payment_request_edit_consumer.h", - "payment_request_edit_view_controller.h", - "payment_request_edit_view_controller.mm", - "payment_request_edit_view_controller_actions.h", - "payment_request_edit_view_controller_data_source.h", - "payment_request_edit_view_controller_validator.h", - "payment_request_editor_field.h", - "payment_request_editor_field.mm", - "payment_request_error_view_controller.h", - "payment_request_error_view_controller.mm", - "payment_request_error_view_controller_actions.h", - "payment_request_navigation_controller.h", - "payment_request_navigation_controller.mm", - "payment_request_picker_row.h", - "payment_request_picker_row.mm", - "payment_request_picker_view_controller.h", - "payment_request_picker_view_controller.mm", - "payment_request_selector_view_controller.h", - "payment_request_selector_view_controller.mm", - "payment_request_selector_view_controller_actions.h", - "payment_request_selector_view_controller_data_source.h", - "payment_request_view_controller.h", - "payment_request_view_controller.mm", - "payment_request_view_controller_actions.h", - "payment_request_view_controller_data_source.h", - ] - deps = [ - "//base", - "//components/strings", - "//ios/chrome/app/strings:ios_strings_grit", - "//ios/chrome/app/theme", - "//ios/chrome/browser/ui/autofill:autofill_ui", - "//ios/chrome/browser/ui/autofill/cells", - "//ios/chrome/browser/ui/autofill/form_input_accessory:form_input_accessory_ui", - "//ios/chrome/browser/ui/collection_view", - "//ios/chrome/browser/ui/colors", - "//ios/chrome/browser/ui/icons", - "//ios/chrome/browser/ui/list_model", - "//ios/chrome/browser/ui/material_components", - "//ios/chrome/browser/ui/payments/cells", - "//ios/chrome/browser/ui/util", - "//ios/chrome/common/colors", - "//ios/third_party/material_components_ios", - "//third_party/libaddressinput:strings_grit", - "//ui/base", - ] - libs = [ "UIKit.framework" ] -} - -source_set("unit_tests") { - configs += [ "//build/config/compiler:enable_arc" ] - testonly = true - sources = [ - "address_edit_coordinator_unittest.mm", - "address_edit_mediator_unittest.mm", - "billing_address_selection_coordinator_unittest.mm", - "billing_address_selection_mediator_unittest.mm", - "contact_info_edit_coordinator_unittest.mm", - "contact_info_edit_mediator_unittest.mm", - "contact_info_selection_coordinator_unittest.mm", - "contact_info_selection_mediator_unittest.mm", - "country_selection_coordinator_unittest.mm", - "credit_card_edit_coordinator_unittest.mm", - "credit_card_edit_mediator_unittest.mm", - "full_card_requester_unittest.mm", - "payment_items_display_coordinator_unittest.mm", - "payment_items_display_mediator_unittest.mm", - "payment_items_display_view_controller_unittest.mm", - "payment_method_selection_coordinator_unittest.mm", - "payment_method_selection_mediator_unittest.mm", - "payment_request_coordinator_unittest.mm", - "payment_request_edit_view_controller_unittest.mm", - "payment_request_error_coordinator_unittest.mm", - "payment_request_error_view_controller_unittest.mm", - "payment_request_mediator_unittest.mm", - "payment_request_selector_view_controller_unittest.mm", - "payment_request_view_controller_unittest.mm", - "region_data_loader_unittest.mm", - "shipping_address_selection_coordinator_unittest.mm", - "shipping_address_selection_mediator_unittest.mm", - "shipping_option_selection_coordinator_unittest.mm", - "shipping_option_selection_mediator_unittest.mm", - ] - deps = [ - ":payments", - ":payments_ui", - ":requesters", - "//base", - "//base/test:test_support", - "//components/autofill/core/browser", - "//components/autofill/core/browser:test_support", - "//components/autofill/ios/browser", - "//components/leveldb_proto:leveldb_proto", - "//components/payments/core", - "//components/payments/core:test_support", - "//components/payments/mojom", - "//components/prefs:prefs", - "//components/signin/public/identity_manager", - "//components/signin/public/identity_manager:test_support", - "//components/strings", - "//components/sync/driver:test_support", - "//ios/chrome/app/strings", - "//ios/chrome/browser", - "//ios/chrome/browser/autofill:autofill_internal", - "//ios/chrome/browser/infobars", - "//ios/chrome/browser/payments", - "//ios/chrome/browser/payments:test_support", - "//ios/chrome/browser/signin", - "//ios/chrome/browser/signin:test_support", - "//ios/chrome/browser/sync", - "//ios/chrome/browser/sync:test_support", - "//ios/chrome/browser/ui/autofill", - "//ios/chrome/browser/ui/autofill:autofill_ui", - "//ios/chrome/browser/ui/autofill:bridges", - "//ios/chrome/browser/ui/autofill/cells", - "//ios/chrome/browser/ui/collection_view:test_support", - "//ios/chrome/browser/ui/collection_view/cells", - "//ios/chrome/browser/ui/collection_view/cells:test_support", - "//ios/chrome/browser/ui/payments/cells", - "//ios/chrome/browser/web:test_support", - "//ios/chrome/test:test_support", - "//ios/public/provider/chrome/browser/signin:test_support", - "//ios/testing:ocmock_support", - "//ios/third_party/material_components_ios", - "//ios/web", - "//ios/web/public/deprecated:test_doubles", - "//ios/web/public/js_messaging", - "//ios/web/public/test", - "//testing/gmock", - "//testing/gtest", - "//third_party/libaddressinput:strings_grit", - "//third_party/ocmock", - "//ui/base", - ] -} - -source_set("eg_tests") { - configs += [ "//build/config/compiler:enable_arc" ] - testonly = true - sources = [ - "payment_request_accessibility_egtest.mm", - "payment_request_can_make_payment_egtest.mm", - "payment_request_cancel_pay_abort_egtest.mm", - "payment_request_data_url_egtest.mm", - "payment_request_debit_egtest.mm", - "payment_request_egtest_base.h", - "payment_request_egtest_base.mm", - "payment_request_journey_logger_egtest.mm", - "payment_request_misc_egtest.mm", - "payment_request_modifiers_egtest.mm", - "payment_request_payment_app_egtest.mm", - "payment_request_payment_method_identifier_egtest.mm", - "payment_request_payment_response_egtest.mm", - "payment_request_show_egtest.mm", - "payment_request_use_stats_egtest.mm", - ] - - deps = [ - ":payments_ui", - "//base", - "//components/autofill/core/browser", - "//components/autofill/core/browser:test_support", - "//components/image_fetcher/core", - "//components/payments/core", - "//components/payments/core:payments_test_bundle_data", - "//components/payments/mojom", - "//components/prefs", - "//components/strings", - "//ios/chrome/app:app_internal", - "//ios/chrome/browser/autofill", - "//ios/chrome/browser/browser_state", - "//ios/chrome/browser/payments", - "//ios/chrome/browser/ui/autofill", - "//ios/chrome/browser/ui/autofill:bridges", - "//ios/chrome/browser/ui/payments/cells", - "//ios/chrome/browser/ui/popup_menu:constants", - "//ios/chrome/browser/ui/settings", - "//ios/chrome/browser/ui/settings/autofill", - "//ios/chrome/browser/ui/settings/autofill:constants", - "//ios/chrome/test:eg_test_support", - "//ios/chrome/test/app:test_support", - "//ios/chrome/test/earl_grey:test_support", - "//ios/testing/earl_grey:earl_grey_support", - "//ios/third_party/material_components_ios", - "//ios/web/public/test", - "//ios/web/public/test/http_server", - "//net:test_support", - "//testing/gtest", - "//third_party/libaddressinput:strings_grit", - "//ui/base", - "//url", - ] - libs = [ - "UIKit.framework", - "XCTest.framework", - ] -} diff --git a/chromium/ios/chrome/browser/ui/payments/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/payments/cells/BUILD.gn deleted file mode 100644 index 3681e9de0d8..00000000000 --- a/chromium/ios/chrome/browser/ui/payments/cells/BUILD.gn +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 2016 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -source_set("cells") { - sources = [ - "accepted_payment_methods_item.h", - "accepted_payment_methods_item.mm", - "accessibility_util.h", - "accessibility_util.mm", - "autofill_profile_item.h", - "autofill_profile_item.mm", - "page_info_item.h", - "page_info_item.mm", - "payment_method_item.h", - "payment_method_item.mm", - "payments_is_selectable.h", - "payments_selector_edit_item.h", - "payments_selector_edit_item.mm", - "payments_text_item.h", - "payments_text_item.mm", - "price_item.h", - "price_item.mm", - ] - - deps = [ - "//ios/chrome/app/theme", - "//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/colors", - "//ios/chrome/common/ui_util", - "//url/", - ] - - configs += [ "//build/config/compiler:enable_arc" ] -} - -source_set("unit_tests") { - testonly = true - sources = [ - "accepted_payment_methods_item_unittest.mm", - "accessibility_util_unittest.mm", - "autofill_profile_item_unittest.mm", - "page_info_item_unittest.mm", - "payment_method_item_unittest.mm", - "payments_selector_edit_item_unittests.mm", - "payments_text_item_unittest.mm", - "price_item_unittest.mm", - ] - - deps = [ - ":cells", - "//ios/chrome/browser/ui/collection_view/cells", - "//ios/chrome/browser/ui/collection_view/cells:test_support", - "//testing/gtest", - ] - - configs += [ "//build/config/compiler:enable_arc" ] -} diff --git a/chromium/ios/chrome/browser/ui/payments/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/payments/resources/BUILD.gn deleted file mode 100644 index 0374a602df9..00000000000 --- a/chromium/ios/chrome/browser/ui/payments/resources/BUILD.gn +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2017 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/config/ios/asset_catalog.gni") - -imageset("ic_add") { - sources = [ - "ic_add.imageset/Contents.json", - "ic_add.imageset/ic_add@2x.png", - "ic_add.imageset/ic_add@3x.png", - ] -} diff --git a/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn index 59f7ef6a236..f66a821c3d1 100644 --- a/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn @@ -53,6 +53,7 @@ source_set("popup_menu") { "//ios/chrome/browser/browser_state", "//ios/chrome/browser/feature_engagement", "//ios/chrome/browser/find_in_page", + "//ios/chrome/browser/main:public", "//ios/chrome/browser/overlays", "//ios/chrome/browser/reading_list", "//ios/chrome/browser/search_engines", @@ -65,6 +66,7 @@ source_set("popup_menu") { "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/list_model", "//ios/chrome/browser/ui/ntp_tile_views:constants", + "//ios/chrome/browser/ui/page_info:features", "//ios/chrome/browser/ui/popup_menu/cells", "//ios/chrome/browser/ui/popup_menu/public", "//ios/chrome/browser/ui/popup_menu/public:popup_menu_ui", @@ -73,8 +75,11 @@ source_set("popup_menu") { "//ios/chrome/browser/ui/reading_list", "//ios/chrome/browser/ui/toolbar/public:feature_flags", "//ios/chrome/browser/ui/util", + "//ios/chrome/browser/ui/util:multiwindow_util", + "//ios/chrome/browser/web", "//ios/chrome/browser/web:feature_flags", "//ios/chrome/browser/web_state_list", + "//ios/components/webui:url_constants", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/user_feedback", "//ios/web", @@ -96,9 +101,7 @@ source_set("constants") { source_set("unit_tests") { testonly = true - sources = [ - "popup_menu_mediator_unittest.mm", - ] + sources = [ "popup_menu_mediator_unittest.mm" ] deps = [ ":constants", ":popup_menu", @@ -116,6 +119,8 @@ source_set("unit_tests") { "//ios/chrome/browser/ui/popup_menu/cells", "//ios/chrome/browser/ui/popup_menu/public:popup_menu_ui", "//ios/chrome/browser/ui/toolbar/test", + "//ios/chrome/browser/web", + "//ios/chrome/browser/web:feature_flags", "//ios/chrome/browser/web:test_support", "//ios/chrome/browser/web:web_internal", "//ios/chrome/browser/web_state_list", @@ -130,6 +135,7 @@ source_set("unit_tests") { "//testing/gmock", "//testing/gtest", "//third_party/ocmock", + "//ui/base:base", ] configs += [ "//build/config/compiler:enable_arc" ] } @@ -147,6 +153,7 @@ source_set("eg2_tests") { ] deps = [ ":constants", + "//base/test:test_support", "//components/strings", "//ios/chrome/app/strings", "//ios/chrome/test/earl_grey:eg_test_support+eg2", @@ -170,6 +177,7 @@ source_set("eg_tests") { ] deps = [ "//base", + "//base/test:test_support", "//components/strings", "//ios/chrome/app/strings", "//ios/chrome/browser/ui/popup_menu:constants", 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 90a2c85cd0f..d7ac625f952 100644 --- a/chromium/ios/chrome/browser/ui/popup_menu/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/popup_menu/cells/BUILD.gn @@ -19,7 +19,7 @@ source_set("cells") { "//ios/chrome/browser/ui/table_view:styler", "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/common", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/util", ] libs = [ "UIKit.framework" ] } 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 9cbdc1ce42d..db02947e26e 100644 --- a/chromium/ios/chrome/browser/ui/popup_menu/public/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/popup_menu/public/BUILD.gn @@ -8,9 +8,7 @@ source_set("public") { "popup_menu_long_press_delegate.h", "popup_menu_ui_updating.h", ] - deps = [ - "//base", - ] + deps = [ "//base" ] libs = [ "UIKit.framework" ] } @@ -41,7 +39,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", + "//ios/chrome/common/ui/util", "//ui/base", ] libs = [ diff --git a/chromium/ios/chrome/browser/ui/popup_menu/public/cells/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/public/cells/resources/BUILD.gn index d83028aa941..73c8f74e4c1 100644 --- a/chromium/ios/chrome/browser/ui/popup_menu/public/cells/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/popup_menu/public/cells/resources/BUILD.gn @@ -5,7 +5,5 @@ import("//build/config/ios/asset_catalog.gni") colorset("popup_menu_separator_color") { - sources = [ - "popup_menu_separator_color.colorset/Contents.json", - ] + sources = [ "popup_menu_separator_color.colorset/Contents.json" ] } diff --git a/chromium/ios/chrome/browser/ui/presenters/BUILD.gn b/chromium/ios/chrome/browser/ui/presenters/BUILD.gn index a1675005315..35c50a2ce23 100644 --- a/chromium/ios/chrome/browser/ui/presenters/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/presenters/BUILD.gn @@ -14,7 +14,7 @@ source_set("presenters") { ] deps = [ "//base", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/util", ] } @@ -22,9 +22,7 @@ source_set("unit_tests") { testonly = true configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "vertical_animation_container_unittest.mm", - ] + sources = [ "vertical_animation_container_unittest.mm" ] deps = [ ":presenters", diff --git a/chromium/ios/chrome/browser/ui/print/BUILD.gn b/chromium/ios/chrome/browser/ui/print/BUILD.gn index 532f1347384..9917d9d7434 100644 --- a/chromium/ios/chrome/browser/ui/print/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/print/BUILD.gn @@ -14,7 +14,6 @@ source_set("print") { "//ios/chrome/app/strings", "//ios/chrome/browser/tabs", "//ios/chrome/browser/ui/alert_coordinator", - "//ios/chrome/browser/ui/alert_coordinator:alert_coordinator_internal", "//ios/chrome/browser/web:web_internal", "//ios/web", "//net", diff --git a/chromium/ios/chrome/browser/ui/promos/BUILD.gn b/chromium/ios/chrome/browser/ui/promos/BUILD.gn index 361d0f08986..6d4777be449 100644 --- a/chromium/ios/chrome/browser/ui/promos/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/promos/BUILD.gn @@ -19,39 +19,16 @@ source_set("promos") { "//ios/chrome/browser/browser_state", "//ios/chrome/browser/main", "//ios/chrome/browser/signin", + "//ios/chrome/browser/ui/authentication/signin", "//ios/chrome/browser/ui/commands", - "//ios/chrome/common/colors", + "//ios/chrome/common/ui/colors", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/signin", "//net", - ] - public_deps = [ - "//ios/chrome/browser/ui/authentication", - ] - libs = [ "UIKit.framework" ] -} -source_set("unit_tests") { - configs += [ "//build/config/compiler:enable_arc" ] - testonly = true - sources = [ - "signin_promo_view_controller_unittest.mm", - ] - deps = [ - ":promos", - "//base", - "//components/pref_registry", - "//components/sync_preferences", - "//components/sync_preferences:test_support", - "//ios/chrome/browser/browser_state:test_support", - "//ios/chrome/browser/main:test_support", - "//ios/chrome/browser/prefs:browser_prefs", - "//ios/chrome/browser/signin", - "//ios/chrome/browser/signin:test_support", - "//ios/chrome/test:test_support", - "//ios/public/provider/chrome/browser/signin:test_support", - "//ios/web/public/test", - "//testing/gtest", - "//third_party/ocmock", + # TODO(crbug.com/971989):Remove when this class is deprecated. + "//ios/chrome/browser/ui/authentication/signin/user_signin", ] + public_deps = [ "//ios/chrome/browser/ui/authentication" ] + libs = [ "UIKit.framework" ] } diff --git a/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn b/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn index a6ac2111526..a4e2e3dec7f 100644 --- a/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn @@ -22,7 +22,7 @@ source_set("qr_scanner") { "//ios/chrome/browser/ui/scanner", "//ios/chrome/browser/ui/util", "//ios/chrome/common:ios_app_bundle_id_prefix_buildflags", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/util", "//ios/third_party/material_components_ios", "//ui/base", ] @@ -41,6 +41,7 @@ source_set("coordinator") { deps = [ ":qr_scanner", "//base", + "//ios/chrome/browser/main:public", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/scanner", @@ -52,9 +53,7 @@ source_set("eg_tests") { configs += [ "//build/config/compiler:enable_arc" ] defines = [ "CHROME_EARL_GREY_1" ] testonly = true - sources = [ - "qr_scanner_view_controller_egtest.mm", - ] + sources = [ "qr_scanner_view_controller_egtest.mm" ] deps = [ ":test_support", "//base", @@ -81,9 +80,7 @@ source_set("eg2_tests") { "//build/config/ios:xctest_config", ] testonly = true - sources = [ - "qr_scanner_view_controller_egtest.mm", - ] + sources = [ "qr_scanner_view_controller_egtest.mm" ] deps = [ ":eg_test_support+eg2", "//base", @@ -170,10 +167,6 @@ source_set("eg_test_support+eg2") { ] testonly = true - sources = [ - "qr_scanner_app_interface.h", - ] - deps = [ - "//ios/chrome/browser/ui/scanner:camera_state", - ] + sources = [ "qr_scanner_app_interface.h" ] + deps = [ "//ios/chrome/browser/ui/scanner:camera_state" ] } diff --git a/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn b/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn index aa301850260..18abca6baee 100644 --- a/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn @@ -4,8 +4,6 @@ source_set("reading_list") { sources = [ - "offline_page_native_content.h", - "offline_page_native_content.mm", "reading_list_coordinator.h", "reading_list_coordinator.mm", "reading_list_list_item.h", @@ -39,6 +37,7 @@ source_set("reading_list") { "//ios/chrome/browser/browser_state", "//ios/chrome/browser/favicon", "//ios/chrome/browser/feature_engagement", + "//ios/chrome/browser/main", "//ios/chrome/browser/metrics:metrics_internal", "//ios/chrome/browser/reading_list", "//ios/chrome/browser/tabs", @@ -49,7 +48,6 @@ source_set("reading_list") { "//ios/chrome/browser/ui/reading_list/context_menu", "//ios/chrome/browser/ui/reading_list/resources:distillation_fail_new", "//ios/chrome/browser/ui/side_swipe", - "//ios/chrome/browser/ui/static_content", "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/table_view:feature_flags", "//ios/chrome/browser/ui/table_view:presentation", @@ -57,7 +55,8 @@ source_set("reading_list") { "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/url_loading", - "//ios/chrome/common/favicon", + "//ios/chrome/browser/web_state_list", + "//ios/chrome/common/ui/favicon", "//ios/web", "//ios/web/public", "//ui/base", @@ -119,8 +118,8 @@ source_set("reading_list_ui") { "//ios/chrome/browser/ui/table_view/cells/resources:table_view_cell_check_mark", "//ios/chrome/browser/ui/util", "//ios/chrome/common", - "//ios/chrome/common/colors", - "//ios/chrome/common/favicon", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/favicon", "//ui/base", "//ui/strings:ui_strings_grit", "//url", @@ -132,7 +131,6 @@ source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ - "offline_page_native_content_unittest.mm", "reading_list_list_item_factory_unittest.mm", "reading_list_mediator_unittest.mm", "text_badge_view_unittest.mm", @@ -154,7 +152,6 @@ source_set("unit_tests") { "//ios/chrome/browser/feature_engagement", "//ios/chrome/browser/reading_list", "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui/static_content", "//ios/chrome/test/fakes", "//ios/web", "//ios/web/public/test", @@ -168,9 +165,7 @@ source_set("eg_tests") { defines = [ "CHROME_EARL_GREY_1" ] configs += [ "//build/config/compiler:enable_arc" ] testonly = true - sources = [ - "reading_list_egtest.mm", - ] + sources = [ "reading_list_egtest.mm" ] deps = [ ":reading_list", ":reading_list_constants", @@ -190,6 +185,7 @@ source_set("eg_tests") { "//ios/chrome/browser/ui/table_view:feature_flags", "//ios/chrome/browser/ui/table_view:views", "//ios/chrome/browser/ui/table_view/cells", + "//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", @@ -216,9 +212,7 @@ source_set("eg2_tests") { "//build/config/ios:xctest_config", ] testonly = true - sources = [ - "reading_list_egtest.mm", - ] + sources = [ "reading_list_egtest.mm" ] deps = [ ":eg_test_support+eg2", ":reading_list_constants", @@ -227,6 +221,7 @@ source_set("eg2_tests") { "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser/ui/popup_menu:constants", "//ios/chrome/browser/ui/table_view:constants", + "//ios/chrome/browser/ui/util", "//ios/chrome/test/earl_grey:eg_test_support+eg2", "//ios/testing/earl_grey:eg_test_support+eg2", "//ios/third_party/earl_grey2:test_lib", diff --git a/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn b/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn index 1bc5a2c75d0..6364cf491f7 100644 --- a/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn @@ -38,9 +38,7 @@ source_set("recent_tabs") { "//ios/chrome/browser/web_state_list", "//ui/base", ] - public_deps = [ - "//components/sync_sessions", - ] + public_deps = [ "//components/sync_sessions" ] } source_set("recent_tabs_ui_constants") { @@ -73,10 +71,12 @@ source_set("recent_tabs_ui") { "//components/sync", "//ios/chrome/app/strings", "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/main:public", "//ios/chrome/browser/metrics:metrics_internal", "//ios/chrome/browser/sessions", "//ios/chrome/browser/sessions:serialisation", "//ios/chrome/browser/sync", + "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/authentication", "//ios/chrome/browser/ui/authentication/cells", "//ios/chrome/browser/ui/commands", @@ -91,21 +91,17 @@ source_set("recent_tabs_ui") { "//ios/chrome/browser/url_loading", "//ios/chrome/browser/web_state_list", "//ios/chrome/browser/web_state_list", - "//ios/chrome/common/colors", - "//ios/chrome/common/favicon", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/favicon", "//ui/base", ] - public_deps = [ - "//components/sync_sessions", - ] + public_deps = [ "//components/sync_sessions" ] } source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true - sources = [ - "recent_tabs_coordinator_unittest.mm", - ] + sources = [ "recent_tabs_coordinator_unittest.mm" ] deps = [ ":recent_tabs", ":recent_tabs_ui", @@ -136,9 +132,7 @@ source_set("eg_tests") { defines = [ "CHROME_EARL_GREY_1" ] configs += [ "//build/config/compiler:enable_arc" ] testonly = true - sources = [ - "recent_tabs_egtest.mm", - ] + sources = [ "recent_tabs_egtest.mm" ] deps = [ ":recent_tabs_ui", ":recent_tabs_ui_constants", @@ -173,9 +167,7 @@ source_set("eg2_tests") { "//build/config/ios:xctest_config", ] testonly = true - sources = [ - "recent_tabs_egtest.mm", - ] + sources = [ "recent_tabs_egtest.mm" ] deps = [ ":recent_tabs_ui_constants", "//base/test: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 0fcc0800622..d52ad246510 100644 --- a/chromium/ios/chrome/browser/ui/sad_tab/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/sad_tab/BUILD.gn @@ -20,8 +20,8 @@ source_set("sad_tab") { "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/overscroll_actions", "//ios/chrome/browser/ui/util", - "//ios/chrome/common/colors", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/util", "//ios/third_party/material_components_ios", "//ios/web", "//net", @@ -39,14 +39,17 @@ source_set("coordinator") { ] deps = [ ":sad_tab", + "//components/ui_metrics", "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/main:public", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", + "//ios/chrome/browser/ui/fullscreen:coordinators", "//ios/chrome/browser/ui/overscroll_actions", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web", "//ios/chrome/browser/web:tab_helper_delegates", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/util", "//ios/web", ] } @@ -61,11 +64,12 @@ source_set("unit_tests") { deps = [ "//components/strings:components_strings_grit", "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/main:test_support", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/sad_tab", "//ios/chrome/browser/ui/sad_tab:coordinator", "//ios/chrome/browser/ui/util", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/util", "//ios/web/public/test", "//ios/web/public/test/fakes", "//testing/gtest", @@ -78,9 +82,7 @@ source_set("eg_tests") { defines = [ "CHROME_EARL_GREY_1" ] configs += [ "//build/config/compiler:enable_arc" ] testonly = true - sources = [ - "sad_tab_view_egtest.mm", - ] + sources = [ "sad_tab_view_egtest.mm" ] deps = [ ":sad_tab", @@ -105,9 +107,7 @@ source_set("eg2_tests") { "//build/config/ios:xctest_config", ] testonly = true - sources = [ - "sad_tab_view_egtest.mm", - ] + sources = [ "sad_tab_view_egtest.mm" ] deps = [ "//components/strings", diff --git a/chromium/ios/chrome/browser/ui/safe_mode/BUILD.gn b/chromium/ios/chrome/browser/ui/safe_mode/BUILD.gn index e31b7a1036f..c6ceece1f9f 100644 --- a/chromium/ios/chrome/browser/ui/safe_mode/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/safe_mode/BUILD.gn @@ -21,7 +21,7 @@ source_set("safe_mode") { "//ios/chrome/browser/safe_mode", "//ios/chrome/browser/ui/fancy_ui", "//ios/chrome/browser/ui/util", - "//ios/chrome/common/colors", + "//ios/chrome/common/ui/colors", "//ui/gfx", ] @@ -32,9 +32,7 @@ source_set("eg_tests") { configs += [ "//build/config/compiler:enable_arc" ] defines = [ "CHROME_EARL_GREY_1" ] testonly = true - sources = [ - "safe_mode_egtest.mm", - ] + sources = [ "safe_mode_egtest.mm" ] deps = [ ":safe_mode", ":test_support", @@ -90,9 +88,7 @@ source_set("eg_test_support+eg2") { ] testonly = true - sources = [ - "safe_mode_app_interface.h", - ] + sources = [ "safe_mode_app_interface.h" ] } source_set("eg2_tests") { @@ -102,9 +98,7 @@ source_set("eg2_tests") { "//build/config/ios:xctest_config", ] testonly = true - sources = [ - "safe_mode_egtest.mm", - ] + sources = [ "safe_mode_egtest.mm" ] deps = [ ":eg_test_support+eg2", "//base:base", diff --git a/chromium/ios/chrome/browser/ui/scanner/BUILD.gn b/chromium/ios/chrome/browser/ui/scanner/BUILD.gn index 72cff64f780..2765fd1e1c7 100644 --- a/chromium/ios/chrome/browser/ui/scanner/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/scanner/BUILD.gn @@ -32,7 +32,7 @@ source_set("scanner") { "//ios/chrome/browser/ui/icons", "//ios/chrome/browser/ui/util", "//ios/chrome/common:ios_app_bundle_id_prefix_buildflags", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/util", "//ios/third_party/material_components_ios", "//ui/base", ] @@ -43,7 +43,5 @@ source_set("scanner") { } source_set("camera_state") { - sources = [ - "camera_state.h", - ] + sources = [ "camera_state.h" ] } diff --git a/chromium/ios/chrome/browser/ui/send_tab_to_self/BUILD.gn b/chromium/ios/chrome/browser/ui/send_tab_to_self/BUILD.gn index 4ecb4ed3e2f..43e1a1097c2 100644 --- a/chromium/ios/chrome/browser/ui/send_tab_to_self/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/send_tab_to_self/BUILD.gn @@ -45,7 +45,7 @@ source_set("send_tab_to_self_ui") { "//ios/chrome/browser/ui/table_view:styler", "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/browser/ui/table_view/cells:cells_constants", - "//ios/chrome/common/colors", + "//ios/chrome/common/ui/colors", "//ui/base", ] } diff --git a/chromium/ios/chrome/browser/ui/settings/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/BUILD.gn index eb1c923a0d0..6dc9484f962 100644 --- a/chromium/ios/chrome/browser/ui/settings/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/BUILD.gn @@ -7,9 +7,8 @@ source_set("settings_root") { sources = [ "bar_button_activity_indicator.h", "bar_button_activity_indicator.mm", + "settings_controller_protocol.h", "settings_navigation_controller.h", - "settings_root_collection_view_controller.h", - "settings_root_collection_view_controller.mm", "settings_root_table_view_controller.h", "settings_root_table_view_controller.mm", "settings_root_view_controlling.h", @@ -19,21 +18,16 @@ source_set("settings_root") { "//ios/chrome/app/strings", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/ui:feature_flags", - "//ios/chrome/browser/ui/collection_view", - "//ios/chrome/browser/ui/collection_view/cells", - "//ios/chrome/browser/ui/collection_view/cells", "//ios/chrome/browser/ui/commands", - "//ios/chrome/browser/ui/material_components", "//ios/chrome/browser/ui/settings/cells", "//ios/chrome/browser/ui/settings/cells:public", "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/table_view:styler", "//ios/chrome/browser/ui/table_view/cells", - "//ios/chrome/common/colors", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/util", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/user_feedback", - "//ios/third_party/material_components_ios", "//ui/base", ] } @@ -44,9 +38,7 @@ source_set("settings_root_constants") { "settings_root_table_constants.h", "settings_root_table_constants.mm", ] - deps = [ - "//base", - ] + deps = [ "//base" ] } source_set("settings") { @@ -62,14 +54,8 @@ source_set("settings") { "content_settings_table_view_controller.mm", "dataplan_usage_table_view_controller.h", "dataplan_usage_table_view_controller.mm", - "handoff_table_view_controller.h", - "handoff_table_view_controller.mm", "import_data_table_view_controller.h", "import_data_table_view_controller.mm", - "material_cell_catalog_view_controller.h", - "material_cell_catalog_view_controller.mm", - "privacy_table_view_controller.h", - "privacy_table_view_controller.mm", "search_engine_table_view_controller.h", "search_engine_table_view_controller.mm", "settings_navigation_controller.mm", @@ -115,13 +101,11 @@ source_set("settings") { "//components/content_settings/core/browser", "//components/content_settings/core/common", "//components/feature_engagement", - "//components/handoff", "//components/history/core/browser", "//components/image_fetcher/ios", "//components/keyed_service/core", "//components/password_manager/core/browser", "//components/password_manager/core/common", - "//components/payments/core", "//components/prefs/ios", "//components/resources", "//components/search_engines", @@ -154,7 +138,6 @@ source_set("settings") { "//ios/chrome/browser/ui/authentication", "//ios/chrome/browser/ui/authentication/cells", "//ios/chrome/browser/ui/autofill/cells", - "//ios/chrome/browser/ui/collection_view", "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/content_suggestions/cells", @@ -164,8 +147,6 @@ source_set("settings") { "//ios/chrome/browser/ui/icons", "//ios/chrome/browser/ui/keyboard", "//ios/chrome/browser/ui/list_model", - "//ios/chrome/browser/ui/material_components", - "//ios/chrome/browser/ui/payments/cells", "//ios/chrome/browser/ui/settings/autofill", "//ios/chrome/browser/ui/settings/cells", "//ios/chrome/browser/ui/settings/cells:public", @@ -174,6 +155,7 @@ source_set("settings") { "//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/privacy", "//ios/chrome/browser/ui/settings/sync", "//ios/chrome/browser/ui/settings/sync/utils", "//ios/chrome/browser/ui/settings/utils", @@ -187,27 +169,22 @@ source_set("settings") { "//ios/chrome/browser/voice", "//ios/chrome/browser/web:web", "//ios/chrome/common", - "//ios/chrome/common/colors", - "//ios/chrome/common/favicon", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/favicon", + "//ios/chrome/common/ui/util", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/images", "//ios/public/provider/chrome/browser/mailto", "//ios/public/provider/chrome/browser/signin", "//ios/public/provider/chrome/browser/user_feedback", "//ios/public/provider/chrome/browser/voice", - "//ios/third_party/material_components_ios", "//net", "//ui/base", "//url", ] - public_deps = [ - "//ios/chrome/browser/ui/collection_view/cells", - ] allow_circular_includes_from = [ "//ios/chrome/browser/ui/authentication" ] libs = [ "CoreLocation.framework", - "LocalAuthentication.framework", "UIKit.framework", ] } @@ -222,6 +199,7 @@ source_set("constants") { } source_set("test_support") { + defines = [ "CHROME_EARL_GREY_1" ] configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ @@ -229,6 +207,8 @@ source_set("test_support") { "passphrase_table_view_controller_test.mm", "personal_data_manager_finished_profile_tasks_waiter.cc", "personal_data_manager_finished_profile_tasks_waiter.h", + "signin_settings_app_interface.h", + "signin_settings_app_interface.mm", ] deps = [ ":settings", @@ -237,11 +217,13 @@ source_set("test_support") { "//components/autofill/core/browser", "//components/keyed_service/core", "//components/pref_registry", + "//components/prefs", "//components/sync", "//components/sync:test_support", "//components/sync_preferences", "//components/sync_preferences:test_support", "//google_apis", + "//ios/chrome/browser", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/main:test_support", @@ -252,6 +234,7 @@ source_set("test_support") { "//ios/chrome/browser/sync:test_support", "//ios/chrome/browser/ui/settings/password", "//ios/chrome/browser/ui/table_view:test_support", + "//ios/chrome/test/app:test_support", "//ios/public/provider/chrome/browser/signin:test_support", "//ios/web/public/test", "//testing/gtest", @@ -268,10 +251,8 @@ source_set("unit_tests") { "content_settings_table_view_controller_unittest.mm", "dataplan_usage_table_view_controller_unittest.mm", "import_data_table_view_controller_unittest.mm", - "privacy_table_view_controller_unittest.mm", "search_engine_table_view_controller_unittest.mm", "settings_navigation_controller_unittest.mm", - "settings_root_collection_view_controller_unittest.mm", "settings_root_table_view_controller_unittest.mm", "translate_table_view_controller_unittest.mm", "voice_search_table_view_controller_unittest.mm", @@ -288,7 +269,6 @@ source_set("unit_tests") { "//components/language/core/browser", "//components/password_manager/core/browser:test_support", "//components/password_manager/core/common", - "//components/payments/core", "//components/pref_registry", "//components/prefs:test_support", "//components/search_engines", @@ -316,9 +296,6 @@ source_set("unit_tests") { "//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", "//ios/chrome/browser/ui/icons", "//ios/chrome/browser/ui/settings/cells", "//ios/chrome/browser/ui/table_view", @@ -331,7 +308,6 @@ source_set("unit_tests") { "//ios/chrome/test/app:test_support", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/voice", - "//ios/third_party/material_components_ios", "//ios/web/public/test", "//net", "//net:test_support", @@ -350,14 +326,24 @@ source_set("eg_test_support") { sources = [ "block_popups_app_interface.h", "block_popups_app_interface.mm", + "settings_app_interface.h", + "settings_app_interface.mm", ] deps = [ "//base", + "//components/browsing_data/core", "//components/content_settings/core/browser", "//components/content_settings/core/common", + "//components/metrics", + "//components/prefs", + "//ios/chrome/app:app_internal", + "//ios/chrome/browser", + "//ios/chrome/browser:pref_names", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/content_settings", + "//ios/chrome/browser/content_settings", "//ios/chrome/test/app:test_support", + "//third_party/breakpad:client", ] } @@ -370,9 +356,10 @@ source_set("eg_tests") { testonly = true sources = [ "block_popups_egtest.mm", + "search_engine_settings_egtest.mm", + "settings_accessibility_egtest.mm", "settings_egtest.mm", "signin_settings_egtest.mm", - "translate_ui_egtest.mm", ] deps = [ @@ -413,12 +400,14 @@ source_set("eg_tests") { "//ios/chrome/test:test_support", "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", + "//ios/public/provider/chrome/browser/signin:fake_chrome_identity", "//ios/public/provider/chrome/browser/signin:test_support", "//ios/testing/earl_grey:earl_grey_support", "//ios/third_party/earl_grey:earl_grey+link", "//ios/web:earl_grey_test_support", "//ios/web/public/test/http_server", "//net", + "//net:test_support", "//ui/base", "//url", ] @@ -432,17 +421,25 @@ source_set("eg_app_support+eg2") { sources = [ "block_popups_app_interface.h", "block_popups_app_interface.mm", + "settings_app_interface.h", + "settings_app_interface.mm", + "signin_settings_app_interface.h", + "signin_settings_app_interface.mm", ] deps = [ "//base", + "//components/browsing_data/core", "//components/content_settings/core/browser", + "//components/metrics", + "//components/prefs", + "//ios/chrome/app:app_internal", + "//ios/chrome/browser", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/content_settings", "//ios/chrome/test/app:test_support", + "//third_party/breakpad:client", ] - public_deps = [ - "//components/content_settings/core/common", - ] + public_deps = [ "//components/content_settings/core/common" ] } source_set("eg_test_support+eg2") { @@ -451,10 +448,11 @@ source_set("eg_test_support+eg2") { testonly = true sources = [ "block_popups_app_interface.h", + "settings_app_interface.h", + "signin_settings_app_interface.h", ] - public_deps = [ - "//components/content_settings/core/common", - ] + public_deps = [ "//components/content_settings/core/common" ] + deps = [ "//base" ] } source_set("eg2_tests") { @@ -466,15 +464,28 @@ source_set("eg2_tests") { testonly = true sources = [ "block_popups_egtest.mm", + "search_engine_settings_egtest.mm", + "settings_accessibility_egtest.mm", + "settings_egtest.mm", + "signin_settings_egtest.mm", ] deps = [ ":eg_test_support+eg2", "//base", + "//base/test:test_support", + "//build:branding_buildflags", + "//components/strings", "//ios/chrome/app/strings", + "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/browser/ui/authentication:eg_test_support+eg2", + "//ios/chrome/browser/ui/authentication/cells:constants", + "//ios/chrome/browser/ui/settings:constants", "//ios/chrome/test/earl_grey:eg_test_support+eg2", + "//ios/public/provider/chrome/browser/signin:fake_chrome_identity", "//ios/testing/earl_grey:eg_test_support+eg2", "//ios/third_party/earl_grey2:test_lib", "//ios/web/public/test/http_server", + "//net:test_support", "//ui/base", "//url", ] diff --git a/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn index 5ae8b8b97af..ed05c753e5b 100644 --- a/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn @@ -37,6 +37,7 @@ source_set("autofill") { "//ios/chrome/browser", "//ios/chrome/browser/autofill", "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/main:public", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/autofill", @@ -55,7 +56,7 @@ source_set("autofill") { "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/browser/ui/table_view/cells:cells_constants", "//ios/chrome/browser/ui/util", - "//ios/chrome/common/colors", + "//ios/chrome/common/ui/colors", "//ui/base", ] } @@ -74,9 +75,7 @@ source_set("feature_flags") { "features.h", "features.mm", ] - deps = [ - "//base", - ] + deps = [ "//base" ] } source_set("unit_tests") { @@ -97,6 +96,7 @@ source_set("unit_tests") { "//ios/chrome/browser/autofill", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/main:test_support", "//ios/chrome/browser/ui/settings:settings_root", "//ios/chrome/browser/ui/settings:test_support", "//ios/chrome/browser/ui/table_view", @@ -149,6 +149,7 @@ source_set("eg2_tests") { ":constants", ":feature_flags", "//base", + "//components/autofill/core/browser:test_support", "//components/strings:components_strings_grit", "//ios/chrome/app/strings", "//ios/chrome/browser/ui/autofill:eg_test_support+eg2", diff --git a/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn index 2c1d8299b80..0be2e7306bb 100644 --- a/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn @@ -8,10 +8,6 @@ source_set("cells") { "account_sign_in_item.mm", "byo_textfield_item.h", "byo_textfield_item.mm", - "clear_browsing_data_constants.h", - "clear_browsing_data_constants.mm", - "clear_browsing_data_item.h", - "clear_browsing_data_item.mm", "copied_to_chrome_item.h", "copied_to_chrome_item.mm", "passphrase_error_item.h", @@ -28,8 +24,6 @@ source_set("cells") { "settings_switch_cell.mm", "settings_switch_item.h", "settings_switch_item.mm", - "settings_text_item.h", - "settings_text_item.mm", "sync_switch_item.h", "sync_switch_item.mm", "table_view_clear_browsing_data_item.h", @@ -52,17 +46,23 @@ source_set("cells") { "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/browser/ui/table_view/cells:cells_constants", "//ios/chrome/browser/ui/util", - "//ios/chrome/common/colors", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/util", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/signin", "//ui/base", ] - public_deps = [ - "//ios/chrome/browser/ui/settings/cells/legacy", - ] + public_deps = [ ":clear_browsing_data_constants" ] + + configs += [ "//build/config/compiler:enable_arc" ] +} +source_set("clear_browsing_data_constants") { + sources = [ + "clear_browsing_data_constants.h", + "clear_browsing_data_constants.mm", + ] configs += [ "//build/config/compiler:enable_arc" ] } @@ -78,7 +78,6 @@ source_set("unit_tests") { testonly = true sources = [ "byo_textfield_item_unittest.mm", - "clear_browsing_data_item_unittest.mm", "copied_to_chrome_item_unittest.mm", "passphrase_error_item_unittest.mm", "search_engine_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 deleted file mode 100644 index 9e325a9cbf3..00000000000 --- a/chromium/ios/chrome/browser/ui/settings/cells/legacy/BUILD.gn +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2018 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -source_set("legacy") { - sources = [ - "legacy_settings_detail_item.h", - "legacy_settings_detail_item.mm", - ] - - deps = [ - "//components/strings", - "//ios/chrome/app/strings", - "//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/colors", - "//ios/chrome/common/ui_util", - "//ui/base", - ] - - configs += [ "//build/config/compiler:enable_arc" ] -} 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 0d16492aefc..e780278b4aa 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 @@ -7,16 +7,14 @@ source_set("clear_browsing_data") { 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", - "clear_browsing_data_local_commands.h", "clear_browsing_data_manager.h", "clear_browsing_data_manager.mm", "clear_browsing_data_table_view_controller.h", "clear_browsing_data_table_view_controller.mm", "clear_browsing_data_ui_constants.h", "clear_browsing_data_ui_constants.mm", + "clear_browsing_data_ui_delegate.h", "time_range_selector_table_view_controller.h", "time_range_selector_table_view_controller.mm", ] @@ -39,6 +37,7 @@ source_set("clear_browsing_data") { "//ios/chrome/browser/browsing_data:feature_flags", "//ios/chrome/browser/feature_engagement", "//ios/chrome/browser/history", + "//ios/chrome/browser/main:public", "//ios/chrome/browser/signin", "//ios/chrome/browser/sync", "//ios/chrome/browser/ui:feature_flags", @@ -51,13 +50,12 @@ source_set("clear_browsing_data") { "//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/legacy", "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/table_view:styler", "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/browser/ui/table_view/cells:cells_constants", "//ios/chrome/common", - "//ios/chrome/common/colors", + "//ios/chrome/common/ui/colors", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/images", "//ui/base", @@ -68,7 +66,6 @@ source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ - "clear_browsing_data_collection_view_controller_unittest.mm", "clear_browsing_data_manager_unittest.mm", "time_range_selector_table_view_controller_unittest.mm", ] @@ -123,18 +120,36 @@ source_set("test_support") { } source_set("eg_tests") { + defines = [ "CHROME_EARL_GREY_1" ] configs += [ "//build/config/compiler:enable_arc" ] testonly = true - sources = [ - "clear_browsing_data_egtest.mm", - ] + sources = [ "clear_browsing_data_egtest.mm" ] deps = [ "//base/test:test_support", - "//components/strings", "//ios/chrome/app/strings", - "//ios/chrome/browser/browsing_data:feature_flags", - "//ios/chrome/browser/ui/settings/cells", + "//ios/chrome/browser/ui/settings/cells:clear_browsing_data_constants", "//ios/chrome/test/earl_grey:test_support", + "//ios/testing/earl_grey:earl_grey_support", + "//ui/base", + ] +} + +source_set("eg2_tests") { + defines = [ "CHROME_EARL_GREY_2" ] + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + testonly = true + sources = [ "clear_browsing_data_egtest.mm" ] + deps = [ + "//base/test:test_support", + "//ios/chrome/app/strings", + "//ios/chrome/browser/ui/settings/cells:clear_browsing_data_constants", + "//ios/chrome/test/earl_grey:eg_test_support+eg2", + "//ios/testing/earl_grey:eg_test_support+eg2", + "//ios/third_party/earl_grey2:test_lib", "//ui/base", ] + libs = [ "UIKit.framework" ] } diff --git a/chromium/ios/chrome/browser/ui/settings/credit_card_scanner/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/credit_card_scanner/BUILD.gn index b143203dd5b..9819fa71e6e 100644 --- a/chromium/ios/chrome/browser/ui/settings/credit_card_scanner/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/credit_card_scanner/BUILD.gn @@ -27,6 +27,7 @@ source_set("credit_card_scanner") { deps = [ "//components/autofill/core/browser", "//ios/chrome/app/strings", + "//ios/chrome/browser/main:public", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/qr_scanner", "//ios/chrome/browser/ui/scanner", @@ -44,9 +45,7 @@ source_set("credit_card_scanner") { source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true - sources = [ - "credit_card_scanner_string_util_unittest.mm", - ] + sources = [ "credit_card_scanner_string_util_unittest.mm" ] deps = [ "//ios/chrome/browser/ui/settings/credit_card_scanner", "//testing/gtest", 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 9d10b06865b..fd4130ad787 100644 --- a/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn @@ -7,10 +7,6 @@ source_set("google_services") { sources = [ "accounts_table_view_controller.h", "accounts_table_view_controller.mm", - "advanced_signin_settings_coordinator.h", - "advanced_signin_settings_coordinator.mm", - "advanced_signin_settings_navigation_controller.h", - "advanced_signin_settings_navigation_controller.mm", "google_services_settings_command_handler.h", "google_services_settings_consumer.h", "google_services_settings_coordinator.h", @@ -34,6 +30,7 @@ source_set("google_services") { "manage_sync_settings_view_controller_model_delegate.h", ] deps = [ + ":constants", "resources:google_services_enterprise", "resources:google_services_sync_error", "//base", @@ -59,6 +56,7 @@ source_set("google_services") { "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/authentication", "//ios/chrome/browser/ui/authentication/cells", + "//ios/chrome/browser/ui/authentication/signin/advanced_settings_signin", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/icons", @@ -72,14 +70,29 @@ source_set("google_services") { "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/table_view/cells:cells_constants", "//ios/chrome/browser/ui/util", - "//ios/chrome/common/colors", + "//ios/chrome/common/ui/colors", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/images", "//ios/public/provider/chrome/browser/signin", "//ui/base", ] - allow_circular_includes_from = - [ "//ios/chrome/browser/ui/signin_interaction" ] + allow_circular_includes_from = [ + "//ios/chrome/browser/ui/signin_interaction", + "//ios/chrome/browser/ui/authentication/signin/advanced_settings_signin", + ] +} + +source_set("constants") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "accounts_table_view_controller_constants.h", + "accounts_table_view_controller_constants.mm", + "google_services_settings_constants.h", + "google_services_settings_constants.mm", + "manage_sync_settings_constants.h", + "manage_sync_settings_constants.mm", + ] + deps = [] } source_set("eg_tests") { @@ -91,22 +104,67 @@ source_set("eg_tests") { "google_services_settings_egtest.mm", ] deps = [ - ":google_services", - "//components/prefs", - "//ios/chrome/app:app_internal", + ":constants", + ":test_support", + "//base/test:test_support", "//ios/chrome/app/strings", - "//ios/chrome/browser/browser_state", "//ios/chrome/browser/tabs", + "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/authentication:eg_test_support", - "//ios/chrome/browser/web_state_list", + "//ios/chrome/browser/ui/bookmarks: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/public/provider/chrome/browser/signin:fake_chrome_identity", "//ios/testing/earl_grey:earl_grey_support", "//ui/base", ] } +source_set("test_support") { + defines = [ "CHROME_EARL_GREY_1" ] + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ + "google_services_settings_app_interface.h", + "google_services_settings_app_interface.mm", + ] + deps = [ + "//ios/chrome/app:app_internal", + "//ios/chrome/browser/tabs", + "//ios/chrome/browser/web_state_list", + "//ios/chrome/test/app:test_support", + "//ios/web/public/navigation", + ] +} +source_set("eg_app_support+eg2") { + defines = [ "CHROME_EARL_GREY_2" ] + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + testonly = true + sources = [ + "google_services_settings_app_interface.h", + "google_services_settings_app_interface.mm", + ] + deps = [ + "//ios/chrome/app:app_internal", + "//ios/chrome/browser/tabs", + "//ios/chrome/browser/web_state_list", + "//ios/chrome/test/app:test_support", + "//ios/web/public/navigation", + ] +} +source_set("eg_test_support+eg2") { + defines = [ "CHROME_EARL_GREY_2" ] + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + testonly = true + sources = [ "google_services_settings_app_interface.h" ] +} + source_set("eg2_tests") { defines = [ "CHROME_EARL_GREY_2" ] configs += [ @@ -116,14 +174,22 @@ source_set("eg2_tests") { testonly = true sources = [ "accounts_table_egtest.mm", + "google_services_settings_egtest.mm", ] deps = [ + ":eg_test_support+eg2", "//base", + "//base/test:test_support", + "//ios/chrome/app/strings", + "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/authentication:eg_test_support+eg2", + "//ios/chrome/browser/ui/bookmarks:eg_test_support+eg2", + "//ios/chrome/browser/ui/settings/google_services:constants", "//ios/chrome/test/earl_grey:eg_test_support+eg2", - "//ios/public/provider/chrome/browser/signin:test_support", + "//ios/public/provider/chrome/browser/signin:fake_chrome_identity", "//ios/testing/earl_grey:eg_test_support+eg2", "//ios/third_party/earl_grey2:test_lib", + "//ui/base", ] libs = [ "UIKit.framework" ] } diff --git a/chromium/ios/chrome/browser/ui/settings/language/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/language/BUILD.gn index 3983aebc248..2c3ff742c78 100644 --- a/chromium/ios/chrome/browser/ui/settings/language/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/language/BUILD.gn @@ -40,13 +40,12 @@ source_set("language_ui") { "language_settings_histograms.mm", "language_settings_table_view_controller.h", "language_settings_table_view_controller.mm", - "language_settings_ui_constants.h", - "language_settings_ui_constants.mm", ] deps = [ "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/list_model", + "//ios/chrome/browser/ui/settings:constants", "//ios/chrome/browser/ui/settings:settings_root", "//ios/chrome/browser/ui/settings/cells", "//ios/chrome/browser/ui/settings/cells:public", @@ -55,18 +54,25 @@ source_set("language_ui") { "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/browser/ui/table_view/cells:cells_constants", "//ios/chrome/browser/ui/util", - "//ios/chrome/common/colors", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/util", "//ui/base", ] + public_deps = [ ":language_ui_constants" ] } -source_set("unit_tests") { +source_set("language_ui_constants") { configs += [ "//build/config/compiler:enable_arc" ] - testonly = true sources = [ - "language_settings_mediator_unittest.mm", + "language_settings_ui_constants.h", + "language_settings_ui_constants.mm", ] +} + +source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ "language_settings_mediator_unittest.mm" ] deps = [ ":language_ui", "//base/test:test_support", @@ -85,23 +91,93 @@ source_set("unit_tests") { ] } -source_set("eg_tests") { +source_set("eg_test_support") { + defines = [ "CHROME_EARL_GREY_1" ] configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ - "language_settings_egtest.mm", + "language_settings_app_interface.h", + "language_settings_app_interface.mm", + ] + deps = [ + "//components/language/core/browser", + "//components/translate/core/browser", + "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/translate", + "//ios/chrome/test/app:test_support", + ] +} + +source_set("eg_app_support+eg2") { + defines = [ "CHROME_EARL_GREY_2" ] + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ + "language_settings_app_interface.h", + "language_settings_app_interface.mm", ] deps = [ - ":language_ui", "//components/language/core/browser", "//components/translate/core/browser", - "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/translate", + "//ios/chrome/test/app:test_support", + ] +} + +source_set("eg_test_support+eg2") { + defines = [ "CHROME_EARL_GREY_2" ] + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + testonly = true + sources = [ + "language_settings_app_interface.h", + "language_settings_app_interface_stub.mm", + ] + deps = [ + "//ios/testing/earl_grey:eg_test_support+eg2", + "//ios/third_party/earl_grey2:test_lib", + ] +} + +source_set("eg2_tests") { + defines = [ "CHROME_EARL_GREY_2" ] + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + testonly = true + sources = [ "language_settings_egtest.mm" ] + deps = [ + ":language_ui_constants", + "//base/test:test_support", + "//components/translate/core/browser:translate_pref_names", + "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/browser/ui/settings/language:eg_test_support+eg2", + "//ios/chrome/test/earl_grey:eg_test_support+eg2", + "//ios/testing/earl_grey:eg_test_support+eg2", + "//ios/third_party/earl_grey2:test_lib", + "//ui/strings:ui_strings_grit", + ] + libs = [ "UIKit.framework" ] +} + +source_set("eg_tests") { + defines = [ "CHROME_EARL_GREY_1" ] + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ "language_settings_egtest.mm" ] + deps = [ + ":eg_test_support", + ":language_ui_constants", + "//components/translate/core/browser:translate_pref_names", + "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", - "//net:test_support", + "//ios/testing/earl_grey:earl_grey_support", "//ui/strings:ui_strings_grit", ] } diff --git a/chromium/ios/chrome/browser/ui/settings/language/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/language/cells/BUILD.gn index 4df69d83f8f..c22d372bdfd 100644 --- a/chromium/ios/chrome/browser/ui/settings/language/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/language/cells/BUILD.gn @@ -8,7 +8,5 @@ source_set("cells") { "language_item.h", "language_item.mm", ] - deps = [ - "//ios/chrome/browser/ui/table_view/cells", - ] + deps = [ "//ios/chrome/browser/ui/table_view/cells" ] } diff --git a/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn index d3d77828836..fc5883e6fad 100644 --- a/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn @@ -12,9 +12,6 @@ source_set("password") { "password_exporter.mm", "passwords_table_view_controller.h", "passwords_table_view_controller.mm", - "reauthentication_module.h", - "reauthentication_module.mm", - "reauthentication_protocol.h", ] deps = [ ":password_constants", @@ -43,8 +40,9 @@ source_set("password") { "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/browser/ui/table_view/cells:cells_constants", "//ios/chrome/browser/ui/util", - "//ios/chrome/common/colors", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/reauthentication", + "//ios/chrome/common/ui/util", "//ios/third_party/material_components_ios", "//ui/base", "//url", @@ -57,9 +55,7 @@ source_set("password_constants") { "passwords_table_view_constants.h", "passwords_table_view_constants.mm", ] - deps = [ - "//base", - ] + deps = [ "//base" ] } source_set("test_support") { @@ -68,11 +64,8 @@ source_set("test_support") { sources = [ "password_details_table_view_controller+testing.h", "password_exporter_for_testing.h", - "reauthentication_module_for_testing.h", - ] - deps = [ - ":password", ] + deps = [ ":password" ] } source_set("unit_tests") { @@ -82,7 +75,6 @@ source_set("unit_tests") { "password_details_table_view_controller_unittest.mm", "password_exporter_unittest.mm", "passwords_table_view_controller_unittest.mm", - "reauthentication_module_unittest.mm", ] deps = [ ":password", @@ -103,7 +95,8 @@ source_set("unit_tests") { "//ios/chrome/browser/ui/table_view/cells:cells_constants", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web:test_support", - "//ios/chrome/common/colors", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/reauthentication", "//ios/chrome/test/app:test_support", "//ios/web/public/test", "//ios/web/public/test", @@ -135,6 +128,7 @@ source_set("eg_test_support") { "//components/prefs", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/passwords", + "//ios/chrome/common/ui/reauthentication", "//ios/chrome/test/app:test_support", "//ios/third_party/material_components_ios", "//url", @@ -145,9 +139,7 @@ source_set("eg_tests") { defines = [ "CHROME_EARL_GREY_1" ] configs += [ "//build/config/compiler:enable_arc" ] testonly = true - sources = [ - "passwords_settings_egtest.mm", - ] + sources = [ "passwords_settings_egtest.mm" ] deps = [ ":eg_test_support", ":password_constants", @@ -162,6 +154,7 @@ source_set("eg_tests") { "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/browser/ui/table_view/cells:cells_constants", "//ios/chrome/browser/ui/util", + "//ios/chrome/common/ui/reauthentication", "//ios/chrome/test/earl_grey:test_support", "//ios/testing/earl_grey:earl_grey_support", "//ios/third_party/material_components_ios", @@ -198,6 +191,7 @@ source_set("eg_app_support+eg2") { "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/passwords", + "//ios/chrome/common/ui/reauthentication", "//ios/chrome/test/app:test_support", "//ios/testing/earl_grey:eg_app_support+eg2", "//ios/third_party/material_components_ios", @@ -213,9 +207,9 @@ source_set("eg_test_support+eg2") { ] testonly = true - sources = [ - "passwords_settings_app_interface.h", - ] + sources = [ "passwords_settings_app_interface.h" ] + + deps = [ "//ios/chrome/common/ui/reauthentication" ] } source_set("eg2_tests") { @@ -225,9 +219,7 @@ source_set("eg2_tests") { "//build/config/ios:xctest_config", ] testonly = true - sources = [ - "passwords_settings_egtest.mm", - ] + sources = [ "passwords_settings_egtest.mm" ] deps = [ ":eg_test_support+eg2", ":password_constants", @@ -238,6 +230,7 @@ source_set("eg2_tests") { "//ios/chrome/browser/ui/settings:settings_root_constants", "//ios/chrome/browser/ui/table_view/cells:cells_constants", "//ios/chrome/browser/ui/util", + "//ios/chrome/common/ui/reauthentication", "//ios/chrome/test/earl_grey:eg_test_support+eg2", "//ios/testing/earl_grey:eg_test_support+eg2", "//ios/third_party/earl_grey2:test_lib", diff --git a/chromium/ios/chrome/browser/ui/settings/privacy/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/privacy/BUILD.gn new file mode 100644 index 00000000000..71fc646d50b --- /dev/null +++ b/chromium/ios/chrome/browser/ui/settings/privacy/BUILD.gn @@ -0,0 +1,69 @@ +# Copyright 2020 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("privacy") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "handoff_table_view_controller.h", + "handoff_table_view_controller.mm", + "privacy_coordinator.h", + "privacy_coordinator.mm", + "privacy_navigation_commands.h", + "privacy_table_view_controller.h", + "privacy_table_view_controller.mm", + ] + deps = [ + "//base", + "//components/handoff", + "//components/prefs", + "//components/prefs/ios", + "//components/strings", + "//ios/chrome/app/strings", + "//ios/chrome/browser", + "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/browsing_data:feature_flags", + "//ios/chrome/browser/main:public", + "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/browser/ui/colors", + "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/coordinators:chrome_coordinators", + "//ios/chrome/browser/ui/settings:constants", + "//ios/chrome/browser/ui/settings:settings_root", + "//ios/chrome/browser/ui/settings/cells", + "//ios/chrome/browser/ui/settings/clear_browsing_data:clear_browsing_data", + "//ios/chrome/browser/ui/settings/sync/utils", + "//ios/chrome/browser/ui/settings/utils", + "//ios/chrome/browser/ui/table_view", + "//ios/chrome/browser/ui/table_view/cells", + "//ios/chrome/browser/ui/table_view/cells:cells_constants", + "//ui/base", + ] +} + +source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ "privacy_table_view_controller_unittest.mm" ] + deps = [ + "//base/test:test_support", + "//components/handoff", + "//components/prefs", + "//components/prefs/ios", + "//components/strings", + "//components/sync_preferences", + "//components/sync_preferences:test_support", + "//ios/chrome/app/strings", + "//ios/chrome/browser", + "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/browsing_data:feature_flags", + "//ios/chrome/browser/main:test_support", + "//ios/chrome/browser/prefs:browser_prefs", + "//ios/chrome/browser/ui/settings/privacy", + "//ios/chrome/browser/ui/table_view:test_support", + "//ios/chrome/test:test_support", + "//ios/web/public/test", + "//testing/gtest", + "//ui/base", + ] +} diff --git a/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn index 82592216a0d..e1eea0408e8 100644 --- a/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn @@ -5,9 +5,7 @@ import("//build/config/ios/asset_catalog.gni") colorset("settings_catalog_example_text") { - sources = [ - "settings_catalog_example_text.colorset/Contents.json", - ] + sources = [ "settings_catalog_example_text.colorset/Contents.json" ] } imageset("app_icon_placeholder") { diff --git a/chromium/ios/chrome/browser/ui/settings/sync/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/sync/BUILD.gn index 5cba0554980..be7a7c7363d 100644 --- a/chromium/ios/chrome/browser/ui/settings/sync/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/sync/BUILD.gn @@ -38,14 +38,13 @@ source_set("sync") { "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/settings:settings_root", "//ios/chrome/browser/ui/settings/cells", - "//ios/chrome/browser/ui/settings/cells/legacy", "//ios/chrome/browser/ui/settings/sync/utils", "//ios/chrome/browser/ui/settings/utils", "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/browser/ui/table_view/cells:cells_constants", "//ios/chrome/browser/ui/util", - "//ios/chrome/common/colors", + "//ios/chrome/common/ui/colors", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/signin", "//ui/base", @@ -83,7 +82,6 @@ source_set("unit_tests") { "//ios/chrome/browser/ui/collection_view:test_support", "//ios/chrome/browser/ui/settings:test_support", "//ios/chrome/browser/ui/settings/cells", - "//ios/chrome/browser/ui/settings/cells/legacy", "//ios/chrome/browser/ui/settings/sync/utils", "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/table_view:test_support", 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 25646b34b49..175db94c63c 100644 --- a/chromium/ios/chrome/browser/ui/settings/sync/utils/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/sync/utils/BUILD.gn @@ -35,33 +35,49 @@ source_set("utils") { source_set("eg_tests") { configs += [ "//build/config/compiler:enable_arc" ] + defines = [ "CHROME_EARL_GREY_1" ] testonly = true - sources = [ - "sync_fake_server_egtest.mm", - ] + sources = [ "sync_fake_server_egtest.mm" ] deps = [ "//base", "//base/test:test_support", "//components/bookmarks/browser", - "//components/browser_sync", - "//components/strings", - "//components/sync", - "//ios/chrome/app/strings", "//ios/chrome/browser/bookmarks", - "//ios/chrome/browser/bookmarks:bookmarks_utils", "//ios/chrome/browser/signin", - "//ios/chrome/browser/sync", "//ios/chrome/browser/ui/authentication:eg_test_support", - "//ios/chrome/browser/ui/authentication/cells", - "//ios/chrome/browser/ui/settings", "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", + "//ios/public/provider/chrome/browser/signin:fake_chrome_identity", "//ios/public/provider/chrome/browser/signin:test_support", + "//ios/testing/earl_grey:earl_grey_support", "//ios/third_party/earl_grey:earl_grey+link", "//ios/web/public/test/http_server", - "//net", - "//ui/base", - "//url", ] 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 = [ "sync_fake_server_egtest.mm" ] + + deps = [ + "//base", + "//base/test:test_support", + "//ios/chrome/browser/ui/authentication:eg_test_support+eg2", + "//ios/chrome/test/earl_grey:eg_test_support+eg2", + "//ios/chrome/test/earl_grey:eg_test_support+eg2", + "//ios/public/provider/chrome/browser/signin:fake_chrome_identity", + "//ios/public/provider/chrome/browser/signin:test_support", + "//ios/testing/earl_grey:eg_test_support+eg2", + "//ios/third_party/earl_grey2:test_lib", + "//ios/web/public/test/http_server", + ] + + libs = [ "UIKit.framework" ] +} diff --git a/chromium/ios/chrome/browser/ui/settings/utils/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/utils/BUILD.gn index e295cacf153..6aaf2f167e8 100644 --- a/chromium/ios/chrome/browser/ui/settings/utils/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/utils/BUILD.gn @@ -30,9 +30,7 @@ source_set("test_support") { "fake_observable_boolean.h", "fake_observable_boolean.mm", ] - deps = [ - ":utils", - ] + deps = [ ":utils" ] } source_set("unit_tests") { diff --git a/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn b/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn index 27dc864b735..7e270e95d01 100644 --- a/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn @@ -25,12 +25,13 @@ source_set("side_swipe") { "//ios/chrome/app/theme", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/main:public", "//ios/chrome/browser/reading_list", "//ios/chrome/browser/snapshots", - "//ios/chrome/browser/tabs", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/elements", "//ios/chrome/browser/ui/fullscreen", + "//ios/chrome/browser/ui/fullscreen:feature_flags", "//ios/chrome/browser/ui/ntp", "//ios/chrome/browser/ui/ntp:util", "//ios/chrome/browser/ui/tab_grid/grid:grid_ui_constants", @@ -38,10 +39,11 @@ source_set("side_swipe") { "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web", + "//ios/chrome/browser/web:page_placeholder", "//ios/chrome/browser/web_state_list", "//ios/chrome/common", - "//ios/chrome/common/colors", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/util", "//ios/web/common", "//ui/base", "//url", @@ -52,15 +54,14 @@ source_set("side_swipe") { source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true - sources = [ - "side_swipe_controller_unittest.mm", - ] + sources = [ "side_swipe_controller_unittest.mm" ] deps = [ ":side_swipe", "//base", "//base/test:test_support", "//ios/chrome/browser", "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/main:test_support", "//ios/chrome/browser/web_state_list", "//ios/web/common", "//ios/web/public/test", @@ -73,9 +74,7 @@ source_set("eg_tests") { configs += [ "//build/config/compiler:enable_arc" ] defines = [ "CHROME_EARL_GREY_1" ] testonly = true - sources = [ - "side_swipe_egtest.mm", - ] + sources = [ "side_swipe_egtest.mm" ] deps = [ ":side_swipe", @@ -100,9 +99,7 @@ source_set("eg2_tests") { "//build/config/ios:xctest_config", ] testonly = true - sources = [ - "side_swipe_egtest.mm", - ] + sources = [ "side_swipe_egtest.mm" ] deps = [ "//base", "//ios/chrome/test/earl_grey:eg_test_support+eg2", diff --git a/chromium/ios/chrome/browser/ui/signin_interaction/BUILD.gn b/chromium/ios/chrome/browser/ui/signin_interaction/BUILD.gn index b23a021d385..52b8152d312 100644 --- a/chromium/ios/chrome/browser/ui/signin_interaction/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/signin_interaction/BUILD.gn @@ -19,8 +19,10 @@ source_set("signin_interaction") { "//ios/chrome/browser/browser_state", "//ios/chrome/browser/main", "//ios/chrome/browser/signin", + "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/authentication", + "//ios/chrome/browser/ui/authentication/signin", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/public/provider/chrome/browser", @@ -33,6 +35,8 @@ source_set("eg_test_support") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ + "signin_interaction_controller_app_interface.h", + "signin_interaction_controller_app_interface.mm", "signin_interaction_controller_egtest_util.h", "signin_interaction_controller_egtest_util.mm", ] @@ -40,10 +44,9 @@ source_set("eg_test_support") { deps = [ "//base", "//base/test:test_support", - "//ios/chrome/app/strings", + "//ios/chrome/browser/ui/authentication", "//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", ] } @@ -56,6 +59,7 @@ source_set("eg_test_support+eg2") { ] testonly = true sources = [ + "signin_interaction_controller_app_interface.h", "signin_interaction_controller_egtest_util.h", "signin_interaction_controller_egtest_util.mm", ] @@ -65,18 +69,17 @@ source_set("eg_test_support+eg2") { "//base/test:test_support", "//ios/chrome/app/strings", "//ios/chrome/test/earl_grey:eg_test_support+eg2", - "//ios/public/provider/chrome/browser/signin:test_support", + "//ios/public/provider/chrome/browser/signin:fake_chrome_identity", "//ios/testing/earl_grey:eg_test_support+eg2", "//ios/third_party/earl_grey2:test_lib", ] } source_set("eg_tests") { + defines = [ "CHROME_EARL_GREY_1" ] configs += [ "//build/config/compiler:enable_arc" ] testonly = true - sources = [ - "signin_interaction_controller_egtest.mm", - ] + sources = [ "signin_interaction_controller_egtest.mm" ] deps = [ ":eg_test_support", "//base", @@ -94,14 +97,15 @@ source_set("eg_tests") { "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant", "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui_constants", "//ios/chrome/browser/ui/settings", - "//ios/chrome/browser/ui/settings/google_services", + "//ios/chrome/browser/ui/settings/google_services:constants", "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web_state_list", "//ios/chrome/test: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/public/provider/chrome/browser/signin:constants", + "//ios/public/provider/chrome/browser/signin:fake_chrome_identity", "//ios/testing/earl_grey:earl_grey_support", "//ios/third_party/earl_grey:earl_grey+link", "//ui/base", @@ -109,3 +113,42 @@ source_set("eg_tests") { ] libs = [ "XCTest.framework" ] } + +source_set("eg_app_support+eg2") { + defines = [ "CHROME_EARL_GREY_2" ] + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ + "signin_interaction_controller_app_interface.h", + "signin_interaction_controller_app_interface.mm", + ] + deps = [ + "//base", + "//ios/chrome/browser/ui/authentication", + ] +} + +source_set("eg2_tests") { + defines = [ "CHROME_EARL_GREY_2" ] + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + testonly = true + sources = [ "signin_interaction_controller_egtest.mm" ] + deps = [ + ":eg_test_support+eg2", + "//base", + "//base/test:test_support", + "//ios/chrome/app/strings", + "//ios/chrome/browser/ui/authentication:eg_test_support+eg2", + "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui_constants", + "//ios/chrome/test/earl_grey:eg_test_support+eg2", + "//ios/public/provider/chrome/browser/signin:constants", + "//ios/public/provider/chrome/browser/signin:fake_chrome_identity", + "//ios/testing/earl_grey:eg_test_support+eg2", + "//ios/third_party/earl_grey2:test_lib", + "//ui/base", + ] + libs = [ "UIKit.framework" ] +} diff --git a/chromium/ios/chrome/browser/ui/signin_interaction/public/BUILD.gn b/chromium/ios/chrome/browser/ui/signin_interaction/public/BUILD.gn index 738f1f22315..d858dab73f5 100644 --- a/chromium/ios/chrome/browser/ui/signin_interaction/public/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/signin_interaction/public/BUILD.gn @@ -4,7 +4,5 @@ source_set("public") { configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "signin_presenter.h", - ] + sources = [ "signin_presenter.h" ] } diff --git a/chromium/ios/chrome/browser/ui/snackbar/BUILD.gn b/chromium/ios/chrome/browser/ui/snackbar/BUILD.gn index 78dc55eba27..4562755113b 100644 --- a/chromium/ios/chrome/browser/ui/snackbar/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/snackbar/BUILD.gn @@ -9,6 +9,7 @@ source_set("snackbar") { "snackbar_coordinator.mm", ] deps = [ + "//ios/chrome/browser/main:public", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/util", @@ -16,17 +17,3 @@ source_set("snackbar") { ] libs = [ "UIKit.framework" ] } - -source_set("unit_tests") { - configs += [ "//build/config/compiler:enable_arc" ] - testonly = true - sources = [ - "snackbar_coordinator_unittest.mm", - ] - deps = [ - ":snackbar", - "//ios/chrome/browser/ui/commands", - "//testing/gtest", - "//third_party/ocmock", - ] -} diff --git a/chromium/ios/chrome/browser/ui/static_content/BUILD.gn b/chromium/ios/chrome/browser/ui/static_content/BUILD.gn deleted file mode 100644 index e7e81d9c887..00000000000 --- a/chromium/ios/chrome/browser/ui/static_content/BUILD.gn +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 2016 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -source_set("static_content") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "static_html_native_content.h", - "static_html_native_content.mm", - "static_html_view_controller.h", - "static_html_view_controller.mm", - ] - deps = [ - "//base", - "//ios/chrome/browser/browser_state", - "//ios/chrome/browser/url_loading", - "//ios/web/common:web_view_creation_util", - "//ios/web/public/deprecated", - "//net", - "//ui/base", - ] -} - -source_set("unit_tests") { - configs += [ "//build/config/compiler:enable_arc" ] - testonly = true - sources = [ - "static_html_native_content_unittest.mm", - "static_html_view_controller_unittest.mm", - ] - deps = [ - ":static_content", - "//base", - "//base/test:test_support", - "//ios/chrome/app/strings", - "//ios/chrome/browser/browser_state:test_support", - "//ios/chrome/browser/url_loading", - "//ios/testing:ocmock_support", - "//ios/web/public/deprecated", - "//ios/web/public/test", - "//ios/web/public/test/fakes", - "//net", - "//testing/gtest", - "//third_party/ocmock", - "//ui/base", - ] -} diff --git a/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn index 014a2e63c2e..747da879577 100644 --- a/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn @@ -13,7 +13,6 @@ source_set("tab_grid") { "tab_grid_mediator.h", "tab_grid_mediator.mm", "tab_switcher.h", - "view_controller_swapping.h", ] configs += [ "//build/config/compiler:enable_arc" ] @@ -26,10 +25,13 @@ source_set("tab_grid") { "//components/sessions", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/main", "//ios/chrome/browser/sessions", + "//ios/chrome/browser/sessions:restoration_agent", "//ios/chrome/browser/sessions:serialisation", "//ios/chrome/browser/snapshots", "//ios/chrome/browser/tabs", + "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/history", @@ -37,9 +39,11 @@ source_set("tab_grid") { "//ios/chrome/browser/ui/main", "//ios/chrome/browser/ui/recent_tabs", "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui", + "//ios/chrome/browser/ui/tab_grid/transitions", "//ios/chrome/browser/url_loading", "//ios/chrome/browser/web", "//ios/chrome/browser/web_state_list", + "//ios/chrome/browser/web_state_list:agents", "//ios/chrome/browser/web_state_list/web_usage_enabler", "//ios/web", "//ui/base", @@ -55,13 +59,13 @@ source_set("tab_grid_ui_constants") { "tab_grid_constants.mm", ] - deps = [ - "resources:grid_background_color", - ] + deps = [ "resources:grid_background_color" ] } source_set("tab_grid_ui") { sources = [ + "legacy_tab_grid_transition_handler.h", + "legacy_tab_grid_transition_handler.mm", "tab_grid_bottom_toolbar.h", "tab_grid_bottom_toolbar.mm", "tab_grid_empty_state_view.h", @@ -73,8 +77,6 @@ source_set("tab_grid_ui") { "tab_grid_paging.h", "tab_grid_top_toolbar.h", "tab_grid_top_toolbar.mm", - "tab_grid_transition_handler.h", - "tab_grid_transition_handler.mm", "tab_grid_view_controller.h", "tab_grid_view_controller.mm", ] @@ -94,12 +96,13 @@ source_set("tab_grid_ui") { "//ios/chrome/app/strings", "//ios/chrome/browser", "//ios/chrome/browser/crash_report", + "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui", "//ios/chrome/browser/ui/tab_grid/transitions", "//ios/chrome/browser/ui/table_view:styler", "//ios/chrome/browser/ui/util", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/util", "//ios/web/public", "//ui/base", ] @@ -118,14 +121,23 @@ source_set("unit_tests") { "grid:grid_ui", "//base", "//base/test:test_support", + "//components/sessions", "//ios/chrome/browser", "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/main:test_support", "//ios/chrome/browser/ntp", + "//ios/chrome/browser/sessions:restoration_agent", + "//ios/chrome/browser/sessions:test_support", + "//ios/chrome/browser/snapshots", "//ios/chrome/browser/tabs", + "//ios/chrome/browser/tabs:tabs_internal", + "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/web", + "//ios/chrome/browser/web:page_placeholder", "//ios/chrome/browser/web:test_support", "//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:block_cleanup_test", "//ios/web/common", "//ios/web/public/test", diff --git a/chromium/ios/chrome/browser/ui/tab_grid/grid/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_grid/grid/BUILD.gn index e22d4c1c299..4f3bfd49f71 100644 --- a/chromium/ios/chrome/browser/ui/tab_grid/grid/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/tab_grid/grid/BUILD.gn @@ -42,8 +42,8 @@ source_set("grid_ui") { "//ios/chrome/browser/ui/elements", "//ios/chrome/browser/ui/tab_grid/transitions", "//ios/chrome/browser/ui/util", - "//ios/chrome/common/colors", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/util", "//ui/base", ] } @@ -51,9 +51,7 @@ source_set("grid_ui") { source_set("unit_tests") { testonly = true - sources = [ - "grid_view_controller_unittest.mm", - ] + sources = [ "grid_view_controller_unittest.mm" ] configs += [ "//build/config/compiler:enable_arc" ] diff --git a/chromium/ios/chrome/browser/ui/tab_grid/grid/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_grid/grid/resources/BUILD.gn index 0cd6645ae04..adc9b861cca 100644 --- a/chromium/ios/chrome/browser/ui/tab_grid/grid/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/tab_grid/grid/resources/BUILD.gn @@ -13,13 +13,9 @@ imageset("grid_cell_close_button") { } colorset("grid_theme_selection_tint_color") { - sources = [ - "grid_theme_selection_tint_color.colorset/Contents.json", - ] + sources = [ "grid_theme_selection_tint_color.colorset/Contents.json" ] } colorset("grid_theme_dark_selection_tint_color") { - sources = [ - "grid_theme_dark_selection_tint_color.colorset/Contents.json", - ] + sources = [ "grid_theme_dark_selection_tint_color.colorset/Contents.json" ] } diff --git a/chromium/ios/chrome/browser/ui/tab_grid/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_grid/resources/BUILD.gn index 7790335c4b6..a25c583233c 100644 --- a/chromium/ios/chrome/browser/ui/tab_grid/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/tab_grid/resources/BUILD.gn @@ -5,9 +5,7 @@ import("//build/config/ios/asset_catalog.gni") colorset("grid_background_color") { - sources = [ - "grid_background_color.colorset/Contents.json", - ] + sources = [ "grid_background_color.colorset/Contents.json" ] } imageset("new_tab_floating_button") { diff --git a/chromium/ios/chrome/browser/ui/tab_grid/transitions/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_grid/transitions/BUILD.gn index 1349ffda9af..f92e86ba689 100644 --- a/chromium/ios/chrome/browser/ui/tab_grid/transitions/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/tab_grid/transitions/BUILD.gn @@ -7,17 +7,19 @@ import("//ios/public/provider/chrome/browser/build_config.gni") source_set("transitions") { sources = [ "grid_to_tab_transition_view.h", - "grid_to_visible_tab_animator.h", - "grid_to_visible_tab_animator.mm", "grid_transition_animation.h", "grid_transition_animation.mm", + "grid_transition_animation_layout_providing.h", "grid_transition_layout.h", "grid_transition_layout.mm", - "grid_transition_state_providing.h", + "legacy_grid_to_visible_tab_animator.h", + "legacy_grid_to_visible_tab_animator.mm", + "legacy_tab_to_grid_animator.h", + "legacy_tab_to_grid_animator.mm", "reduced_motion_animator.h", "reduced_motion_animator.mm", - "tab_to_grid_animator.h", - "tab_to_grid_animator.mm", + "tab_grid_transition_handler.h", + "tab_grid_transition_handler.mm", ] configs += [ "//build/config/compiler:enable_arc" ] diff --git a/chromium/ios/chrome/browser/ui/table_view/BUILD.gn b/chromium/ios/chrome/browser/ui/table_view/BUILD.gn index 43a6b7c48c4..1362a376f45 100644 --- a/chromium/ios/chrome/browser/ui/table_view/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/table_view/BUILD.gn @@ -22,7 +22,7 @@ source_set("table_view") { "//base", "//ios/chrome/browser/ui/list_model", "//ios/chrome/browser/ui/material_components", - "//ios/chrome/common/colors", + "//ios/chrome/common/ui/colors", "//ios/third_party/material_components_ios", ] public_deps = [ @@ -49,7 +49,7 @@ source_set("styler") { ] public_deps = [ "//ios/chrome/browser/ui/util", - "//ios/chrome/common/colors", + "//ios/chrome/common/ui/colors", ] } @@ -67,7 +67,7 @@ source_set("presentation") { "//ios/chrome/browser/ui/image_util", "//ios/chrome/browser/ui/resources:menu_shadow", "//ios/chrome/browser/ui/util", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/util", ] } @@ -85,7 +85,7 @@ source_set("views") { "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/material_components", "//ios/chrome/browser/ui/util", - "//ios/chrome/common/colors", + "//ios/chrome/common/ui/colors", "//ios/third_party/material_components_ios", ] } @@ -96,9 +96,7 @@ source_set("feature_flags") { "feature_flags.h", "feature_flags.mm", ] - deps = [ - "//base", - ] + deps = [ "//base" ] } source_set("test_support") { @@ -121,9 +119,7 @@ source_set("test_support") { source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true - sources = [ - "chrome_table_view_controller_unittest.mm", - ] + sources = [ "chrome_table_view_controller_unittest.mm" ] deps = [ ":table_view", ":test_support", 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 ae39e7b95f4..b51aef8fcbf 100644 --- a/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn @@ -58,9 +58,9 @@ source_set("cells") { "//ios/chrome/browser/ui/table_view:styler", "//ios/chrome/browser/ui/util", "//ios/chrome/common", - "//ios/chrome/common/colors", - "//ios/chrome/common/favicon", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/favicon", + "//ios/chrome/common/ui/util", "//ios/third_party/material_components_ios", "//net", "//ui/base", @@ -74,9 +74,7 @@ source_set("cells_constants") { "table_view_cells_constants.h", "table_view_cells_constants.mm", ] - deps = [ - "//base", - ] + deps = [ "//base" ] configs += [ "//build/config/compiler:enable_arc" ] } @@ -101,7 +99,7 @@ source_set("unit_tests") { ":cells_constants", "//base", "//ios/chrome/browser/ui/table_view:styler", - "//ios/chrome/common/colors", + "//ios/chrome/common/ui/colors", "//net:net", "//testing/gtest", "//third_party/ocmock:ocmock", diff --git a/chromium/ios/chrome/browser/ui/tabs/BUILD.gn b/chromium/ios/chrome/browser/ui/tabs/BUILD.gn index 45308d30a95..9d4a582ccd8 100644 --- a/chromium/ios/chrome/browser/ui/tabs/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/tabs/BUILD.gn @@ -21,9 +21,7 @@ source_set("tabs") { "target_frame_cache.h", "target_frame_cache.mm", ] - public_deps = [ - "//ios/chrome/browser/tabs", - ] + public_deps = [ "//ios/chrome/browser/tabs" ] deps = [ "resources:open_new_tab_background", "resources:tabstrip_background_tab", @@ -33,7 +31,6 @@ source_set("tabs") { "resources:tabstrip_incognito_background_tab", "resources:tabstrip_incognito_foreground_tab", "resources:tabstrip_new_tab", - "resources:tabstrip_new_tab_pressed", "resources:tabstrip_tab_switcher_count_button", "resources:tabstrip_tab_switcher_count_button_pressed", "resources:tabstrip_toggle_button_gradient", @@ -44,6 +41,7 @@ source_set("tabs") { "//ios/chrome/browser", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/drag_and_drop", + "//ios/chrome/browser/main:public", "//ios/chrome/browser/snapshots", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/bubble", @@ -52,18 +50,20 @@ source_set("tabs") { "//ios/chrome/browser/ui/elements", "//ios/chrome/browser/ui/favicon/resources:default_world_favicon", "//ios/chrome/browser/ui/fullscreen", + "//ios/chrome/browser/ui/fullscreen:feature_flags", "//ios/chrome/browser/ui/image_util", "//ios/chrome/browser/ui/ntp:util", "//ios/chrome/browser/ui/open_in", "//ios/chrome/browser/ui/popup_menu/public", "//ios/chrome/browser/ui/tab_grid/grid/resources:grid_cell_close_button", "//ios/chrome/browser/ui/tabs/requirements", + "//ios/chrome/browser/ui/toolbar/public:feature_flags", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web_state_list", "//ios/chrome/common", - "//ios/chrome/common:common_extension", - "//ios/chrome/common/colors", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/elements", + "//ios/chrome/common/ui/util", "//ios/third_party/material_components_ios", "//ios/web", "//ui/base", @@ -82,6 +82,7 @@ source_set("coordinator") { ":tabs", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/main:public", "//ios/chrome/browser/ui/bubble", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", @@ -92,15 +93,16 @@ source_set("coordinator") { source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true - sources = [ - "tab_strip_controller_unittest.mm", - ] + sources = [ "tab_strip_controller_unittest.mm" ] deps = [ ":tabs", "//base", "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/main:public", + "//ios/chrome/browser/main:test_support", "//ios/chrome/browser/sessions:test_support", "//ios/chrome/browser/tabs", + "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web_state_list", "//ios/chrome/browser/web_state_list:test_support", @@ -116,9 +118,7 @@ source_set("eg_tests") { defines = [ "CHROME_EARL_GREY_1" ] configs += [ "//build/config/compiler:enable_arc" ] testonly = true - sources = [ - "tab_strip_egtest.mm", - ] + sources = [ "tab_strip_egtest.mm" ] deps = [ ":tabs", "//ios/chrome/app/strings", @@ -139,9 +139,7 @@ source_set("eg2_tests") { "//build/config/ios:xctest_config", ] testonly = true - sources = [ - "tab_strip_egtest.mm", - ] + sources = [ "tab_strip_egtest.mm" ] deps = [ "//ios/chrome/test/earl_grey:eg_test_support+eg2", "//ios/testing/earl_grey:eg_test_support+eg2", diff --git a/chromium/ios/chrome/browser/ui/tabs/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/tabs/resources/BUILD.gn index 281c64a6a3b..6ff9d1daf79 100644 --- a/chromium/ios/chrome/browser/ui/tabs/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/tabs/resources/BUILD.gn @@ -50,13 +50,6 @@ imageset("tabstrip_new_tab") { ] } -imageset("tabstrip_new_tab_pressed") { - sources = [ - "tabstrip_new_tab_pressed.imageset/Contents.json", - "tabstrip_new_tab_pressed.imageset/tabstrip_new_tab_pressed@2x~ipad.png", - ] -} - imageset("tabstrip_tab_switcher_count_button") { sources = [ "tabstrip_tab_switcher_count_button.imageset/Contents.json", @@ -82,13 +75,10 @@ imageset("tabstrip_toggle_button_gradient") { } colorset("tabstrip_inactive_tab_close_button_color") { - sources = [ - "tabstrip_inactive_tab_close_button_color.colorset/Contents.json", - ] + sources = + [ "tabstrip_inactive_tab_close_button_color.colorset/Contents.json" ] } colorset("tabstrip_inactive_tab_text_color") { - sources = [ - "tabstrip_inactive_tab_text_color.colorset/Contents.json", - ] + sources = [ "tabstrip_inactive_tab_text_color.colorset/Contents.json" ] } diff --git a/chromium/ios/chrome/browser/ui/text_zoom/BUILD.gn b/chromium/ios/chrome/browser/ui/text_zoom/BUILD.gn new file mode 100644 index 00000000000..0b65da261f9 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/text_zoom/BUILD.gn @@ -0,0 +1,54 @@ +# 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("text_zoom") { + sources = [ + "text_zoom_coordinator.h", + "text_zoom_coordinator.mm", + "text_zoom_mediator.h", + "text_zoom_mediator.mm", + ] + deps = [ + ":text_zoom_ui", + "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/main", + "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/coordinators:chrome_coordinators", + "//ios/chrome/browser/ui/presenters", + "//ios/chrome/browser/ui/toolbar/accessory", + "//ios/chrome/browser/ui/toolbar/public:constants", + "//ios/chrome/browser/web", + "//ios/chrome/browser/web_state_list", + "//ios/chrome/common/ui/colors", + ] + configs += [ "//build/config/compiler:enable_arc" ] +} + +source_set("text_zoom_ui") { + sources = [ + "text_zoom_consumer.h", + "text_zoom_view_controller.h", + "text_zoom_view_controller.mm", + ] + deps = [ + ":constants", + "resources:text_zoom_zoom_in", + "resources:text_zoom_zoom_out", + "//components/strings:components_strings", + "//ios/chrome/app/strings:ios_strings", + "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/util", + "//ios/chrome/common/ui/colors", + "//ui/base", + ] + configs += [ "//build/config/compiler:enable_arc" ] +} + +source_set("constants") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "text_zoom_constants.h", + "text_zoom_constants.mm", + ] +} diff --git a/chromium/ios/chrome/browser/ui/text_zoom/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/text_zoom/resources/BUILD.gn new file mode 100644 index 00000000000..941f33d077b --- /dev/null +++ b/chromium/ios/chrome/browser/ui/text_zoom/resources/BUILD.gn @@ -0,0 +1,21 @@ +# Copyright 2020 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/ios/asset_catalog.gni") + +imageset("text_zoom_zoom_in") { + sources = [ + "text_zoom_zoom_in.imageset/Contents.json", + "text_zoom_zoom_in.imageset/text_zoom_zoom_in@2x.png", + "text_zoom_zoom_in.imageset/text_zoom_zoom_in@3x.png", + ] +} + +imageset("text_zoom_zoom_out") { + sources = [ + "text_zoom_zoom_out.imageset/Contents.json", + "text_zoom_zoom_out.imageset/text_zoom_zoom_out@2x.png", + "text_zoom_zoom_out.imageset/text_zoom_zoom_out@3x.png", + ] +} diff --git a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn index 3989fa22aab..7dacd190c90 100644 --- a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn @@ -39,6 +39,7 @@ source_set("toolbar") { "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/fullscreen", + "//ios/chrome/browser/ui/fullscreen:feature_flags", "//ios/chrome/browser/ui/location_bar", "//ios/chrome/browser/ui/ntp", "//ios/chrome/browser/ui/ntp:util", @@ -99,8 +100,8 @@ source_set("toolbar_ui") { "//ios/chrome/browser/ui/util", "//ios/chrome/browser/ui/util", "//ios/chrome/common:timing", - "//ios/chrome/common/colors", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/util", "//ios/third_party/material_components_ios", "//ui/base", ] @@ -191,9 +192,7 @@ source_set("eg_test_support+eg2") { ] testonly = true - sources = [ - "adaptive_toolbar_app_interface.h", - ] + sources = [ "adaptive_toolbar_app_interface.h" ] } source_set("eg2_tests") { diff --git a/chromium/ios/chrome/browser/ui/toolbar/accessory/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/accessory/BUILD.gn new file mode 100644 index 00000000000..c1b1258c578 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/toolbar/accessory/BUILD.gn @@ -0,0 +1,35 @@ +# 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("accessory") { + sources = [ + "toolbar_accessory_coordinator_delegate.h", + "toolbar_accessory_presenter.h", + "toolbar_accessory_presenter.mm", + ] + + deps = [ + ":constants", + "//base", + "//base:i18n", + "//ios/chrome/browser/ui/image_util", + "//ios/chrome/browser/ui/presenters", + "//ios/chrome/browser/ui/toolbar/public:constants", + "//ios/chrome/browser/ui/util", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/util", + ] + + configs += [ "//build/config/compiler:enable_arc" ] + libs = [ "UIKit.framework" ] +} + +source_set("constants") { + sources = [ + "toolbar_accessory_constants.h", + "toolbar_accessory_constants.mm", + ] + + configs += [ "//build/config/compiler:enable_arc" ] +} diff --git a/chromium/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn index d1efe0787ee..8b3cf935041 100644 --- a/chromium/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn @@ -15,8 +15,8 @@ source_set("buttons") { "toolbar_component_options.h", "toolbar_configuration.h", "toolbar_configuration.mm", - "toolbar_search_button.h", - "toolbar_search_button.mm", + "toolbar_new_tab_button.h", + "toolbar_new_tab_button.mm", "toolbar_style.h", "toolbar_tab_grid_button.h", "toolbar_tab_grid_button.mm", @@ -36,7 +36,6 @@ source_set("buttons") { "resources:toolbar_forward", "resources:toolbar_new_tab_page", "resources:toolbar_reload", - "resources:toolbar_search", "resources:toolbar_share", "resources:toolbar_stop", "resources:toolbar_switcher", @@ -52,8 +51,8 @@ source_set("buttons") { "//ios/chrome/browser/ui/toolbar/public:feature_flags", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web_state_list", - "//ios/chrome/common/colors", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/colors", + "//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/buttons/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/buttons/resources/BUILD.gn index 9f3a98f2120..db70905d5f8 100644 --- a/chromium/ios/chrome/browser/ui/toolbar/buttons/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/toolbar/buttons/resources/BUILD.gn @@ -5,15 +5,11 @@ import("//build/config/ios/asset_catalog.gni") colorset("omnibox_incognito_background_color") { - sources = [ - "omnibox_incognito_background_color.colorset/Contents.json", - ] + sources = [ "omnibox_incognito_background_color.colorset/Contents.json" ] } colorset("tab_toolbar_button_color_highlighted") { - sources = [ - "tab_toolbar_button_color_highlighted.colorset/Contents.json", - ] + sources = [ "tab_toolbar_button_color_highlighted.colorset/Contents.json" ] } colorset("tab_toolbar_button_color_highlighted_incognito") { @@ -23,15 +19,11 @@ colorset("tab_toolbar_button_color_highlighted_incognito") { } colorset("tab_toolbar_button_halo_color") { - sources = [ - "tab_toolbar_button_halo_color.colorset/Contents.json", - ] + sources = [ "tab_toolbar_button_halo_color.colorset/Contents.json" ] } colorset("tab_toolbar_button_halo_color_incognito") { - sources = [ - "tab_toolbar_button_halo_color_incognito.colorset/Contents.json", - ] + sources = [ "tab_toolbar_button_halo_color_incognito.colorset/Contents.json" ] } imageset("toolbar_new_tab_page") { @@ -45,21 +37,11 @@ imageset("toolbar_new_tab_page") { imageset("toolbar_stop") { sources = [ "toolbar_stop.imageset/Contents.json", - "toolbar_stop.imageset/toolbar_stop.png", "toolbar_stop.imageset/toolbar_stop@2x.png", "toolbar_stop.imageset/toolbar_stop@3x.png", ] } -imageset("toolbar_search") { - sources = [ - "toolbar_search.imageset/Contents.json", - "toolbar_search.imageset/toolbar_search.png", - "toolbar_search.imageset/toolbar_search@2x.png", - "toolbar_search.imageset/toolbar_search@3x.png", - ] -} - imageset("toolbar_bookmark_active") { sources = [ "toolbar_bookmark_active.imageset/Contents.json", @@ -72,7 +54,6 @@ imageset("toolbar_bookmark_active") { imageset("toolbar_reload") { sources = [ "toolbar_reload.imageset/Contents.json", - "toolbar_reload.imageset/toolbar_reload.png", "toolbar_reload.imageset/toolbar_reload@2x.png", "toolbar_reload.imageset/toolbar_reload@3x.png", ] @@ -81,7 +62,6 @@ imageset("toolbar_reload") { imageset("toolbar_share") { sources = [ "toolbar_share.imageset/Contents.json", - "toolbar_share.imageset/toolbar_share.png", "toolbar_share.imageset/toolbar_share@2x.png", "toolbar_share.imageset/toolbar_share@3x.png", ] @@ -90,7 +70,6 @@ imageset("toolbar_share") { imageset("toolbar_back") { sources = [ "toolbar_back.imageset/Contents.json", - "toolbar_back.imageset/toolbar_back.png", "toolbar_back.imageset/toolbar_back@2x.png", "toolbar_back.imageset/toolbar_back@3x.png", ] @@ -108,7 +87,6 @@ imageset("toolbar_switcher") { imageset("toolbar_forward") { sources = [ "toolbar_forward.imageset/Contents.json", - "toolbar_forward.imageset/toolbar_forward.png", "toolbar_forward.imageset/toolbar_forward@2x.png", "toolbar_forward.imageset/toolbar_forward@3x.png", ] 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 15cb2125cbe..c890f324a35 100644 --- a/chromium/ios/chrome/browser/ui/toolbar/keyboard_assist/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/toolbar/keyboard_assist/BUILD.gn @@ -17,6 +17,10 @@ source_set("keyboard_assist") { "toolbar_keyboard_accessory_view.mm", "toolbar_ui_bar_button_item.h", "toolbar_ui_bar_button_item.mm", + "voice_search_keyboard_accessory_button.h", + "voice_search_keyboard_accessory_button.mm", + "voice_search_keyboard_bar_button_item.h", + "voice_search_keyboard_bar_button_item.mm", ] deps = [ "resources:keyboard_accessory_qr_scanner", @@ -30,8 +34,9 @@ source_set("keyboard_assist") { "//ios/chrome/browser/ui/omnibox:omnibox_internal", "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/util/", - "//ios/chrome/common/colors", - "//ios/chrome/common/ui_util", + "//ios/chrome/browser/voice", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/util", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/voice", "//ui/base", @@ -41,3 +46,20 @@ source_set("keyboard_assist") { [ "//ios/chrome/browser/ui/omnibox:omnibox_internal" ] libs = [ "UIKit.framework" ] } + +source_set("unit_tests") { + testonly = true + sources = [ + "voice_search_keyboard_accessory_button_unittest.mm", + "voice_search_keyboard_bar_button_item_unittest.mm", + ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + ":keyboard_assist", + "//ios/chrome/browser/voice", + "//ios/chrome/browser/voice:test_support", + "//testing/gtest", + ] +} diff --git a/chromium/ios/chrome/browser/ui/toolbar/public/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/public/BUILD.gn index d776d5f5eba..773a13955f5 100644 --- a/chromium/ios/chrome/browser/ui/toolbar/public/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/toolbar/public/BUILD.gn @@ -6,7 +6,6 @@ source_set("public") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ "fakebox_focuser.h", - "omnibox_focuser.h", "side_swipe_toolbar_interacting.h", "side_swipe_toolbar_snapshot_providing.h", "toolbar_coordinating.h", @@ -21,11 +20,10 @@ source_set("public") { "//ios/chrome/browser/ui/fullscreen:ui", "//ios/chrome/browser/ui/ntp", "//ios/chrome/browser/ui/util", + "//ios/components/ui_util", "//ios/public/provider/chrome/browser/voice", ] - public_deps = [ - ":constants", - ] + public_deps = [ ":constants" ] } source_set("constants") { @@ -41,8 +39,6 @@ source_set("feature_flags") { "features.h", "features.mm", ] - deps = [ - "//base", - ] + deps = [ "//base" ] configs += [ "//build/config/compiler:enable_arc" ] } diff --git a/chromium/ios/chrome/browser/ui/toolbar_container/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar_container/BUILD.gn index b0568126755..b1dd3e7f160 100644 --- a/chromium/ios/chrome/browser/ui/toolbar_container/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/toolbar_container/BUILD.gn @@ -15,6 +15,7 @@ source_set("toolbar_container") { "//base", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/fullscreen", + "//ios/chrome/browser/ui/fullscreen:feature_flags", ] } @@ -26,15 +27,11 @@ source_set("feature_flags") { configs += [ "//build/config/compiler:enable_arc" ] - deps = [ - "//base", - ] + deps = [ "//base" ] } source_set("toolbar_collapsing") { - sources = [ - "toolbar_collapsing.h", - ] + sources = [ "toolbar_collapsing.h" ] } source_set("ui") { @@ -57,7 +54,7 @@ source_set("ui") { "//base", "//ios/chrome/browser/ui/fullscreen:ui", "//ios/chrome/browser/ui/util", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/util", ] } @@ -76,7 +73,7 @@ source_set("unit_tests") { ":ui", "//base/test:test_support", "//ios/chrome/browser/ui/util", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/util", "//testing/gtest", ] } diff --git a/chromium/ios/chrome/browser/ui/translate/BUILD.gn b/chromium/ios/chrome/browser/ui/translate/BUILD.gn index df7ffbd1614..398284ec20c 100644 --- a/chromium/ios/chrome/browser/ui/translate/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/translate/BUILD.gn @@ -11,12 +11,16 @@ source_set("legacy_translate") { "legacy_translate_infobar_mediator.mm", ] deps = [ + ":legacy_translate_constants", ":translate_ui", "//base", "//components/strings:components_strings_grit", "//components/translate/core/browser", "//ios/chrome/browser", + "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/main", "//ios/chrome/browser/translate", + "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/list_model", "//ios/chrome/browser/ui/popup_menu/public:popup_menu_ui", @@ -30,6 +34,14 @@ source_set("legacy_translate") { ] } +source_set("legacy_translate_constants") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "legacy_translate_infobar_constants.h", + "legacy_translate_infobar_constants.mm", + ] +} + source_set("translate_ui") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ @@ -48,6 +60,7 @@ source_set("translate_ui") { "translate_notification_presenter.mm", ] deps = [ + ":translate_ui_constants", "//base", "//components/strings:components_strings", "//ios/chrome/app/strings:ios_strings_grit", @@ -62,20 +75,26 @@ source_set("translate_ui") { "//ios/chrome/browser/ui/translate/resources:translate_icon", "//ios/chrome/browser/ui/translate/resources:translate_options", "//ios/chrome/browser/ui/util", - "//ios/chrome/common:common_extension", - "//ios/chrome/common/colors:colors", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/elements", + "//ios/chrome/common/ui/util", "//ios/third_party/material_components_ios", "//ui/base", ] } -source_set("unit_tests") { +source_set("translate_ui_constants") { configs += [ "//build/config/compiler:enable_arc" ] - testonly = true sources = [ - "translate_infobar_mediator_unittest.mm", + "translate_infobar_view_constants.h", + "translate_infobar_view_constants.mm", ] +} + +source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ "translate_infobar_mediator_unittest.mm" ] deps = [ ":legacy_translate", "//components/language/ios/browser", diff --git a/chromium/ios/chrome/browser/ui/translate/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/translate/cells/BUILD.gn index 2ae2c38df8c..a06322181c1 100644 --- a/chromium/ios/chrome/browser/ui/translate/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/translate/cells/BUILD.gn @@ -19,7 +19,7 @@ source_set("cells") { "//ios/chrome/browser/ui/popup_menu/public/cells", "//ios/chrome/browser/ui/table_view:styler", "//ios/chrome/browser/ui/table_view/cells", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/util", ] libs = [ "UIKit.framework" ] } diff --git a/chromium/ios/chrome/browser/ui/util/BUILD.gn b/chromium/ios/chrome/browser/ui/util/BUILD.gn index ce46e9f7b60..f0f79692e17 100644 --- a/chromium/ios/chrome/browser/ui/util/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/util/BUILD.gn @@ -64,7 +64,6 @@ source_set("util") { "pasteboard_util.mm", "property_animator_group.h", "property_animator_group.mm", - "relaxed_bounds_constraints_hittest.h", "reversed_animation.h", "reversed_animation.mm", "rtl_geometry.h", @@ -93,7 +92,8 @@ source_set("util") { "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/toolbar/public:feature_flags", "//ios/chrome/common:timing", - "//ios/chrome/common/ui_util", + "//ios/chrome/common/ui/util", + "//ios/chrome/common/ui/util:dynamic_type_util", "//ios/web:threads", "//ios/web/public/thread:thread", "//ios/web/thread", @@ -128,7 +128,6 @@ source_set("unit_tests") { sources = [ "CRUILabel+AttributeUtils_unittest.mm", "core_text_util_unittest.mm", - "dynamic_type_util_unittest.mm", "force_touch_long_press_gesture_recognizer_unittest.mm", "label_link_controller_unittest.mm", "label_observer_unittest.mm", @@ -209,9 +208,7 @@ bundle_data("terms_resources") { "//components/resources/terms/terms_zh-CN.html", "//components/resources/terms/terms_zh-TW.html", ] - outputs = [ - "{{bundle_resources_dir}}/{{source_file_part}}", - ] + outputs = [ "{{bundle_resources_dir}}/{{source_file_part}}" ] } source_set("test_support") { @@ -257,9 +254,7 @@ source_set("eg_test_support+eg2") { "//build/config/ios:xctest_config", ] testonly = true - sources = [ - "keyboard_observer_helper_app_interface.h", - ] + sources = [ "keyboard_observer_helper_app_interface.h" ] deps = [ ":util", "//ios/testing/earl_grey:eg_test_support+eg2", diff --git a/chromium/ios/chrome/browser/ui/voice/BUILD.gn b/chromium/ios/chrome/browser/ui/voice/BUILD.gn index e149b2dc37a..4a6a45c71c9 100644 --- a/chromium/ios/chrome/browser/ui/voice/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/voice/BUILD.gn @@ -34,9 +34,7 @@ source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true - sources = [ - "text_to_speech_player_unittest.mm", - ] + sources = [ "text_to_speech_player_unittest.mm" ] deps = [ ":voice", @@ -53,11 +51,7 @@ source_set("unit_tests") { bundle_data("voice_unit_tests_bundle_data") { visibility = [ ":unit_tests" ] testonly = true - sources = [ - "//ios/chrome/test/data/voice/test_sound.m4a", - ] - outputs = [ - "{{bundle_resources_dir}}/{{source_root_relative_dir}}/" + - "{{source_file_part}}", - ] + sources = [ "//ios/chrome/test/data/voice/test_sound.m4a" ] + outputs = [ "{{bundle_resources_dir}}/{{source_root_relative_dir}}/" + + "{{source_file_part}}" ] } diff --git a/chromium/ios/chrome/browser/ui/webui/BUILD.gn b/chromium/ios/chrome/browser/ui/webui/BUILD.gn index 2f4cf4220a2..c4ed0b5528a 100644 --- a/chromium/ios/chrome/browser/ui/webui/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/webui/BUILD.gn @@ -19,7 +19,6 @@ source_set("webui") { "flags_ui.h", "inspect/inspect_ui.h", "inspect/inspect_ui.mm", - "mojo_web_ui_ios_controller.h", "ntp_tiles_internals_ui.cc", "ntp_tiles_internals_ui.h", "prefs_internals_ui.cc", @@ -68,11 +67,11 @@ source_set("webui") { "//ios/chrome/browser/crash_report", "//ios/chrome/browser/favicon:favicon", "//ios/chrome/browser/flags", + "//ios/chrome/browser/main:public", "//ios/chrome/browser/metrics", "//ios/chrome/browser/ntp_tiles", "//ios/chrome/browser/passwords", "//ios/chrome/browser/suggestions", - "//ios/chrome/browser/tabs", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/ui/util:terms_util", "//ios/chrome/browser/web:java_script_console", @@ -91,6 +90,7 @@ source_set("webui_internal") { sources = [ "chrome_web_ui_ios_controller_factory.h", "chrome_web_ui_ios_controller_factory.mm", + "chrome_web_ui_provider.cc", "omaha_ui.cc", "omaha_ui.h", "signin_internals_ui_ios.cc", @@ -104,11 +104,17 @@ source_set("webui_internal") { "//ios/chrome/browser", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/omaha", + "//ios/chrome/browser/policy:feature_flags", "//ios/chrome/browser/signin", + "//ios/chrome/browser/sync", "//ios/chrome/browser/ui/webui/gcm", "//ios/chrome/browser/ui/webui/net_export", - "//ios/chrome/browser/ui/webui/sync_internals", + "//ios/chrome/browser/ui/webui/policy", "//ios/chrome/browser/ui/webui/translate_internals", + "//ios/chrome/common", + "//ios/components/webui:provider", + "//ios/components/webui:url_constants", + "//ios/components/webui/sync_internals", "//url", ] @@ -132,10 +138,12 @@ source_set("eg_tests") { "//base/test:test_support", "//components/strings", "//components/version_info", + "//ios/chrome/app/strings", "//ios/chrome/browser", "//ios/chrome/browser/ui/omnibox:omnibox_internal", "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", + "//ios/components/webui:url_constants", "//ios/testing/earl_grey:earl_grey_support", "//net:test_support", "//ui/base", @@ -159,8 +167,10 @@ source_set("eg2_tests") { "//base/test:test_support", "//components/strings", "//components/version_info", + "//ios/chrome/app/strings", "//ios/chrome/browser:chrome_url_constants", "//ios/chrome/test/earl_grey:eg_test_support+eg2", + "//ios/components/webui:url_constants", "//ios/testing/earl_grey:eg_test_support+eg2", "//ios/third_party/earl_grey2:test_lib", "//ios/web/public/test:element_selector", diff --git a/chromium/ios/chrome/browser/ui/webui/policy/BUILD.gn b/chromium/ios/chrome/browser/ui/webui/policy/BUILD.gn new file mode 100644 index 00000000000..cde2d4196b0 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/webui/policy/BUILD.gn @@ -0,0 +1,28 @@ +# Copyright 2020 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("policy") { + configs += [ "//build/config/compiler:enable_arc" ] + + sources = [ + "policy_ui.h", + "policy_ui.mm", + "policy_ui_handler.h", + "policy_ui_handler.mm", + ] + + deps = [ + "//base", + "//components/policy:generated", + "//components/policy/core/browser", + "//components/policy/core/common", + "//components/resources", + "//components/strings", + "//ios/chrome/browser:chrome_url_constants", + "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/policy", + "//ios/web/public/webui", + "//ui/base", + ] +} diff --git a/chromium/ios/chrome/browser/ui/webui/sync_internals/BUILD.gn b/chromium/ios/chrome/browser/ui/webui/sync_internals/BUILD.gn deleted file mode 100644 index 67b18a250e6..00000000000 --- a/chromium/ios/chrome/browser/ui/webui/sync_internals/BUILD.gn +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 2016 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -source_set("sync_internals") { - sources = [ - "sync_internals_message_handler.cc", - "sync_internals_message_handler.h", - "sync_internals_ui.cc", - "sync_internals_ui.h", - ] - deps = [ - "//base", - "//components/browser_sync", - "//components/resources", - "//components/sync", - "//components/sync/driver:resources", - "//ios/chrome/browser", - "//ios/chrome/browser/browser_state", - "//ios/chrome/browser/signin", - "//ios/chrome/browser/sync", - "//ios/chrome/common", - "//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 dd5c8df051f..800ebf07669 100644 --- a/chromium/ios/chrome/browser/ui/webui/translate_internals/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/webui/translate_internals/BUILD.gn @@ -17,7 +17,7 @@ source_set("translate_internals") { "//ios/chrome/app/resources:ios_resources", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", - "//ios/chrome/browser/tabs", + "//ios/chrome/browser/main:public", "//ios/chrome/browser/translate", "//ios/chrome/browser/web_state_list", "//ios/web/public/webui", |