diff options
Diffstat (limited to 'chromium/ios/chrome/browser/ui')
92 files changed, 1147 insertions, 228 deletions
diff --git a/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn b/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn index afc359de8b3..d632b9bd22c 100644 --- a/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn @@ -95,7 +95,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/activity_services/data/BUILD.gn b/chromium/ios/chrome/browser/ui/activity_services/data/BUILD.gn index 44ba4122485..bfa4656f871 100644 --- a/chromium/ios/chrome/browser/ui/activity_services/data/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/activity_services/data/BUILD.gn @@ -28,8 +28,8 @@ source_set("data") { "//ios/chrome/browser/send_tab_to_self", "//ios/chrome/browser/snapshots", "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui/util", "//ios/chrome/browser/ui/util:url_with_title", + "//ios/chrome/common/ui/util:image_util", "//ios/web/common:user_agent", "//ios/web/public", "//ios/web/public:web_state_observer", diff --git a/chromium/ios/chrome/browser/ui/authentication/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/BUILD.gn index 588aa6eab17..c5357250125 100644 --- a/chromium/ios/chrome/browser/ui/authentication/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/BUILD.gn @@ -34,7 +34,6 @@ source_set("authentication") { "//components/consent_auditor", "//components/infobars/core", "//components/prefs", - "//components/signin/ios/browser", "//components/signin/public/identity_manager", "//components/signin/public/identity_manager/objc", "//components/strings", @@ -50,6 +49,7 @@ source_set("authentication") { "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/authentication/cells", + "//ios/chrome/browser/ui/authentication/enterprise:enterprise_utils", "//ios/chrome/browser/ui/authentication/signin:signin_headers", "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/commands", @@ -157,7 +157,6 @@ source_set("unit_tests") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -198,7 +197,6 @@ source_set("eg_app_support+eg2") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -209,8 +207,8 @@ source_set("eg_test_support+eg2") { "signin_earl_grey.mm", "signin_earl_grey_app_interface.h", "signin_earl_grey_app_interface_stub.mm", - "signin_earl_grey_ui.h", - "signin_earl_grey_ui.mm", + "signin_earl_grey_ui_test_util.h", + "signin_earl_grey_ui_test_util.mm", "signin_matchers.h", "signin_matchers.mm", ] diff --git a/chromium/ios/chrome/browser/ui/authentication/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/cells/BUILD.gn index 0a2fe85bacd..4178acb228b 100644 --- a/chromium/ios/chrome/browser/ui/authentication/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/cells/BUILD.gn @@ -37,6 +37,7 @@ source_set("cells") { "//ios/chrome/browser/ui/table_view/cells:cells_constants", "//ios/chrome/common/ui/colors", "//ios/chrome/common/ui/util", + "//ios/chrome/common/ui/util:image_util", "//ios/public/provider/chrome/browser/signin:signin_resources_api", "//ui/base", ] @@ -80,6 +81,7 @@ source_set("unit_tests") { "//ios/chrome/browser/ui/table_view:styler", "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/util:image_util", "//ios/chrome/test:test_support", "//ios/public/provider/chrome/browser/signin", "//ios/public/provider/chrome/browser/signin:signin_resources_api", diff --git a/chromium/ios/chrome/browser/ui/authentication/enterprise/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/enterprise/BUILD.gn index 58bb62b8186..053d5d73400 100644 --- a/chromium/ios/chrome/browser/ui/authentication/enterprise/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/enterprise/BUILD.gn @@ -14,6 +14,7 @@ source_set("enterprise_utils") { "//components/prefs", "//components/signin/public/base", "//components/sync/base", + "//components/sync/driver", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/policy:policy_util", diff --git a/chromium/ios/chrome/browser/ui/authentication/enterprise/enterprise_signout/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/enterprise/enterprise_signout/BUILD.gn index a66e31fe78b..6cdd6d0b366 100644 --- a/chromium/ios/chrome/browser/ui/authentication/enterprise/enterprise_signout/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/enterprise/enterprise_signout/BUILD.gn @@ -11,15 +11,10 @@ source_set("enterprise_signout") { "enterprise_signout_view_controller.mm", ] deps = [ - "//components/signin/public/base", - "//components/signin/public/identity_manager/objc", "//ios/chrome/app/strings", "//ios/chrome/app/strings:ios_google_chrome_strings", - "//ios/chrome/browser/browser_state", "//ios/chrome/browser/main:public", "//ios/chrome/browser/policy/resources:enterprise_grey_icon_large", - "//ios/chrome/browser/signin", - "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/common/ui/confirmation_alert", "//ui/base", diff --git a/chromium/ios/chrome/browser/ui/authentication/signin/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/signin/BUILD.gn index bd78a0d1a46..9ca7dde9b1f 100644 --- a/chromium/ios/chrome/browser/ui/authentication/signin/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/signin/BUILD.gn @@ -80,7 +80,6 @@ source_set("unit_tests") { "//base", "//base/test:test_support", "//components/pref_registry", - "//components/signin/ios/browser:features", "//components/sync/base", "//components/sync_preferences", "//components/sync_preferences:test_support", @@ -113,7 +112,6 @@ source_set("constants") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -123,12 +121,13 @@ source_set("eg2_tests") { deps = [ "//base", "//base/test:test_support", - "//components/signin/ios/browser:features", + "//components/policy:policy_code_generate", "//components/signin/public/base", "//components/strings:components_strings_grit", "//ios/chrome/app/strings", "//ios/chrome/browser:pref_names", "//ios/chrome/browser/metrics:eg_test_support+eg2", + "//ios/chrome/browser/policy:eg_test_support+eg2", "//ios/chrome/browser/policy:policy_util", "//ios/chrome/browser/ui/authentication:eg_test_support+eg2", "//ios/chrome/browser/ui/authentication/views:views_constants", 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 index 90b923d5807..bb1228edffb 100644 --- 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 @@ -76,7 +76,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/BUILD.gn index e764698bf7d..db6f12031c6 100644 --- a/chromium/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/BUILD.gn @@ -9,6 +9,8 @@ source_set("consistency_promo_signin") { sources = [ "consistency_promo_signin_coordinator.h", "consistency_promo_signin_coordinator.mm", + "consistency_promo_signin_mediator.h", + "consistency_promo_signin_mediator.mm", ] deps = [ ":layout", @@ -43,8 +45,30 @@ source_set("layout") { deps = [ "//ui/base" ] } +source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ "consistency_promo_signin_mediator_unittest.mm" ] + deps = [ + ":consistency_promo_signin", + "//base", + "//base/test:test_support", + "//components/signin/public/identity_manager", + "//components/signin/public/identity_manager/objc", + "//components/sync_preferences:test_support", + "//ios/chrome/browser:pref_names", + "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/signin", + "//ios/chrome/browser/signin: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", + "//third_party/ocmock", + ] +} + source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -53,8 +77,9 @@ source_set("eg2_tests") { sources = [ "consistency_promo_signin_coordinator_egtest.mm" ] deps = [ "//base", + "//base/test:test_support", + "//ios/chrome/app/strings", "//ios/chrome/browser:pref_names", - "//ios/chrome/browser/metrics:eg_test_support+eg2", "//ios/chrome/browser/ui/authentication:eg_test_support+eg2", "//ios/chrome/browser/ui/authentication/signin:constants", "//ios/chrome/test/earl_grey:eg_test_support+eg2", diff --git a/chromium/ios/chrome/browser/ui/authentication/signin/forced_signin/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/signin/forced_signin/BUILD.gn index 8ebca4b0682..647717cd2c2 100644 --- a/chromium/ios/chrome/browser/ui/authentication/signin/forced_signin/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/signin/forced_signin/BUILD.gn @@ -19,8 +19,41 @@ source_set("forced_signin") { "//ios/chrome/browser/ui/first_run:screen_delegate", "//ios/chrome/browser/ui/first_run:utils", "//ios/chrome/browser/ui/first_run/signin", - "//ios/chrome/browser/ui/first_run/sync", "//ios/chrome/browser/ui/screen:screen_provider", "//ios/chrome/browser/ui/screen:screen_type", ] } + +source_set("eg2_tests") { + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + testonly = true + sources = [ "forced_signin_egtest.mm" ] + deps = [ + "//base", + "//base/test:test_support", + "//components/policy:policy_code_generate", + "//components/policy/core/common:common_constants", + "//ios/chrome/app/strings:ios_chromium_strings_grit", + "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser:pref_names", + "//ios/chrome/browser/policy:policy_util", + "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/browser/ui/authentication:eg_test_support+eg2", + "//ios/chrome/browser/ui/authentication/signin:constants", + "//ios/chrome/browser/ui/authentication/views:views_constants", + "//ios/chrome/browser/ui/first_run:constants", + "//ios/chrome/browser/ui/first_run:eg_test_support+eg2", + "//ios/chrome/browser/ui/settings/google_services:constants", + "//ios/chrome/common", + "//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", + ] + frameworks = [ "UIKit.framework" ] +} 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 index d7977073882..dec15681040 100644 --- a/chromium/ios/chrome/browser/ui/authentication/signin/user_signin/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/signin/user_signin/BUILD.gn @@ -83,6 +83,7 @@ source_set("unit_tests") { "//ios/chrome/browser/ui/authentication", "//ios/chrome/browser/ui/authentication/signin/user_signin/logging", "//ios/chrome/browser/unified_consent", + "//ios/chrome/test: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", @@ -94,7 +95,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/authentication/signin_sync/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/signin_sync/BUILD.gn new file mode 100644 index 00000000000..2a1deceb1c3 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/authentication/signin_sync/BUILD.gn @@ -0,0 +1,109 @@ +# Copyright 2021 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("signin_sync") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "signin_sync_coordinator.h", + "signin_sync_coordinator.mm", + "signin_sync_mediator.h", + "signin_sync_mediator.mm", + "signin_sync_mediator_delegate.h", + ] + deps = [ + ":signin_sync_ui", + "//base", + "//components/consent_auditor", + "//components/prefs", + "//components/unified_consent", + "//ios/chrome/app/application_delegate:app_state_header", + "//ios/chrome/app/strings", + "//ios/chrome/browser", + "//ios/chrome/browser/first_run", + "//ios/chrome/browser/main:public", + "//ios/chrome/browser/policy", + "//ios/chrome/browser/policy:policy_util", + "//ios/chrome/browser/signin", + "//ios/chrome/browser/sync", + "//ios/chrome/browser/ui/authentication", + "//ios/chrome/browser/ui/authentication/enterprise:enterprise_utils", + "//ios/chrome/browser/ui/authentication/enterprise/user_policy_signout", + "//ios/chrome/browser/ui/authentication/signin:signin_headers", + "//ios/chrome/browser/ui/authentication/signin/user_signin/logging", + "//ios/chrome/browser/ui/authentication/unified_consent/identity_chooser", + "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/first_run:field_trial", + "//ios/chrome/browser/ui/first_run:interruptible_chrome_coordinator", + "//ios/chrome/browser/ui/first_run:screen_delegate", + "//ios/chrome/browser/ui/first_run:utils", + "//ios/chrome/browser/ui/main:scene_state_header", + "//ios/chrome/browser/unified_consent", + "//ios/chrome/browser/url_loading", + "//ios/public/provider/chrome/browser", + "//ios/public/provider/chrome/browser/signin", + ] +} + +source_set("signin_sync_ui") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "signin_sync_consumer.h", + "signin_sync_view_controller.h", + "signin_sync_view_controller.mm", + "signin_sync_view_controller_delegate.h", + ] + deps = [ + "//ios/chrome/app/strings", + "//ios/chrome/browser/ui/authentication", + "//ios/chrome/browser/ui/authentication:authentication_constants", + "//ios/chrome/browser/ui/authentication/enterprise:enterprise_utils", + "//ios/chrome/browser/ui/authentication/views", + "//ios/chrome/browser/ui/elements:elements_internal", + "//ios/chrome/browser/ui/first_run:field_trial", + "//ios/chrome/browser/ui/settings/elements:constants", + "//ios/chrome/browser/ui/settings/elements:enterprise_info_popover_view_controller", + "//ios/chrome/common", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/elements:popover_label_view_controller", + "//ios/chrome/common/ui/promo_style", + "//ios/chrome/common/ui/util", + "//ui/base", + ] +} + +source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ "signin_sync_mediator_unittest.mm" ] + deps = [ + ":signin_sync", + ":signin_sync_ui", + "//base", + "//base/test:test_support", + "//components/consent_auditor", + "//components/consent_auditor:test_support", + "//components/prefs", + "//components/signin/public/identity_manager", + "//components/sync/driver", + "//components/sync/driver:test_support", + "//components/unified_consent", + "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/main: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/authentication", + "//ios/chrome/browser/unified_consent", + "//ios/chrome/browser/web_state_list", + "//ios/chrome/test:test_support", + "//ios/public/provider/chrome/browser:test_support", + "//ios/public/provider/chrome/browser/signin:fake_chrome_identity", + "//ios/public/provider/chrome/browser/signin:test_support", + "//ios/web/public/test", + "//third_party/ocmock", + ] +} 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 15646db3d3d..c34102539f0 100644 --- a/chromium/ios/chrome/browser/ui/authentication/unified_consent/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/unified_consent/BUILD.gn @@ -21,6 +21,7 @@ source_set("unified_consent") { "//ios/chrome/browser/signin", "//ios/chrome/browser/ui/authentication/enterprise:enterprise_utils", "//ios/chrome/browser/ui/authentication/unified_consent/identity_chooser", + "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/public/provider/chrome/browser/signin", ] diff --git a/chromium/ios/chrome/browser/ui/autofill/BUILD.gn b/chromium/ios/chrome/browser/ui/autofill/BUILD.gn index 5e657d22458..e81fef5970e 100644 --- a/chromium/ios/chrome/browser/ui/autofill/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/autofill/BUILD.gn @@ -156,7 +156,6 @@ source_set("autofill_metrics") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -191,7 +190,6 @@ source_set("eg2_tests") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -223,7 +221,6 @@ source_set("eg_app_support+eg2") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", 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 ac9c62e4a5b..093950b61d2 100644 --- a/chromium/ios/chrome/browser/ui/autofill/manual_fill/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/autofill/manual_fill/BUILD.gn @@ -118,6 +118,7 @@ source_set("manual_fill_ui") { ] deps = [ "//base", + "//components/password_manager/core/common", "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser", "//ios/chrome/browser/autofill/manual_fill:manual_fill", @@ -125,6 +126,7 @@ source_set("manual_fill_ui") { "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/autofill/manual_fill/resources:mf_keyboard", "//ios/chrome/browser/ui/list_model:list_model", + "//ios/chrome/browser/ui/resources:password_key", "//ios/chrome/browser/ui/table_view:styler", "//ios/chrome/browser/ui/table_view:table_view", "//ios/chrome/common/ui/favicon", @@ -211,7 +213,6 @@ source_set("requesters") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/badges/BUILD.gn b/chromium/ios/chrome/browser/ui/badges/BUILD.gn index 30e14aad71f..883838bed27 100644 --- a/chromium/ios/chrome/browser/ui/badges/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/badges/BUILD.gn @@ -52,6 +52,7 @@ source_set("badges") { "resources:incognito_small_badge", "resources:wrench_badge", "//base", + "//components/password_manager/core/common", "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/browser_state", @@ -73,6 +74,7 @@ source_set("badges") { "//ios/chrome/browser/ui/infobars/resources:infobar_settings_icon", "//ios/chrome/browser/ui/infobars/resources:infobar_translate_icon", "//ios/chrome/browser/ui/list_model", + "//ios/chrome/browser/ui/resources:legacy_password_key", "//ios/chrome/browser/ui/resources:password_key", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web", @@ -97,6 +99,7 @@ source_set("badges_popup_menu") { ":badges", ":public", "//base", + "//components/password_manager/core/common", "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser/infobars", "//ios/chrome/browser/infobars:public", @@ -109,6 +112,8 @@ source_set("badges_popup_menu") { "//ios/chrome/browser/ui/list_model", "//ios/chrome/browser/ui/popup_menu/public:popup_menu_ui", "//ios/chrome/browser/ui/popup_menu/public/cells", + "//ios/chrome/browser/ui/resources:legacy_password_key", + "//ios/chrome/browser/ui/resources:password_key", "//ios/chrome/browser/ui/table_view:styler", "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/browser/ui/util", diff --git a/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn index e6df126b776..94a2fa33612 100644 --- a/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn @@ -66,6 +66,7 @@ source_set("bookmarks") { "//ios/chrome/browser/ui/authentication", "//ios/chrome/browser/ui/authentication:signin_presenter", "//ios/chrome/browser/ui/authentication/cells", + "//ios/chrome/browser/ui/authentication/enterprise:enterprise_utils", "//ios/chrome/browser/ui/bookmarks/cells", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/default_promo:utils", @@ -241,7 +242,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -282,7 +282,6 @@ source_set("eg2_tests") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -319,7 +318,6 @@ source_set("eg_app_support+eg2") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -329,6 +327,7 @@ source_set("eg_test_support+eg2") { "bookmark_earl_grey.h", "bookmark_earl_grey.mm", "bookmark_earl_grey_app_interface.h", + "bookmark_earl_grey_app_interface_stub.mm", "bookmark_earl_grey_ui.h", "bookmark_earl_grey_ui.mm", ] diff --git a/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn b/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn index 4a13fd794d8..a5d0f3abfcf 100644 --- a/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn @@ -27,12 +27,10 @@ source_set("browser_view") { "//components/omnibox/browser", "//components/profile_metrics", "//components/reading_list/core", - "//components/search_engines", "//components/sessions", "//components/signin/core/browser", "//components/signin/ios/browser", "//components/signin/ios/browser:active_state_manager", - "//components/signin/public/identity_manager", "//components/strings", "//components/translate/core/browser", "//components/ukm/ios:ukm_url_recorder", @@ -51,7 +49,6 @@ source_set("browser_view") { "//ios/chrome/browser/favicon", "//ios/chrome/browser/feature_engagement", "//ios/chrome/browser/find_in_page", - "//ios/chrome/browser/first_run", "//ios/chrome/browser/geolocation", "//ios/chrome/browser/infobars", "//ios/chrome/browser/language", @@ -66,11 +63,9 @@ source_set("browser_view") { "//ios/chrome/browser/overlays/public/web_content_area", "//ios/chrome/browser/overscroll_actions", "//ios/chrome/browser/passwords", - "//ios/chrome/browser/policy:policy_util", "//ios/chrome/browser/prefs", "//ios/chrome/browser/prerender", "//ios/chrome/browser/reading_list", - "//ios/chrome/browser/search_engines", "//ios/chrome/browser/send_tab_to_self", "//ios/chrome/browser/sessions", "//ios/chrome/browser/sessions:restoration_agent", @@ -100,6 +95,7 @@ source_set("browser_view") { "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/content_suggestions", "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant", + "//ios/chrome/browser/ui/content_suggestions:feature_flags", "//ios/chrome/browser/ui/context_menu", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/default_promo", @@ -116,7 +112,6 @@ source_set("browser_view") { "//ios/chrome/browser/ui/fullscreen:ui", "//ios/chrome/browser/ui/gestures", "//ios/chrome/browser/ui/history", - "//ios/chrome/browser/ui/image_util:web", "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_commands", "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_scene_agent", "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_ui", @@ -127,7 +122,6 @@ source_set("browser_view") { "//ios/chrome/browser/ui/main:scene_state_header", "//ios/chrome/browser/ui/main_content:main_content_ui", "//ios/chrome/browser/ui/main_content:main_content_ui_broadcasting_util", - "//ios/chrome/browser/ui/menu", "//ios/chrome/browser/ui/ntp", "//ios/chrome/browser/ui/ntp:coordinator", "//ios/chrome/browser/ui/ntp:logo", @@ -157,8 +151,10 @@ source_set("browser_view") { "//ios/chrome/browser/ui/snackbar", "//ios/chrome/browser/ui/tab_switcher/tab_strip", "//ios/chrome/browser/ui/tabs", + "//ios/chrome/browser/ui/tabs:constants", "//ios/chrome/browser/ui/tabs:coordinator", "//ios/chrome/browser/ui/tabs/requirements", + "//ios/chrome/browser/ui/text_fragments", "//ios/chrome/browser/ui/text_zoom", "//ios/chrome/browser/ui/text_zoom:text_zoom_ui", "//ios/chrome/browser/ui/thumb_strip", @@ -179,18 +175,16 @@ source_set("browser_view") { "//ios/chrome/browser/url_loading", "//ios/chrome/browser/voice:voice", "//ios/chrome/browser/web", + "//ios/chrome/browser/web:delegate", "//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/font_size", - "//ios/chrome/browser/web/image_fetch", "//ios/chrome/browser/web/print", "//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/browser/window_activities", "//ios/chrome/common", "//ios/chrome/common/ui/colors", "//ios/chrome/common/ui/promo_style", @@ -205,7 +199,6 @@ source_set("browser_view") { "//ios/third_party/material_components_ios", "//ios/third_party/webkit", "//ios/web", - "//ios/web/common", "//ios/web/public", "//ios/web/public/deprecated", "//ios/web/public/deprecated:deprecated_web_util", @@ -273,7 +266,9 @@ source_set("unit_tests") { "//ios/chrome/browser/ui/util", "//ios/chrome/browser/url_loading:url_loading", "//ios/chrome/browser/web", + "//ios/chrome/browser/web:delegate", "//ios/chrome/browser/web_state_list", + "//ios/chrome/browser/web_state_list:agents", "//ios/chrome/browser/web_state_list:test_support", "//ios/chrome/browser/web_state_list/web_usage_enabler", "//ios/chrome/common/ui/reauthentication:reauthentication", @@ -296,7 +291,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/commerce/BUILD.gn b/chromium/ios/chrome/browser/ui/commerce/BUILD.gn index c7544fb550a..8e3917f48cb 100644 --- a/chromium/ios/chrome/browser/ui/commerce/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/commerce/BUILD.gn @@ -16,11 +16,13 @@ source_set("price_card") { ] deps = [ "price_card/resources:colors", + "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser/commerce:commerce", "//ios/chrome/browser/web:tab_id_tab_helper", "//ios/chrome/browser/web_state_list:web_state_list", "//ios/chrome/common/ui/colors", "//ios/web", + "//ui/base:base", ] configs += [ "//build/config/compiler:enable_arc" ] } diff --git a/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn b/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn index 5c9ac4955c5..f679ab8ddf3 100644 --- a/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn @@ -20,7 +20,6 @@ source_set("content_suggestions") { "ntp_home_mediator.mm", "ntp_home_metrics.h", "ntp_home_metrics.mm", - "theme_change_delegate.h", ] deps = [ ":constants", @@ -29,7 +28,6 @@ source_set("content_suggestions") { "//base", "//components/favicon/core", "//components/favicon/ios", - "//components/feature_engagement/public", "//components/feed/core/shared_prefs:feed_shared_prefs", "//components/feed/core/v2/public/ios:feed_ios_public", "//components/ntp_snippets", @@ -48,10 +46,8 @@ source_set("content_suggestions") { "//ios/chrome/app/strings", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", - "//ios/chrome/browser/discover_feed", "//ios/chrome/browser/drag_and_drop", "//ios/chrome/browser/favicon", - "//ios/chrome/browser/feature_engagement", "//ios/chrome/browser/main:public", "//ios/chrome/browser/metrics:metrics_internal", "//ios/chrome/browser/ntp", @@ -96,7 +92,6 @@ source_set("content_suggestions") { "//ios/chrome/common/ui/favicon", "//ios/chrome/common/ui/util", "//ios/public/provider/chrome/browser", - "//ios/public/provider/chrome/browser/discover_feed", "//ui/base", "//ui/strings", ] @@ -138,10 +133,7 @@ source_set("content_suggestions_ui") { "content_suggestions_view_controller.h", "content_suggestions_view_controller.mm", "content_suggestions_view_controller_audience.h", - "discover_feed_header_changing.h", - "discover_feed_menu_commands.h", "ntp_home_consumer.h", - "theme_change_delegate.h", "user_account_image_update_delegate.h", ] deps = [ @@ -159,7 +151,6 @@ source_set("content_suggestions_ui") { "//ios/chrome/browser", "//ios/chrome/browser/ntp", "//ios/chrome/browser/ui:feature_flags", - "//ios/chrome/browser/ui/bubble", "//ios/chrome/browser/ui/collection_view", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/content_suggestions/cells", @@ -180,7 +171,6 @@ source_set("content_suggestions_ui") { "//ios/chrome/common/ui/favicon", "//ios/chrome/common/ui/util", "//ios/public/provider/chrome/browser", - "//ios/public/provider/chrome/browser/discover_feed", "//ios/web/common", "//ui/base", ] @@ -294,7 +284,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -319,6 +308,7 @@ source_set("eg2_tests") { "//ios/chrome/browser:utils", "//ios/chrome/browser/ui/ntp:constants", "//ios/chrome/browser/ui/ntp:feature_flags", + "//ios/chrome/browser/ui/popup_menu:constants", "//ios/chrome/browser/ui/settings:constants", "//ios/chrome/browser/ui/start_surface:feature_flags", "//ios/chrome/browser/ui/toolbar/public:constants", @@ -334,14 +324,16 @@ source_set("eg2_tests") { } 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 = [ "new_tab_page_app_interface.h" ] + sources = [ + "new_tab_page_app_interface.h", + "new_tab_page_app_interface_stub.mm", + ] deps = [ "//ios/third_party/earl_grey2:test_lib" ] } @@ -352,7 +344,6 @@ source_set("eg_app_support+eg2") { "//build/config/ios:xctest_config", ] testonly = true - defines = [ "CHROME_EARL_GREY_2" ] sources = [ "new_tab_page_app_interface.h", 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 b6d0a04c2bc..a06f0a04c0f 100644 --- a/chromium/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn @@ -31,8 +31,6 @@ source_set("cells") { source_set("cells_ui") { sources = [ - "content_suggestions_discover_header_item.h", - "content_suggestions_discover_header_item.mm", "content_suggestions_header_item.h", "content_suggestions_header_item.mm", "content_suggestions_most_visited_action_cell.h", diff --git a/chromium/ios/chrome/browser/ui/context_menu/BUILD.gn b/chromium/ios/chrome/browser/ui/context_menu/BUILD.gn index ec9bafcd62e..0a6036b28bc 100644 --- a/chromium/ios/chrome/browser/ui/context_menu/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/context_menu/BUILD.gn @@ -13,6 +13,7 @@ source_set("context_menu") { "//base", "//components/search_engines", "//ios/chrome/app/strings", + "//ios/chrome/browser:pref_names", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/favicon", "//ios/chrome/browser/policy:policy_util", @@ -20,9 +21,11 @@ source_set("context_menu") { "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/context_menu/link_preview", "//ios/chrome/browser/ui/image_util:web", "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_commands", "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_scene_agent", + "//ios/chrome/browser/ui/lens:lens_availability", "//ios/chrome/browser/ui/main:scene_state_header", "//ios/chrome/browser/ui/menu", "//ios/chrome/browser/ui/util", @@ -81,7 +84,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/default_promo/BUILD.gn b/chromium/ios/chrome/browser/ui/default_promo/BUILD.gn index 15725fdcd46..ef91569edc1 100644 --- a/chromium/ios/chrome/browser/ui/default_promo/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/default_promo/BUILD.gn @@ -122,7 +122,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/dialogs/BUILD.gn b/chromium/ios/chrome/browser/ui/dialogs/BUILD.gn index a36102e8826..cfc172cdfd0 100644 --- a/chromium/ios/chrome/browser/ui/dialogs/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/dialogs/BUILD.gn @@ -102,7 +102,6 @@ source_set("unit_tests_internal") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/download/BUILD.gn b/chromium/ios/chrome/browser/ui/download/BUILD.gn index 7e054041c69..b1f5061f229 100644 --- a/chromium/ios/chrome/browser/ui/download/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/download/BUILD.gn @@ -25,6 +25,8 @@ source_set("download") { "pass_kit_coordinator.mm", "radial_progress_view.h", "radial_progress_view.mm", + "vcard_coordinator.h", + "vcard_coordinator.mm", ] deps = [ "resources:background_compact", @@ -82,6 +84,7 @@ source_set("unit_tests") { "download_manager_view_controller_unittest.mm", "mobileconfig_coordinator_unittest.mm", "pass_kit_coordinator_unittest.mm", + "vcard_coordinator_unittest.mm", ] deps = [ ":download", @@ -120,7 +123,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/elements/BUILD.gn b/chromium/ios/chrome/browser/ui/elements/BUILD.gn index 1a36c2220bc..b1bc5a49f98 100644 --- a/chromium/ios/chrome/browser/ui/elements/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/elements/BUILD.gn @@ -15,6 +15,8 @@ source_set("elements") { "gray_highlight_button.mm", "home_waiting_view.h", "home_waiting_view.mm", + "instruction_view.h", + "instruction_view.mm", "selector_picker_presentation_controller.h", "selector_picker_presentation_controller.mm", "selector_picker_view_controller.h", @@ -32,14 +34,17 @@ source_set("elements") { "windowed_container_view.mm", ] deps = [ + ":instruction_view_constants", "//base", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/material_components", "//ios/chrome/browser/ui/util", + "//ios/chrome/common", "//ios/chrome/common/ui/colors", "//ios/chrome/common/ui/favicon", "//ios/chrome/common/ui/util", + "//ios/chrome/common/ui/util:dynamic_type_util", ] } @@ -59,6 +64,14 @@ source_set("selector_coordinator") { ] } +source_set("instruction_view_constants") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "instruction_view_constants.h", + "instruction_view_constants.mm", + ] +} + source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true diff --git a/chromium/ios/chrome/browser/ui/find_bar/BUILD.gn b/chromium/ios/chrome/browser/ui/find_bar/BUILD.gn index 661b0fd0c4a..f984bdf552c 100644 --- a/chromium/ios/chrome/browser/ui/find_bar/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/find_bar/BUILD.gn @@ -56,7 +56,6 @@ source_set("constants") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -82,7 +81,6 @@ source_set("eg2_tests") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -96,11 +94,14 @@ source_set("eg_app_support+eg2") { } 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 = [ "find_in_page_controller_app_interface.h" ] + sources = [ + "find_in_page_controller_app_interface.h", + "find_in_page_controller_app_interface_stub.mm", + ] + deps = [ "//ios/third_party/earl_grey2:test_lib" ] } diff --git a/chromium/ios/chrome/browser/ui/first_run/BUILD.gn b/chromium/ios/chrome/browser/ui/first_run/BUILD.gn index ff8c5e97fe7..6c0e989a938 100644 --- a/chromium/ios/chrome/browser/ui/first_run/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/first_run/BUILD.gn @@ -5,8 +5,6 @@ source_set("field_trial") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ - "default_browser_promo_field_trial.cc", - "default_browser_promo_field_trial.h", "fre_field_trial.cc", "fre_field_trial.h", "ios_first_run_field_trials.cc", @@ -28,11 +26,6 @@ source_set("first_run") { sources = [ "first_run_coordinator.h", "first_run_coordinator.mm", - "location_permissions_commands.h", - "location_permissions_coordinator.h", - "location_permissions_coordinator.mm", - "location_permissions_view_controller.h", - "location_permissions_view_controller.mm", "orientation_limiting_navigation_controller.h", "orientation_limiting_navigation_controller.mm", "welcome_to_chrome_view.h", @@ -49,7 +42,6 @@ source_set("first_run") { ":utils", "resources:checkbox", "resources:checkbox_checked", - "resources:first_run_location_permissions", "resources:read_more_arrow", "//base", "//base:i18n", @@ -72,6 +64,7 @@ source_set("first_run") { "//ios/chrome/browser/ui/authentication/signin", "//ios/chrome/browser/ui/authentication/signin/add_account_signin", "//ios/chrome/browser/ui/authentication/signin/user_signin/logging", + "//ios/chrome/browser/ui/authentication/signin_sync", "//ios/chrome/browser/ui/authentication/unified_consent/identity_chooser", "//ios/chrome/browser/ui/authentication/views", "//ios/chrome/browser/ui/commands", @@ -173,6 +166,20 @@ source_set("static_file_ui") { ] } +source_set("interruptible_chrome_coordinator") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "interruptible_chrome_coordinator.h", + "interruptible_chrome_coordinator.mm", + ] + deps = [ + "//base", + "//ios/chrome/browser/ui/authentication/signin:constants", + "//ios/chrome/browser/ui/coordinators:chrome_coordinators", + ] + frameworks = [ "UIKit.framework" ] +} + source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true @@ -201,7 +208,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -216,13 +222,17 @@ source_set("eg2_tests") { ":eg_test_support+eg2", "//base", "//base/test:test_support", + "//components/policy:policy_code_generate", "//components/policy/core/common:common_constants", "//ios/chrome/app/strings:ios_chromium_strings_grit", "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser/policy:eg_test_support+eg2", "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/browser/ui/authentication:authentication_constants", "//ios/chrome/browser/ui/authentication:eg_test_support+eg2", "//ios/chrome/browser/ui/authentication/signin:constants", "//ios/chrome/browser/ui/authentication/views:views_constants", + "//ios/chrome/browser/ui/elements:instruction_view_constants", "//ios/chrome/browser/ui/settings/google_services:constants", "//ios/chrome/common", "//ios/chrome/test/earl_grey:eg_test_support+eg2", @@ -236,7 +246,6 @@ source_set("eg2_tests") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -263,7 +272,6 @@ source_set("eg_app_support+eg2") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/first_run/default_browser/BUILD.gn b/chromium/ios/chrome/browser/ui/first_run/default_browser/BUILD.gn index 865388f3076..6c319814b6a 100644 --- a/chromium/ios/chrome/browser/ui/first_run/default_browser/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/first_run/default_browser/BUILD.gn @@ -24,20 +24,14 @@ source_set("default_browser_ui") { sources = [ "default_browser_screen_view_controller.h", "default_browser_screen_view_controller.mm", - "instruction_view.h", - "instruction_view.mm", ] deps = [ "//ios/chrome/app/strings", "//ios/chrome/browser/ui/elements", "//ios/chrome/browser/ui/first_run:constants", "//ios/chrome/browser/ui/first_run/resources:default_browser_screen_banner", - "//ios/chrome/browser/ui/table_view/cells:cells_constants", - "//ios/chrome/common", "//ios/chrome/common/ui/colors", "//ios/chrome/common/ui/promo_style", - "//ios/chrome/common/ui/util", - "//ios/chrome/common/ui/util:dynamic_type_util", "//ui/base", ] frameworks = [ "UIKit.framework" ] diff --git a/chromium/ios/chrome/browser/ui/first_run/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/first_run/resources/BUILD.gn index b5c7f6f9c6b..f59ad2001df 100644 --- a/chromium/ios/chrome/browser/ui/first_run/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/first_run/resources/BUILD.gn @@ -36,16 +36,6 @@ imageset("default_browser_screen_banner") { ] } -imageset("first_run_location_permissions") { - sources = [ - "first_run_location_permissions.imageset/Contents.json", - "first_run_location_permissions.imageset/first_run_location_permissions_dark@2x.png", - "first_run_location_permissions.imageset/first_run_location_permissions_dark@3x.png", - "first_run_location_permissions.imageset/first_run_location_permissions_light@2x.png", - "first_run_location_permissions.imageset/first_run_location_permissions_light@3x.png", - ] -} - imageset("signin_screen_banner") { sources = [ "signin_screen_banner.imageset/Contents.json", diff --git a/chromium/ios/chrome/browser/ui/first_run/signin/BUILD.gn b/chromium/ios/chrome/browser/ui/first_run/signin/BUILD.gn index 6a31abb127d..7f6914e1bb8 100644 --- a/chromium/ios/chrome/browser/ui/first_run/signin/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/first_run/signin/BUILD.gn @@ -13,6 +13,7 @@ source_set("signin") { deps = [ ":signin_ui", "//components/prefs", + "//ios/chrome/app/application_delegate:app_state_header", "//ios/chrome/browser", "//ios/chrome/browser/first_run", "//ios/chrome/browser/main:public", @@ -25,8 +26,10 @@ source_set("signin") { "//ios/chrome/browser/ui/authentication/signin/user_signin/logging", "//ios/chrome/browser/ui/authentication/unified_consent/identity_chooser", "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/first_run:interruptible_chrome_coordinator", "//ios/chrome/browser/ui/first_run:screen_delegate", "//ios/chrome/browser/ui/first_run:utils", + "//ios/chrome/browser/ui/main:scene_state_header", "//ios/chrome/browser/unified_consent", "//ios/chrome/browser/url_loading", "//ios/public/provider/chrome/browser", diff --git a/chromium/ios/chrome/browser/ui/first_run/sync/BUILD.gn b/chromium/ios/chrome/browser/ui/first_run/sync/BUILD.gn index e351249512c..24f2ac311ab 100644 --- a/chromium/ios/chrome/browser/ui/first_run/sync/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/first_run/sync/BUILD.gn @@ -16,6 +16,7 @@ source_set("sync") { "//base:base", "//components/consent_auditor", "//components/unified_consent", + "//ios/chrome/app/application_delegate:app_state_header", "//ios/chrome/app/strings", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/first_run", @@ -26,9 +27,12 @@ source_set("sync") { "//ios/chrome/browser/ui/authentication", "//ios/chrome/browser/ui/authentication/enterprise:enterprise_utils", "//ios/chrome/browser/ui/authentication/enterprise/user_policy_signout", + "//ios/chrome/browser/ui/authentication/signin:signin_headers", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", + "//ios/chrome/browser/ui/first_run:interruptible_chrome_coordinator", "//ios/chrome/browser/ui/first_run:screen_delegate", + "//ios/chrome/browser/ui/main:scene_state_header", "//ios/chrome/browser/unified_consent", "//ios/public/provider/chrome/browser/signin", ] @@ -77,6 +81,7 @@ source_set("unit_tests") { "//components/prefs", "//components/sync/driver:test_support", "//components/unified_consent", + "//ios/chrome/app/application_delegate:app_state_header", "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/main:test_support", "//ios/chrome/browser/policy", @@ -86,6 +91,7 @@ source_set("unit_tests") { "//ios/chrome/browser/sync:test_support", "//ios/chrome/browser/ui/authentication", "//ios/chrome/browser/ui/first_run:screen_delegate", + "//ios/chrome/browser/ui/main:scene_state_header", "//ios/chrome/browser/unified_consent", "//ios/public/provider/chrome/browser:test_support", "//ios/public/provider/chrome/browser/signin:fake_chrome_identity", diff --git a/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn b/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn index 83cbb993a0e..1a001d43d26 100644 --- a/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn @@ -166,7 +166,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/fullscreen/test/BUILD.gn b/chromium/ios/chrome/browser/ui/fullscreen/test/BUILD.gn index a55425b0012..f8f006c10f2 100644 --- a/chromium/ios/chrome/browser/ui/fullscreen/test/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/fullscreen/test/BUILD.gn @@ -30,7 +30,6 @@ source_set("test") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ @@ -49,7 +48,6 @@ source_set("eg_app_support+eg2") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/history/BUILD.gn b/chromium/ios/chrome/browser/ui/history/BUILD.gn index cd641615a1e..869dc156976 100644 --- a/chromium/ios/chrome/browser/ui/history/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/history/BUILD.gn @@ -152,7 +152,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/infobars/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/BUILD.gn index 9acfdc7ec9c..d8c8aaee6b4 100644 --- a/chromium/ios/chrome/browser/ui/infobars/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/infobars/BUILD.gn @@ -15,7 +15,6 @@ source_set("constants") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -68,7 +67,6 @@ source_set("test_support") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -93,11 +91,14 @@ source_set("eg_app_support+eg2") { } 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 = [ "infobar_manager_app_interface.h" ] + sources = [ + "infobar_manager_app_interface.h", + "infobar_manager_app_interface_stub.mm", + ] + deps = [ "//ios/third_party/earl_grey2:test_lib" ] } diff --git a/chromium/ios/chrome/browser/ui/integration_tests/BUILD.gn b/chromium/ios/chrome/browser/ui/integration_tests/BUILD.gn index dbc1536d747..101d70f878a 100644 --- a/chromium/ios/chrome/browser/ui/integration_tests/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/integration_tests/BUILD.gn @@ -3,7 +3,6 @@ # found in the LICENSE file. source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/keyboard/BUILD.gn b/chromium/ios/chrome/browser/ui/keyboard/BUILD.gn index c94642eed6d..fbb7d892ac5 100644 --- a/chromium/ios/chrome/browser/ui/keyboard/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/keyboard/BUILD.gn @@ -27,7 +27,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/lens/BUILD.gn b/chromium/ios/chrome/browser/ui/lens/BUILD.gn new file mode 100644 index 00000000000..66ba7672c0b --- /dev/null +++ b/chromium/ios/chrome/browser/ui/lens/BUILD.gn @@ -0,0 +1,12 @@ +# Copyright 2021 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("lens_availability") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "lens_availability.h", + "lens_availability.mm", + ] + deps = [] +} diff --git a/chromium/ios/chrome/browser/ui/link_to_text/BUILD.gn b/chromium/ios/chrome/browser/ui/link_to_text/BUILD.gn index a02812d0d38..0297f2aa1f3 100644 --- a/chromium/ios/chrome/browser/ui/link_to_text/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/link_to_text/BUILD.gn @@ -41,7 +41,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/main/BUILD.gn b/chromium/ios/chrome/browser/ui/main/BUILD.gn index 681d56957a5..1f0d2883303 100644 --- a/chromium/ios/chrome/browser/ui/main/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/main/BUILD.gn @@ -124,7 +124,6 @@ source_set("scene") { "//components/prefs", "//components/prefs/ios", "//components/previous_session_info", - "//components/signin/ios/browser:features", "//components/signin/public/base", "//components/signin/public/identity_manager", "//components/signin/public/identity_manager/objc", @@ -269,6 +268,7 @@ source_set("main") { "//ios/chrome/browser/ui/recent_tabs", "//ios/chrome/browser/ui/settings/sync", "//ios/chrome/browser/ui/snackbar", + "//ios/chrome/browser/ui/tabs:constants", "//ios/chrome/browser/ui/thumb_strip", "//ios/chrome/browser/ui/thumb_strip:feature_flags", "//ios/chrome/browser/ui/thumb_strip:public", @@ -277,6 +277,7 @@ source_set("main") { "//ios/chrome/browser/web:tab_helper_delegates", "//ios/chrome/browser/web:web_internal", "//ios/chrome/browser/web_state_list", + "//ios/chrome/common/ui/colors", "//ios/public/provider/chrome/browser", "//net", ] diff --git a/chromium/ios/chrome/browser/ui/menu/BUILD.gn b/chromium/ios/chrome/browser/ui/menu/BUILD.gn index 9a811be5b49..d6def306ced 100644 --- a/chromium/ios/chrome/browser/ui/menu/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/menu/BUILD.gn @@ -21,6 +21,7 @@ source_set("menu") { "resources:delete", "resources:download", "resources:edit", + "resources:hide_preview", "resources:lens_icon", "resources:mark_read", "resources:move_folder", @@ -35,8 +36,12 @@ source_set("menu") { "resources:search_image", "resources:select", "resources:share", + "resources:show_preview", "//base", + "//components/prefs", "//ios/chrome/app/strings", + "//ios/chrome/browser:pref_names", + "//ios/chrome/browser/browser_state", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_scene_agent", diff --git a/chromium/ios/chrome/browser/ui/menu/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/menu/resources/BUILD.gn index 1e1ab6da3ef..dcba3b4e3ec 100644 --- a/chromium/ios/chrome/browser/ui/menu/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/menu/resources/BUILD.gn @@ -60,6 +60,14 @@ imageset("edit") { ] } +imageset("hide_preview") { + sources = [ + "hide_preview.imageset/Contents.json", + "hide_preview.imageset/hide_preview@2x.png", + "hide_preview.imageset/hide_preview@3x.png", + ] +} + imageset("lens_icon") { sources = [ "lens_icon.imageset/Contents.json", @@ -132,6 +140,14 @@ imageset("share") { ] } +imageset("show_preview") { + sources = [ + "show_preview.imageset/Contents.json", + "show_preview.imageset/show_preview@2x.png", + "show_preview.imageset/show_preview@3x.png", + ] +} + imageset("move_folder") { sources = [ "move_folder.imageset/Contents.json", diff --git a/chromium/ios/chrome/browser/ui/ntp/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp/BUILD.gn index 4b8f16337f4..0a93ce8f98f 100644 --- a/chromium/ios/chrome/browser/ui/ntp/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/ntp/BUILD.gn @@ -57,12 +57,14 @@ source_set("coordinator") { "//components/prefs/ios", "//components/search_engines", "//ios/chrome/app:tests_hook", + "//ios/chrome/app/strings", "//ios/chrome/browser:pref_names", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/discover_feed", "//ios/chrome/browser/main:public", "//ios/chrome/browser/search_engines", "//ios/chrome/browser/signin", + "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/content_suggestions", "//ios/chrome/browser/ui/content_suggestions:content_suggestions_ui", @@ -73,6 +75,7 @@ source_set("coordinator") { "//ios/chrome/browser/ui/main:scene_state_observer", "//ios/chrome/browser/ui/overscroll_actions", "//ios/chrome/browser/ui/settings/utils", + "//ios/chrome/browser/ui/util", "//ios/chrome/browser/url_loading", "//ios/chrome/browser/voice", "//ios/chrome/browser/web_state_list", @@ -80,6 +83,7 @@ source_set("coordinator") { "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/discover_feed", "//ios/web/public", + "//ui/base", ] } @@ -101,6 +105,9 @@ source_set("ntp_internal") { sources = [ "discover_feed_wrapper_view_controller.h", "discover_feed_wrapper_view_controller.mm", + "feed_header_view_controller.h", + "feed_header_view_controller.mm", + "feed_menu_commands.h", "incognito_view.h", "incognito_view.mm", "incognito_view_controller.h", @@ -158,6 +165,7 @@ source_set("ntp_internal") { "//ios/chrome/browser/tabs", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/bookmarks", + "//ios/chrome/browser/ui/bubble", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant", "//ios/chrome/browser/ui/content_suggestions:content_suggestions_ui", @@ -181,6 +189,7 @@ source_set("ntp_internal") { "//ios/chrome/common/ui/util", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/branded_images:branded_images_api", + "//ios/public/provider/chrome/browser/discover_feed", "//ios/third_party/material_components_ios", "//ios/web", "//net", @@ -252,7 +261,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn index 4ae942b651c..d8e18da3565 100644 --- a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn @@ -189,8 +189,7 @@ source_set("omnibox_internal") { ] } -source_set("app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] +source_set("eg_app_support+eg2") { configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -216,18 +215,20 @@ source_set("app_support+eg2") { "//ui/base:test_support", ] } -source_set("test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] +source_set("eg_test_support+eg2") { configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", ] testonly = true - sources = [ "omnibox_app_interface.h" ] + sources = [ + "omnibox_app_interface.h", + "omnibox_app_interface_stub.mm", + ] + deps = [ "//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", @@ -235,10 +236,11 @@ source_set("eg2_tests") { testonly = true sources = [ "omnibox_egtest.mm" ] deps = [ - ":test_support+eg2", + ":eg_test_support+eg2", "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant", "//ios/chrome/browser/ui/omnibox/popup:popup_accessibility_identifier_constants", + "//ios/chrome/browser/ui: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", diff --git a/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn index 04dec86e242..349ccaa6b4c 100644 --- a/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn @@ -19,7 +19,7 @@ source_set("popup") { ":popup_internal", ":popup_ui", "//base", - "//components/image_fetcher/ios", + "//components/image_fetcher/core", "//components/omnibox/browser", "//components/open_from_clipboard", "//components/search_engines", @@ -147,7 +147,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/open_in/BUILD.gn b/chromium/ios/chrome/browser/ui/open_in/BUILD.gn index e965a46f49d..4786240fdc5 100644 --- a/chromium/ios/chrome/browser/ui/open_in/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/open_in/BUILD.gn @@ -79,7 +79,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", 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 index ee7c03c7ab9..944494af1d5 100644 --- a/chromium/ios/chrome/browser/ui/overlays/infobar_banner/passwords/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/passwords/BUILD.gn @@ -50,7 +50,7 @@ source_set("unit_tests") { "//ios/chrome/browser/ui/infobars/banners/test", "//ios/chrome/browser/ui/infobars/test", "//ios/chrome/browser/ui/overlays/test", - "//ios/chrome/browser/ui/resources:password_key", + "//ios/chrome/browser/ui/resources:legacy_password_key", "//testing/gmock", "//testing/gtest", "//ui/base", diff --git a/chromium/ios/chrome/browser/ui/page_info/BUILD.gn b/chromium/ios/chrome/browser/ui/page_info/BUILD.gn index b59dff33bab..be4f17b684a 100644 --- a/chromium/ios/chrome/browser/ui/page_info/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/page_info/BUILD.gn @@ -101,7 +101,6 @@ source_set("coordinator") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/passwords/BUILD.gn b/chromium/ios/chrome/browser/ui/passwords/BUILD.gn index dd6248407ac..a81d7829be7 100644 --- a/chromium/ios/chrome/browser/ui/passwords/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/passwords/BUILD.gn @@ -49,8 +49,7 @@ source_set("constants") { ] } -source_set("app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] +source_set("eg_app_support+eg2") { configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -69,22 +68,24 @@ source_set("app_support+eg2") { ] } -source_set("test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] +source_set("eg_test_support+eg2") { configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", ] testonly = true - sources = [ "password_breach_app_interface.h" ] + sources = [ + "password_breach_app_interface.h", + "password_breach_app_interface_stub.mm", + ] deps = [ ":constants", "//base", + "//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", @@ -93,7 +94,7 @@ source_set("eg2_tests") { sources = [ "password_breach_egtest.mm" ] deps = [ ":constants", - ":test_support+eg2", + ":eg_test_support+eg2", "//base", "//base/test:test_support", "//components/password_manager/core/common", diff --git a/chromium/ios/chrome/browser/ui/passwords/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/passwords/resources/BUILD.gn index 97882463549..1cb9b5a71e7 100644 --- a/chromium/ios/chrome/browser/ui/passwords/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/passwords/resources/BUILD.gn @@ -6,13 +6,37 @@ import("//build/config/ios/asset_catalog.gni") import("//build/config/ios/rules.gni") group("resources") { - deps = [ ":password_breach_illustration" ] + deps = [ + ":legacy_password_breach_illustration", + ":password_breach_illustration", + ":passwords_logo_colored", + ] } imageset("password_breach_illustration") { sources = [ "password_breach_illustration.imageset/Contents.json", - "password_breach_illustration.imageset/illustration_dark.png", - "password_breach_illustration.imageset/illustration_light.png", + "password_breach_illustration.imageset/password_check_alert@2x.png", + "password_breach_illustration.imageset/password_check_alert@3x.png", + "password_breach_illustration.imageset/password_check_alert_dark@2x.png", + "password_breach_illustration.imageset/password_check_alert_dark@3x.png", + ] +} + +imageset("passwords_logo_colored") { + sources = [ + "passwords_logo_colored.imageset/Contents.json", + "passwords_logo_colored.imageset/passwords_logo_colored@2x.png", + "passwords_logo_colored.imageset/passwords_logo_colored@3x.png", + "passwords_logo_colored.imageset/passwords_logo_colored_dark@2x.png", + "passwords_logo_colored.imageset/passwords_logo_colored_dark@3x.png", + ] +} + +imageset("legacy_password_breach_illustration") { + sources = [ + "legacy_password_breach_illustration.imageset/Contents.json", + "legacy_password_breach_illustration.imageset/illustration_dark.png", + "legacy_password_breach_illustration.imageset/illustration_light.png", ] } diff --git a/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn index 85f2478167f..eca4022e7e6 100644 --- a/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn @@ -172,7 +172,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/popup_menu/overflow_menu/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/overflow_menu/BUILD.gn index f4da6c721f6..14ec91afbca 100644 --- a/chromium/ios/chrome/browser/ui/popup_menu/overflow_menu/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/popup_menu/overflow_menu/BUILD.gn @@ -11,9 +11,60 @@ source_set("overflow_menu") { "overflow_menu_mediator.mm", ] deps = [ + ":feature_flags", ":overflow_menu_swift", + "resources:overflow_menu_action_bookmark", + "resources:overflow_menu_action_edit_bookmark", + "resources:overflow_menu_action_find_in_page", + "resources:overflow_menu_action_help", + "resources:overflow_menu_action_incognito", + "resources:overflow_menu_action_new_tab", + "resources:overflow_menu_action_new_window", + "resources:overflow_menu_action_read_later", + "resources:overflow_menu_action_reload", + "resources:overflow_menu_action_report_issue", + "resources:overflow_menu_action_request_desktop", + "resources:overflow_menu_action_request_mobile", + "resources:overflow_menu_action_stop", + "resources:overflow_menu_action_text_zoom", + "resources:overflow_menu_action_translate", + "resources:overflow_menu_destination_bookmarks", + "resources:overflow_menu_destination_downloads", + "resources:overflow_menu_destination_history", + "resources:overflow_menu_destination_passwords", + "resources:overflow_menu_destination_passwords_rebrand", + "resources:overflow_menu_destination_reading_list", + "resources:overflow_menu_destination_recent_tabs", + "resources:overflow_menu_destination_settings", + "resources:overflow_menu_destination_site_info", + "resources:overflow_menu_footer_managed", + "//components/bookmarks/browser", + "//components/bookmarks/common", + "//components/language/ios/browser", + "//components/prefs", + "//components/prefs/ios", + "//components/profile_metrics", + "//components/translate/core/browser", "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser:chrome_url_constants", + "//ios/chrome/browser/find_in_page", + "//ios/chrome/browser/overlays", "//ios/chrome/browser/policy", + "//ios/chrome/browser/policy:policy_util", + "//ios/chrome/browser/reading_list", + "//ios/chrome/browser/translate", + "//ios/chrome/browser/ui/activity_services", + "//ios/chrome/browser/ui/bookmarks:core", + "//ios/chrome/browser/ui/browser_container:ui", + "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/default_promo:utils", + "//ios/chrome/browser/ui/util", + "//ios/chrome/browser/web", + "//ios/chrome/browser/web/font_size", + "//ios/chrome/browser/web_state_list", + "//ios/chrome/browser/window_activities", + "//ios/web/common:user_agent", + "//ios/web/public", "//ui/base", ] } @@ -21,14 +72,24 @@ source_set("overflow_menu") { swift_source_set("overflow_menu_swift") { sources = [ "overflow_menu_action.swift", + "overflow_menu_action_group.swift", "overflow_menu_action_list.swift", "overflow_menu_action_row.swift", + "overflow_menu_action_section.swift", "overflow_menu_destination.swift", + "overflow_menu_destination_list.swift", + "overflow_menu_destination_view.swift", + "overflow_menu_footer.swift", + "overflow_menu_footer_row.swift", + "overflow_menu_hosting_controller.swift", + "overflow_menu_item.swift", "overflow_menu_model.swift", "overflow_menu_view.swift", "overflow_menu_view_provider.swift", ] + deps = [ "//ios/chrome/common/ui/colors:swift" ] + frameworks = [ "Foundation.framework", "SwiftUI.framework", @@ -41,5 +102,9 @@ source_set("feature_flags") { "feature_flags.h", "feature_flags.mm", ] - deps = [ "//base" ] + deps = [ + "//base", + "//components/password_manager/core/common", + "//ios/chrome/browser/ui:feature_flags", + ] } diff --git a/chromium/ios/chrome/browser/ui/popup_menu/overflow_menu/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/overflow_menu/resources/BUILD.gn new file mode 100644 index 00000000000..80dadaad397 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/popup_menu/overflow_menu/resources/BUILD.gn @@ -0,0 +1,225 @@ +# Copyright 2021 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("overflow_menu_action_bookmark") { + sources = [ + "overflow_menu_action_bookmark.imageset/Contents.json", + "overflow_menu_action_bookmark.imageset/overflow_menu_action_bookmark@2x.png", + "overflow_menu_action_bookmark.imageset/overflow_menu_action_bookmark@3x.png", + ] +} + +imageset("overflow_menu_action_find_in_page") { + sources = [ + "overflow_menu_action_find_in_page.imageset/Contents.json", + "overflow_menu_action_find_in_page.imageset/overflow_menu_action_find_in_page@2x.png", + "overflow_menu_action_find_in_page.imageset/overflow_menu_action_find_in_page@3x.png", + ] +} + +imageset("overflow_menu_action_edit_bookmark") { + sources = [ + "overflow_menu_action_edit_bookmark.imageset/Contents.json", + "overflow_menu_action_edit_bookmark.imageset/overflow_menu_action_edit_bookmark@2x.png", + "overflow_menu_action_edit_bookmark.imageset/overflow_menu_action_edit_bookmark@3x.png", + ] +} + +imageset("overflow_menu_action_help") { + sources = [ + "overflow_menu_action_help.imageset/Contents.json", + "overflow_menu_action_help.imageset/overflow_menu_action_help@2x.png", + "overflow_menu_action_help.imageset/overflow_menu_action_help@3x.png", + ] +} + +imageset("overflow_menu_action_incognito") { + sources = [ + "overflow_menu_action_incognito.imageset/Contents.json", + "overflow_menu_action_incognito.imageset/overflow_menu_action_incognito@2x.png", + "overflow_menu_action_incognito.imageset/overflow_menu_action_incognito@3x.png", + ] +} + +imageset("overflow_menu_action_new_tab") { + sources = [ + "overflow_menu_action_new_tab.imageset/Contents.json", + "overflow_menu_action_new_tab.imageset/overflow_menu_action_new_tab@2x.png", + "overflow_menu_action_new_tab.imageset/overflow_menu_action_new_tab@3x.png", + ] +} + +imageset("overflow_menu_action_new_window") { + sources = [ + "overflow_menu_action_new_window.imageset/Contents.json", + "overflow_menu_action_new_window.imageset/overflow_menu_action_new_window@2x.png", + "overflow_menu_action_new_window.imageset/overflow_menu_action_new_window@3x.png", + ] +} + +imageset("overflow_menu_action_read_later") { + sources = [ + "overflow_menu_action_read_later.imageset/Contents.json", + "overflow_menu_action_read_later.imageset/overflow_menu_action_read_later@2x.png", + "overflow_menu_action_read_later.imageset/overflow_menu_action_read_later@3x.png", + ] +} + +imageset("overflow_menu_action_reload") { + sources = [ + "overflow_menu_action_reload.imageset/Contents.json", + "overflow_menu_action_reload.imageset/overflow_menu_action_reload@2x.png", + "overflow_menu_action_reload.imageset/overflow_menu_action_reload@3x.png", + ] +} + +imageset("overflow_menu_action_report_issue") { + sources = [ + "overflow_menu_action_report_issue.imageset/Contents.json", + "overflow_menu_action_report_issue.imageset/overflow_menu_action_report_issue@2x.png", + "overflow_menu_action_report_issue.imageset/overflow_menu_action_report_issue@3x.png", + ] +} + +imageset("overflow_menu_action_request_desktop") { + sources = [ + "overflow_menu_action_request_desktop.imageset/Contents.json", + "overflow_menu_action_request_desktop.imageset/overflow_menu_action_request_desktop@2x.png", + "overflow_menu_action_request_desktop.imageset/overflow_menu_action_request_desktop@3x.png", + ] +} + +imageset("overflow_menu_action_request_mobile") { + sources = [ + "overflow_menu_action_request_mobile.imageset/Contents.json", + "overflow_menu_action_request_mobile.imageset/overflow_menu_action_request_mobile@2x.png", + "overflow_menu_action_request_mobile.imageset/overflow_menu_action_request_mobile@3x.png", + ] +} + +imageset("overflow_menu_action_stop") { + sources = [ + "overflow_menu_action_stop.imageset/Contents.json", + "overflow_menu_action_stop.imageset/overflow_menu_action_stop@2x.png", + "overflow_menu_action_stop.imageset/overflow_menu_action_stop@3x.png", + ] +} + +imageset("overflow_menu_action_text_zoom") { + sources = [ + "overflow_menu_action_text_zoom.imageset/Contents.json", + "overflow_menu_action_text_zoom.imageset/overflow_menu_action_text_zoom@2x.png", + "overflow_menu_action_text_zoom.imageset/overflow_menu_action_text_zoom@3x.png", + ] +} + +imageset("overflow_menu_action_translate") { + sources = [ + "overflow_menu_action_translate.imageset/Contents.json", + "overflow_menu_action_translate.imageset/overflow_menu_action_translate@2x.png", + "overflow_menu_action_translate.imageset/overflow_menu_action_translate@3x.png", + ] +} + +imageset("overflow_menu_destination_bookmarks") { + sources = [ + "overflow_menu_destination_bookmarks.imageset/Contents.json", + "overflow_menu_destination_bookmarks.imageset/overflow_menu_destination_bookmarks@2x.png", + "overflow_menu_destination_bookmarks.imageset/overflow_menu_destination_bookmarks@3x.png", + "overflow_menu_destination_bookmarks.imageset/overflow_menu_destination_bookmarks_dark@2x.png", + "overflow_menu_destination_bookmarks.imageset/overflow_menu_destination_bookmarks_dark@3x.png", + ] +} + +imageset("overflow_menu_destination_downloads") { + sources = [ + "overflow_menu_destination_downloads.imageset/Contents.json", + "overflow_menu_destination_downloads.imageset/overflow_menu_destination_downloads@2x.png", + "overflow_menu_destination_downloads.imageset/overflow_menu_destination_downloads@3x.png", + "overflow_menu_destination_downloads.imageset/overflow_menu_destination_downloads_dark@2x.png", + "overflow_menu_destination_downloads.imageset/overflow_menu_destination_downloads_dark@3x.png", + ] +} + +imageset("overflow_menu_destination_history") { + sources = [ + "overflow_menu_destination_history.imageset/Contents.json", + "overflow_menu_destination_history.imageset/overflow_menu_destination_history@2x.png", + "overflow_menu_destination_history.imageset/overflow_menu_destination_history@3x.png", + "overflow_menu_destination_history.imageset/overflow_menu_destination_history_dark@2x.png", + "overflow_menu_destination_history.imageset/overflow_menu_destination_history_dark@3x.png", + ] +} + +imageset("overflow_menu_destination_passwords") { + sources = [ + "overflow_menu_destination_passwords.imageset/Contents.json", + "overflow_menu_destination_passwords.imageset/overflow_menu_destination_passwords@2x.png", + "overflow_menu_destination_passwords.imageset/overflow_menu_destination_passwords@3x.png", + "overflow_menu_destination_passwords.imageset/overflow_menu_destination_passwords_dark@2x.png", + "overflow_menu_destination_passwords.imageset/overflow_menu_destination_passwords_dark@3x.png", + ] +} + +imageset("overflow_menu_destination_passwords_rebrand") { + sources = [ + "overflow_menu_destination_passwords_rebrand.imageset/Contents.json", + "overflow_menu_destination_passwords_rebrand.imageset/overflow_menu_destination_passwords@2x.png", + "overflow_menu_destination_passwords_rebrand.imageset/overflow_menu_destination_passwords@3x.png", + "overflow_menu_destination_passwords_rebrand.imageset/overflow_menu_destination_passwords_dark@2x.png", + "overflow_menu_destination_passwords_rebrand.imageset/overflow_menu_destination_passwords_dark@3x.png", + ] +} + +imageset("overflow_menu_destination_reading_list") { + sources = [ + "overflow_menu_destination_reading_list.imageset/Contents.json", + "overflow_menu_destination_reading_list.imageset/overflow_menu_destination_reading_list@2x.png", + "overflow_menu_destination_reading_list.imageset/overflow_menu_destination_reading_list@3x.png", + "overflow_menu_destination_reading_list.imageset/overflow_menu_destination_reading_list_dark@2x.png", + "overflow_menu_destination_reading_list.imageset/overflow_menu_destination_reading_list_dark@3x.png", + ] +} + +imageset("overflow_menu_destination_recent_tabs") { + sources = [ + "overflow_menu_destination_recent_tabs.imageset/Contents.json", + "overflow_menu_destination_recent_tabs.imageset/overflow_menu_destination_recent_tabs@2x.png", + "overflow_menu_destination_recent_tabs.imageset/overflow_menu_destination_recent_tabs@3x.png", + "overflow_menu_destination_recent_tabs.imageset/overflow_menu_destination_recent_tabs_dark@2x.png", + "overflow_menu_destination_recent_tabs.imageset/overflow_menu_destination_recent_tabs_dark@3x.png", + ] +} + +imageset("overflow_menu_destination_settings") { + sources = [ + "overflow_menu_destination_settings.imageset/Contents.json", + "overflow_menu_destination_settings.imageset/overflow_menu_destination_settings@2x.png", + "overflow_menu_destination_settings.imageset/overflow_menu_destination_settings@3x.png", + "overflow_menu_destination_settings.imageset/overflow_menu_destination_settings_dark@2x.png", + "overflow_menu_destination_settings.imageset/overflow_menu_destination_settings_dark@3x.png", + ] +} + +imageset("overflow_menu_destination_site_info") { + sources = [ + "overflow_menu_destination_site_info.imageset/Contents.json", + "overflow_menu_destination_site_info.imageset/overflow_menu_destination_site_info@2x.png", + "overflow_menu_destination_site_info.imageset/overflow_menu_destination_site_info@3x.png", + "overflow_menu_destination_site_info.imageset/overflow_menu_destination_site_info_dark@2x.png", + "overflow_menu_destination_site_info.imageset/overflow_menu_destination_site_info_dark@3x.png", + ] +} + +imageset("overflow_menu_footer_managed") { + sources = [ + "overflow_menu_footer_managed.imageset/Contents.json", + "overflow_menu_footer_managed.imageset/overflow_menu_footer_managed@2x.png", + "overflow_menu_footer_managed.imageset/overflow_menu_footer_managed@3x.png", + "overflow_menu_footer_managed.imageset/overflow_menu_footer_managed_dark@2x.png", + "overflow_menu_footer_managed.imageset/overflow_menu_footer_managed_dark@3x.png", + ] +} diff --git a/chromium/ios/chrome/browser/ui/qr_generator/BUILD.gn b/chromium/ios/chrome/browser/ui/qr_generator/BUILD.gn index 17eb8518f4b..a1caa0adf69 100644 --- a/chromium/ios/chrome/browser/ui/qr_generator/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/qr_generator/BUILD.gn @@ -16,7 +16,10 @@ source_set("ui") { "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/util", + "//ios/chrome/common/ui/colors", "//ios/chrome/common/ui/confirmation_alert", + "//ios/chrome/common/ui/util", + "//ios/chrome/common/ui/util:image_util", "//ui/base", "//url:url", ] diff --git a/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn b/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn index 8954eb3fa51..6cc60a166fd 100644 --- a/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn @@ -51,7 +51,6 @@ source_set("coordinator") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -78,7 +77,6 @@ source_set("eg2_tests") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -111,13 +109,18 @@ source_set("eg_app_support+eg2") { } 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 = [ "qr_scanner_app_interface.h" ] - deps = [ "//ios/chrome/browser/ui/scanner:camera_state" ] + sources = [ + "qr_scanner_app_interface.h", + "qr_scanner_app_interface_stub.mm", + ] + deps = [ + "//ios/chrome/browser/ui/scanner:camera_state", + "//ios/third_party/earl_grey2:test_lib", + ] } diff --git a/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn b/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn index 51264f83cc9..cbb1bee1061 100644 --- a/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn @@ -39,7 +39,6 @@ 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/main:public", "//ios/chrome/browser/metrics:metrics_internal", "//ios/chrome/browser/policy:policy_util", @@ -86,6 +85,7 @@ source_set("reading_list_javascript_feature") { ] deps = [ ":distiller_js", + ":features", "//base", "//components/dom_distiller/core", "//components/infobars/core", @@ -150,8 +150,6 @@ js_compile_bundle("distiller_js") { source_set("reading_list_ui") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ - "empty_reading_list_message_util.h", - "empty_reading_list_message_util.mm", "number_badge_view.h", "number_badge_view.mm", "reading_list_data_sink.h", @@ -176,7 +174,6 @@ source_set("reading_list_ui") { ":reading_list_constants", "resources:reading_list_empty", "resources:reading_list_empty_state", - "resources:reading_list_tools_icon", "//base", "//base:i18n", "//components/prefs", @@ -247,7 +244,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -278,7 +274,6 @@ source_set("eg2_tests") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -298,7 +293,6 @@ source_set("eg_app_support+eg2") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/reading_list/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/reading_list/resources/BUILD.gn index 931edbb362a..d7f959fffd7 100644 --- a/chromium/ios/chrome/browser/ui/reading_list/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/reading_list/resources/BUILD.gn @@ -30,12 +30,3 @@ imageset("reading_list_empty_state") { "reading_list_empty_state.imageset/reading_list_empty_state@3x.png", ] } - -imageset("reading_list_tools_icon") { - sources = [ - "reading_list_tools_icon.imageset/Contents.json", - "reading_list_tools_icon.imageset/reading_list_tools_icon.png", - "reading_list_tools_icon.imageset/reading_list_tools_icon@2x.png", - "reading_list_tools_icon.imageset/reading_list_tools_icon@3x.png", - ] -} diff --git a/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn b/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn index 125934d5303..e395284e4d7 100644 --- a/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn @@ -92,6 +92,7 @@ source_set("recent_tabs_ui") { "//ios/chrome/browser/ui/authentication", "//ios/chrome/browser/ui/authentication:signin_presenter", "//ios/chrome/browser/ui/authentication/cells", + "//ios/chrome/browser/ui/authentication/enterprise:enterprise_utils", "//ios/chrome/browser/ui/authentication/signin:signin_headers", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/settings/sync/utils", @@ -145,8 +146,7 @@ source_set("unit_tests") { ] } -source_set("app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] +source_set("eg_app_support+eg2") { configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -165,19 +165,23 @@ source_set("app_support+eg2") { ] } -source_set("test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] +source_set("eg_test_support+eg2") { configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", ] testonly = true - sources = [ "recent_tabs_app_interface.h" ] - deps = [ "//base" ] + sources = [ + "recent_tabs_app_interface.h", + "recent_tabs_app_interface_stub.mm", + ] + deps = [ + "//base", + "//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", @@ -185,11 +189,14 @@ source_set("eg2_tests") { testonly = true sources = [ "recent_tabs_egtest.mm" ] deps = [ + ":eg_test_support+eg2", ":recent_tabs_ui_constants", - ":test_support+eg2", "//base/test:test_support", + "//components/policy:policy_code_generate", + "//components/policy/core/common:common_constants", "//components/strings", "//ios/chrome/app/strings", + "//ios/chrome/browser/policy:eg_test_support+eg2", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/authentication:eg_test_support+eg2", "//ios/chrome/browser/ui/authentication/cells:constants", diff --git a/chromium/ios/chrome/browser/ui/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/resources/BUILD.gn index ac7c7686fe3..c0f9ea220c3 100644 --- a/chromium/ios/chrome/browser/ui/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/resources/BUILD.gn @@ -13,6 +13,14 @@ imageset("menu_shadow") { ] } +imageset("legacy_password_key") { + sources = [ + "legacy_password_key.imageset/Contents.json", + "legacy_password_key.imageset/password_key@2x.png", + "legacy_password_key.imageset/password_key@3x.png", + ] +} + imageset("password_key") { sources = [ "password_key.imageset/Contents.json", diff --git a/chromium/ios/chrome/browser/ui/sad_tab/BUILD.gn b/chromium/ios/chrome/browser/ui/sad_tab/BUILD.gn index 373a97e9b34..d973c8082b5 100644 --- a/chromium/ios/chrome/browser/ui/sad_tab/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/sad_tab/BUILD.gn @@ -82,7 +82,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/safe_mode/BUILD.gn b/chromium/ios/chrome/browser/ui/safe_mode/BUILD.gn index d5f28750080..9363a767478 100644 --- a/chromium/ios/chrome/browser/ui/safe_mode/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/safe_mode/BUILD.gn @@ -31,7 +31,6 @@ source_set("safe_mode") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -48,18 +47,20 @@ source_set("eg_app_support+eg2") { } 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 = [ "safe_mode_app_interface.h" ] + sources = [ + "safe_mode_app_interface.h", + "safe_mode_app_interface_stub.mm", + ] + deps = [ "//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", @@ -90,6 +91,7 @@ source_set("unit_tests") { "//base", "//base/test:test_support", "//ios/chrome/browser/crash_report", + "//ios/chrome/common/crash_report", "//ios/chrome/test/ocmock", "//ios/testing:block_swizzler", "//testing/gtest", diff --git a/chromium/ios/chrome/browser/ui/settings/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/BUILD.gn index f4078082a2d..5c83645c85c 100644 --- a/chromium/ios/chrome/browser/ui/settings/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/BUILD.gn @@ -47,14 +47,6 @@ source_set("settings") { sources = [ "about_chrome_table_view_controller.h", "about_chrome_table_view_controller.mm", - "bandwidth_management_table_view_controller.h", - "bandwidth_management_table_view_controller.mm", - "block_popups_table_view_controller.h", - "block_popups_table_view_controller.mm", - "content_settings_table_view_controller.h", - "content_settings_table_view_controller.mm", - "dataplan_usage_table_view_controller.h", - "dataplan_usage_table_view_controller.mm", "import_data_table_view_controller.h", "import_data_table_view_controller.mm", "search_engine_table_view_controller.h", @@ -75,6 +67,8 @@ source_set("settings") { "resources:app_icon_placeholder", "resources:encryption_error", "resources:enterprise_icon", + "resources:legacy_settings_passwords", + "resources:round_settings_unsafe_state", "resources:settings_about_chrome", "resources:settings_accounts_add_account", "resources:settings_addresses", @@ -161,11 +155,14 @@ source_set("settings") { "//ios/chrome/browser/ui/keyboard", "//ios/chrome/browser/ui/list_model", "//ios/chrome/browser/ui/ntp:feature_flags", + "//ios/chrome/browser/ui/resources:legacy_password_key", "//ios/chrome/browser/ui/resources:password_key", "//ios/chrome/browser/ui/settings/autofill", + "//ios/chrome/browser/ui/settings/bandwidth", "//ios/chrome/browser/ui/settings/cells", "//ios/chrome/browser/ui/settings/cells:public", "//ios/chrome/browser/ui/settings/clear_browsing_data", + "//ios/chrome/browser/ui/settings/content_settings", "//ios/chrome/browser/ui/settings/default_browser", "//ios/chrome/browser/ui/settings/default_browser/resources:default_browser_world", "//ios/chrome/browser/ui/settings/elements:enterprise_info_popover_view_controller", @@ -198,6 +195,7 @@ source_set("settings") { "//ios/public/provider/chrome/browser/signin", "//ios/public/provider/chrome/browser/signin:signin_resources_api", "//ios/public/provider/chrome/browser/user_feedback", + "//ios/web/common:features", "//net", "//ui/base", "//url", @@ -269,10 +267,6 @@ source_set("unit_tests") { testonly = true sources = [ "about_chrome_table_view_controller_unittest.mm", - "bandwidth_management_table_view_controller_unittest.mm", - "block_popups_table_view_controller_unittest.mm", - "content_settings_table_view_controller_unittest.mm", - "dataplan_usage_table_view_controller_unittest.mm", "import_data_table_view_controller_unittest.mm", "search_engine_table_view_controller_unittest.mm", "settings_navigation_controller_unittest.mm", @@ -298,7 +292,6 @@ source_set("unit_tests") { "//components/pref_registry", "//components/prefs:test_support", "//components/search_engines", - "//components/signin/ios/browser", "//components/signin/public/base", "//components/strings", "//components/sync/driver:test_support", @@ -357,12 +350,9 @@ source_set("unit_tests") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ - "block_popups_app_interface.h", - "block_popups_app_interface.mm", "settings_app_interface.h", "settings_app_interface.mm", "signin_settings_app_interface.h", @@ -387,27 +377,28 @@ source_set("eg_app_support+eg2") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ - "block_popups_app_interface.h", "settings_app_interface.h", + "settings_app_interface_stub.mm", "signin_settings_app_interface.h", + "signin_settings_app_interface_stub.mm", ] public_deps = [ "//components/content_settings/core/common" ] - deps = [ "//base" ] + deps = [ + "//base", + "//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 = [ - "block_popups_egtest.mm", "search_engine_settings_egtest.mm", "settings_accessibility_egtest.mm", "settings_egtest.mm", @@ -418,13 +409,17 @@ source_set("eg2_tests") { "//base", "//base/test:test_support", "//build:branding_buildflags", + "//components/policy:generated", "//components/strings", "//ios/chrome/app/strings", + "//ios/chrome/browser/policy:eg_test_support+eg2", "//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/authentication/signin:constants", "//ios/chrome/browser/ui/settings:constants", + "//ios/chrome/browser/ui/settings/elements:constants", + "//ios/chrome/browser/ui/table_view/cells:cells_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", diff --git a/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn index a1d9b5a460f..497dfeccc19 100644 --- a/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn @@ -17,6 +17,8 @@ source_set("autofill") { "autofill_credit_card_edit_table_view_controller.mm", "autofill_credit_card_table_view_controller.h", "autofill_credit_card_table_view_controller.mm", + "autofill_credit_card_util.h", + "autofill_credit_card_util.mm", "autofill_edit_table_view_controller+protected.h", "autofill_edit_table_view_controller.h", "autofill_edit_table_view_controller.mm", @@ -77,6 +79,7 @@ source_set("unit_tests") { sources = [ "autofill_add_credit_card_mediator_unittest.mm", "autofill_credit_card_table_view_controller_unittest.mm", + "autofill_credit_card_util_unittest.mm", "autofill_profile_edit_table_view_controller_unittest.mm", "autofill_profile_table_view_controller_unittest.mm", ] @@ -84,6 +87,7 @@ source_set("unit_tests") { ":autofill", "//base/test:test_support", "//components/autofill/core/browser", + "//components/autofill/core/browser:test_support", "//components/strings", "//ios/chrome/browser", "//ios/chrome/browser/autofill", @@ -101,7 +105,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/settings/bandwidth/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/bandwidth/BUILD.gn new file mode 100644 index 00000000000..f4836a68010 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/settings/bandwidth/BUILD.gn @@ -0,0 +1,61 @@ +# Copyright 2021 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("bandwidth") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "bandwidth_management_table_view_controller.h", + "bandwidth_management_table_view_controller.mm", + "dataplan_usage_table_view_controller.h", + "dataplan_usage_table_view_controller.mm", + ] + deps = [ + "//base", + "//components/prefs", + "//components/prefs/ios", + "//ios/chrome/app/strings", + "//ios/chrome/browser:pref_names", + "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/prerender:prerender_pref", + "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/browser/ui/settings:constants", + "//ios/chrome/browser/ui/settings:settings_root", + "//ios/chrome/browser/ui/table_view:styler", + "//ios/chrome/browser/ui/table_view:utils", + "//ios/chrome/browser/ui/table_view/cells", + "//ios/chrome/browser/ui/util", + "//ui/base", + "//url", + ] +} + +source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ + "bandwidth_management_table_view_controller_unittest.mm", + "dataplan_usage_table_view_controller_unittest.mm", + ] + deps = [ + ":bandwidth", + "//base", + "//base/test:test_support", + "//components/pref_registry", + "//components/prefs:test_support", + "//components/sync_preferences", + "//components/sync_preferences:test_support", + "//ios/chrome/app/strings", + "//ios/chrome/browser:pref_names", + "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/prefs:browser_prefs", + "//ios/chrome/browser/prerender:prerender_pref", + "//ios/chrome/browser/ui/table_view", + "//ios/chrome/browser/ui/table_view:test_support", + "//ios/chrome/test:test_support", + "//ios/web/public/test", + "//testing/gmock", + "//testing/gtest", + "//ui/base", + ] +} diff --git a/chromium/ios/chrome/browser/ui/settings/clear_browsing_data/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/clear_browsing_data/BUILD.gn index 5fa9c102994..05a20e42964 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 @@ -26,6 +26,7 @@ source_set("clear_browsing_data") { "//components/browsing_data/core", "//components/feature_engagement/public", "//components/history/core/browser", + "//components/password_manager/core/common", "//components/prefs/ios", "//components/search_engines", "//components/signin/public/identity_manager", @@ -49,6 +50,7 @@ source_set("clear_browsing_data") { "//ios/chrome/browser/ui/elements:elements_internal", "//ios/chrome/browser/ui/icons", "//ios/chrome/browser/ui/list_model", + "//ios/chrome/browser/ui/resources:legacy_password_key", "//ios/chrome/browser/ui/resources:password_key", "//ios/chrome/browser/ui/settings:settings_root", "//ios/chrome/browser/ui/settings/cells", @@ -127,7 +129,6 @@ source_set("test_support") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/settings/content_settings/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/content_settings/BUILD.gn new file mode 100644 index 00000000000..35eedfb2fd1 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/settings/content_settings/BUILD.gn @@ -0,0 +1,115 @@ +# Copyright 2021 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("content_settings") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "block_popups_table_view_controller.h", + "block_popups_table_view_controller.mm", + "content_settings_table_view_controller.h", + "content_settings_table_view_controller.mm", + ] + deps = [ + "//base", + "//components/content_settings/core/browser", + "//components/content_settings/core/common", + "//components/prefs", + "//components/strings", + "//ios/chrome/app/strings", + "//ios/chrome/browser:pref_names", + "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/content_settings", + "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/browser/ui/ntp:feature_flags", + "//ios/chrome/browser/ui/settings:constants", + "//ios/chrome/browser/ui/settings:settings_root", + "//ios/chrome/browser/ui/settings/cells", + "//ios/chrome/browser/ui/settings/elements:enterprise_info_popover_view_controller", + "//ios/chrome/browser/ui/settings/utils", + "//ios/chrome/browser/ui/table_view:utils", + "//ios/chrome/browser/ui/table_view/cells", + "//ios/public/provider/chrome/browser", + "//ios/public/provider/chrome/browser/mailto", + "//ios/web/common:features", + "//ui/base", + ] +} + +source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ + "block_popups_table_view_controller_unittest.mm", + "content_settings_table_view_controller_unittest.mm", + ] + deps = [ + ":content_settings", + "//base/test:test_support", + "//components/content_settings/core/browser", + "//ios/chrome/app/strings", + "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/content_settings", + "//ios/chrome/browser/ui/table_view:test_support", + "//ios/chrome/browser/ui/table_view/cells", + "//ios/web/public/test", + "//testing/gtest", + "//ui/base", + ] +} + +source_set("eg_app_support+eg2") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ + "block_popups_app_interface.h", + "block_popups_app_interface.mm", + ] + deps = [ + ":content_settings", + "//base", + "//components/content_settings/core/browser", + "//ios/chrome/app:app_internal", + "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/content_settings", + "//ios/chrome/test/app:test_support", + ] +} + +source_set("eg_test_support+eg2") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ + "block_popups_app_interface.h", + "block_popups_app_interface_stub.mm", + ] + deps = [ + "//base", + "//components/content_settings/core/common", + "//ios/third_party/earl_grey2:test_lib", + ] +} + +source_set("eg2_tests") { + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + testonly = true + sources = [ "block_popups_egtest.mm" ] + deps = [ + ":eg_test_support+eg2", + "//base", + "//base/test:test_support", + "//build:branding_buildflags", + "//components/strings", + "//ios/chrome/app/strings", + "//ios/chrome/test/earl_grey:eg_test_support+eg2", + "//ios/testing/earl_grey:eg_test_support+eg2", + "//ios/third_party/earl_grey2:test_lib", + "//ios/web/public/test/http_server", + "//net:test_support", + "//ui/base", + "//url", + ] +} diff --git a/chromium/ios/chrome/browser/ui/settings/default_browser/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/default_browser/BUILD.gn index db9d6ed5462..874cd3ffe86 100644 --- a/chromium/ios/chrome/browser/ui/settings/default_browser/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/default_browser/BUILD.gn @@ -11,10 +11,10 @@ source_set("default_browser") { deps = [ "resources:chrome_icon", "resources:default_browser_world", - "resources:settings", "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/settings:settings_root", + "//ios/chrome/browser/ui/settings/resources:settings", "//ios/chrome/browser/ui/table_view:utils", "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/common/ui/colors", diff --git a/chromium/ios/chrome/browser/ui/settings/default_browser/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/default_browser/resources/BUILD.gn index b62b14912c9..6e89224eab0 100644 --- a/chromium/ios/chrome/browser/ui/settings/default_browser/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/default_browser/resources/BUILD.gn @@ -19,11 +19,3 @@ imageset("default_browser_world") { "default_browser_world.imageset/default_browser_world@3x.png", ] } - -imageset("settings") { - sources = [ - "settings.imageset/Contents.json", - "settings.imageset/settings@2x.png", - "settings.imageset/settings@3x.png", - ] -} 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 60891b3fcca..ea7856f43ba 100644 --- a/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn @@ -49,7 +49,8 @@ source_set("google_services") { "//ios/chrome/app/strings", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", - "//ios/chrome/browser/main", + "//ios/chrome/browser/commerce:commerce", + "//ios/chrome/browser/main:public", "//ios/chrome/browser/policy:policy_util", "//ios/chrome/browser/signin", "//ios/chrome/browser/sync", @@ -98,7 +99,6 @@ source_set("constants") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -117,17 +117,19 @@ source_set("eg_app_support+eg2") { ] } 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" ] + sources = [ + "google_services_settings_app_interface.h", + "google_services_settings_app_interface_stub.mm", + ] + deps = [ "//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", @@ -136,6 +138,7 @@ source_set("eg2_tests") { sources = [ "accounts_table_egtest.mm", "google_services_settings_egtest.mm", + "manage_sync_settings_egtest.mm", ] deps = [ ":eg_test_support+eg2", @@ -146,7 +149,6 @@ source_set("eg2_tests") { "//components/policy/core/common:common_constants", "//components/safe_browsing/core/common", "//components/safe_browsing/core/common:safe_browsing_prefs", - "//components/signin/ios/browser:features", "//components/signin/public/base", "//components/strings", "//ios/chrome/app/strings", diff --git a/chromium/ios/chrome/browser/ui/settings/language/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/language/BUILD.gn index 09b5c57c94f..225dad90c27 100644 --- a/chromium/ios/chrome/browser/ui/settings/language/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/language/BUILD.gn @@ -102,7 +102,6 @@ source_set("unit_tests") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ @@ -119,7 +118,6 @@ source_set("eg_app_support+eg2") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -136,7 +134,6 @@ source_set("eg_test_support+eg2") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn index 4782b2d0dac..e3a57bf2f59 100644 --- a/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn @@ -35,6 +35,8 @@ source_set("password") { "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/settings/password/password_details", + "//ios/chrome/browser/ui/settings/password/passwords_in_other_apps", + "//ios/chrome/browser/ui/settings/utils", "//ios/chrome/browser/ui/table_view:utils", "//ios/chrome/common", "//ios/chrome/common/ui/colors", @@ -155,6 +157,7 @@ source_set("unit_tests") { "//ios/chrome/browser/sync:sync", "//ios/chrome/browser/sync:test_support", "//ios/chrome/browser/ui/settings/cells", + "//ios/chrome/browser/ui/settings/utils", "//ios/chrome/browser/ui/table_view:test_support", "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/browser/ui/table_view/cells:cells_constants", @@ -164,10 +167,8 @@ source_set("unit_tests") { "//ios/chrome/common/ui/reauthentication", "//ios/chrome/test/app:test_support", "//ios/web/public/test", - "//ios/web/public/test", "//testing/gmock", "//testing/gtest", - "//testing/gtest", "//third_party/ocmock", "//ui/base", "//url", @@ -175,15 +176,14 @@ source_set("unit_tests") { } 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 = [ - "passwords_settings_app_interface.h", - "passwords_settings_app_interface.mm", + "password_settings_app_interface.h", + "password_settings_app_interface.mm", ] deps = [ ":password", @@ -207,20 +207,24 @@ source_set("eg_app_support+eg2") { } 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 = [ "passwords_settings_app_interface.h" ] + sources = [ + "password_settings_app_interface.h", + "password_settings_app_interface_stub.mm", + ] - deps = [ "//ios/chrome/common/ui/reauthentication" ] + deps = [ + "//ios/chrome/common/ui/reauthentication", + "//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", diff --git a/chromium/ios/chrome/browser/ui/settings/password/password_details/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/password/password_details/BUILD.gn index f8c8343a1a1..aa46dc83787 100644 --- a/chromium/ios/chrome/browser/ui/settings/password/password_details/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/password/password_details/BUILD.gn @@ -28,6 +28,8 @@ source_set("password_details") { "//ios/chrome/browser", "//ios/chrome/browser/main:public", "//ios/chrome/browser/passwords", + "//ios/chrome/browser/signin", + "//ios/chrome/browser/sync", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/commands", diff --git a/chromium/ios/chrome/browser/ui/settings/password/passwords_in_other_apps/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/password/passwords_in_other_apps/BUILD.gn new file mode 100644 index 00000000000..c58e9344ed3 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/settings/password/passwords_in_other_apps/BUILD.gn @@ -0,0 +1,124 @@ +# Copyright 2021 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_in_other_apps") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "passwords_in_other_apps_coordinator.h", + "passwords_in_other_apps_coordinator.mm", + "passwords_in_other_apps_mediator.h", + "passwords_in_other_apps_mediator.mm", + ] + deps = [ + ":passwords_in_other_apps_ui", + "//base", + "//ios/chrome/browser/ui/coordinators:chrome_coordinators", + "//ios/chrome/browser/ui/settings/utils", + "//ios/public/provider/chrome/browser/password_auto_fill:password_auto_fill_api", + ] +} + +source_set("passwords_in_other_apps_ui") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "passwords_in_other_apps_consumer.h", + "passwords_in_other_apps_view_controller.h", + "passwords_in_other_apps_view_controller.mm", + "passwords_in_other_apps_view_controller_delegate.h", + ] + deps = [ + ":constants", + "//base", + "//components/password_manager/core/common", + "//components/strings", + "//ios/chrome/app/strings", + "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/browser/ui/elements", + "//ios/chrome/browser/ui/settings:settings_root", + "//ios/chrome/browser/ui/settings/resources:legacy_settings_passwords_in_other_apps_banner", + "//ios/chrome/browser/ui/settings/resources:settings", + "//ios/chrome/browser/ui/settings/resources:settings_passwords_in_other_apps_banner", + "//ios/chrome/browser/ui/settings/utils", + "//ios/chrome/browser/ui/util", + "//ios/chrome/common", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/util", + "//ios/chrome/common/ui/util:image_util", + "//ios/public/provider/chrome/browser/password_auto_fill:password_auto_fill_api", + "//ui/base", + ] +} + +source_set("constants") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "constants.h", + "constants.mm", + ] + frameworks = [ "Foundation.framework" ] +} + +source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ "passwords_in_other_apps_mediator_unittest.mm" ] + deps = [ + ":passwords_in_other_apps", + ":passwords_in_other_apps_ui", + "//ios/chrome/browser/ui/settings/utils", + "//ios/chrome/test:test_support", + "//testing/gtest:gtest", + ] +} + +source_set("eg_app_support+eg2") { + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + testonly = true + sources = [ + "passwords_in_other_apps_app_interface.h", + "passwords_in_other_apps_app_interface.mm", + ] + deps = [ + "//base/test:test_support", + "//ios/chrome/test/fakes", + "//ios/testing/earl_grey:eg_app_support+eg2", + ] +} + +source_set("eg_test_support+eg2") { + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + testonly = true + sources = [ + "passwords_in_other_apps_app_interface.h", + "passwords_in_other_apps_app_interface_stub.mm", + ] + deps = [ "//ios/third_party/earl_grey2:test_lib" ] +} + +source_set("eg2_tests") { + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + testonly = true + sources = [ "passwords_in_other_apps_egtest.mm" ] + deps = [ + ":constants", + ":eg_test_support+eg2", + "//ios/chrome/app/strings", + "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/browser/ui/settings/password:password_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", + ] + frameworks = [ "UIKit.framework" ] +} diff --git a/chromium/ios/chrome/browser/ui/settings/privacy/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/privacy/BUILD.gn index 2432c5f7b34..38e475d77af 100644 --- a/chromium/ios/chrome/browser/ui/settings/privacy/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/privacy/BUILD.gn @@ -87,7 +87,6 @@ source_set("unit_tests") { "//components/handoff", "//components/prefs", "//components/prefs/ios", - "//components/signin/ios/browser:features", "//components/strings", "//components/sync/driver:test_support", "//components/sync_preferences", diff --git a/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn index f37ade521dd..15df4a9fde6 100644 --- a/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn @@ -32,6 +32,24 @@ imageset("enterprise_icon") { ] } +imageset("round_settings_unsafe_state") { + sources = [ + "round_settings_unsafe_state.imageset/Contents.json", + "round_settings_unsafe_state.imageset/round_settings_unsafe_state@2x.png", + "round_settings_unsafe_state.imageset/round_settings_unsafe_state@3x.png", + "round_settings_unsafe_state.imageset/round_settings_unsafe_state_dark@2x.png", + "round_settings_unsafe_state.imageset/round_settings_unsafe_state_dark@3x.png", + ] +} + +imageset("settings") { + sources = [ + "settings.imageset/Contents.json", + "settings.imageset/settings@2x.png", + "settings.imageset/settings@3x.png", + ] +} + imageset("settings_accounts_add_account") { sources = [ "settings_accounts_add_account.imageset/Contents.json", @@ -96,11 +114,41 @@ imageset("settings_language_settings") { ] } +imageset("legacy_settings_passwords") { + sources = [ + "legacy_settings_passwords.imageset/Contents.json", + "legacy_settings_passwords.imageset/settings_passwords@2x.png", + "legacy_settings_passwords.imageset/settings_passwords@3x.png", + ] +} + imageset("settings_passwords") { sources = [ "settings_passwords.imageset/Contents.json", "settings_passwords.imageset/settings_passwords@2x.png", "settings_passwords.imageset/settings_passwords@3x.png", + "settings_passwords.imageset/settings_passwords_dark@2x.png", + "settings_passwords.imageset/settings_passwords_dark@3x.png", + ] +} + +imageset("legacy_settings_passwords_in_other_apps_banner") { + sources = [ + "legacy_settings_passwords_in_other_apps_banner.imageset/Contents.json", + "legacy_settings_passwords_in_other_apps_banner.imageset/settings_passwords_in_other_apps_dark@2x.png", + "legacy_settings_passwords_in_other_apps_banner.imageset/settings_passwords_in_other_apps_dark@3x.png", + "legacy_settings_passwords_in_other_apps_banner.imageset/settings_passwords_in_other_apps_light@2x.png", + "legacy_settings_passwords_in_other_apps_banner.imageset/settings_passwords_in_other_apps_light@3x.png", + ] +} + +imageset("settings_passwords_in_other_apps_banner") { + sources = [ + "settings_passwords_in_other_apps_banner.imageset/Contents.json", + "settings_passwords_in_other_apps_banner.imageset/settings_passwords_in_other_apps_dark@2x.png", + "settings_passwords_in_other_apps_banner.imageset/settings_passwords_in_other_apps_dark@3x.png", + "settings_passwords_in_other_apps_banner.imageset/settings_passwords_in_other_apps_light@2x.png", + "settings_passwords_in_other_apps_banner.imageset/settings_passwords_in_other_apps_light@3x.png", ] } diff --git a/chromium/ios/chrome/browser/ui/settings/safety_check/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/safety_check/BUILD.gn index 7e458c361cb..6a7627750f9 100644 --- a/chromium/ios/chrome/browser/ui/settings/safety_check/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/safety_check/BUILD.gn @@ -56,6 +56,8 @@ source_set("safety_check") { "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", + "//ios/chrome/browser/ui/resources:legacy_password_key", + "//ios/chrome/browser/ui/resources:password_key", "//ios/chrome/browser/ui/settings:settings_root", "//ios/chrome/browser/ui/settings/cells", "//ios/chrome/browser/ui/settings/cells:public", diff --git a/chromium/ios/chrome/browser/ui/settings/sync/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/sync/BUILD.gn index db15f0e02ea..d9b51b3477e 100644 --- a/chromium/ios/chrome/browser/ui/settings/sync/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/sync/BUILD.gn @@ -101,7 +101,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", 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 3ba21e7b5e6..215390ff0f1 100644 --- a/chromium/ios/chrome/browser/ui/settings/sync/utils/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/sync/utils/BUILD.gn @@ -54,7 +54,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/settings/utils/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/utils/BUILD.gn index 9999f667a91..6b41d853a66 100644 --- a/chromium/ios/chrome/browser/ui/settings/utils/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/utils/BUILD.gn @@ -8,6 +8,9 @@ source_set("utils") { "content_setting_backed_boolean.h", "content_setting_backed_boolean.mm", "observable_boolean.h", + "password_auto_fill_status_manager.h", + "password_auto_fill_status_manager.mm", + "password_auto_fill_status_observer.h", "pref_backed_boolean.h", "pref_backed_boolean.mm", "settings_utils.h", diff --git a/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn b/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn index 1ff742cb87c..981f79f8d2d 100644 --- a/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn @@ -72,7 +72,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/start_surface/BUILD.gn b/chromium/ios/chrome/browser/ui/start_surface/BUILD.gn index 2018766c6e8..d93907ba8ab 100644 --- a/chromium/ios/chrome/browser/ui/start_surface/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/start_surface/BUILD.gn @@ -36,6 +36,8 @@ source_set("start_surface") { "//components/favicon/ios", "//ios/chrome/app/application_delegate:app_state_header", "//ios/chrome/app/strings:ios_strings", + "//ios/chrome/browser", + "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/main:browser_interface_provider", "//ios/chrome/browser/ui/main:observing_scene_agent", "//ios/chrome/browser/ui/main:scene_state_header", @@ -46,8 +48,29 @@ source_set("start_surface") { ] } +source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + + sources = [ "start_surface_scene_agent_unittest.mm" ] + deps = [ + ":feature_flags", + ":start_surface", + "//base", + "//base/test:test_support", + "//ios/chrome/browser", + "//ios/chrome/browser:chrome_url_constants", + "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/browser/ui/main:browser_interface_provider", + "//ios/chrome/browser/ui/main:scene", + "//ios/chrome/browser/ui/main/test", + "//ios/chrome/browser/web_state_list", + "//ios/web/public/test/fakes", + "//testing/gtest", + ] +} + source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/tab_switcher/tab_grid/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_switcher/tab_grid/BUILD.gn index c8428149cde..61b9efca4b7 100644 --- a/chromium/ios/chrome/browser/ui/tab_switcher/tab_grid/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/tab_switcher/tab_grid/BUILD.gn @@ -180,9 +180,12 @@ source_set("unit_tests") { "//components/bookmarks/browser", "//components/bookmarks/test", "//components/sessions", + "//components/sync_preferences:test_support", + "//components/unified_consent:unified_consent", "//ios/chrome/browser", "//ios/chrome/browser/bookmarks", "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/commerce:commerce", "//ios/chrome/browser/main:test_support", "//ios/chrome/browser/ntp", "//ios/chrome/browser/sessions", @@ -193,6 +196,7 @@ source_set("unit_tests") { "//ios/chrome/browser/snapshots", "//ios/chrome/browser/tabs", "//ios/chrome/browser/tabs:tabs_internal", + "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/main:scene_state_header", "//ios/chrome/browser/ui/tab_switcher", @@ -206,6 +210,7 @@ source_set("unit_tests") { "//ios/chrome/browser/web_state_list/web_usage_enabler", "//ios/chrome/test:block_cleanup_test", "//ios/chrome/test:test_support", + "//ios/public/provider/chrome/browser/signin:fake_chrome_identity", "//ios/web/common", "//ios/web/public/test", "//ios/web/public/test/fakes", @@ -215,7 +220,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/tab_switcher/tab_grid/grid/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_switcher/tab_grid/grid/BUILD.gn index e5165c4e352..98c12d053fb 100644 --- a/chromium/ios/chrome/browser/ui/tab_switcher/tab_grid/grid/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/tab_switcher/tab_grid/grid/BUILD.gn @@ -78,6 +78,7 @@ source_set("grid_ui") { "//ios/chrome/common/ui/colors", "//ios/chrome/common/ui/util", "//ios/public/provider/chrome/browser/modals:modals_api", + "//ios/third_party/material_components_ios", "//ui/base", ] } 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 a31438039ea..0afe5f94635 100644 --- a/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn @@ -98,7 +98,6 @@ source_set("unit_tests") { "table_view_header_footer_item_unittest.mm", "table_view_image_item_unittest.mm", "table_view_item_unittest.mm", - "table_view_link_header_footer_item_unittest.mm", "table_view_multi_detail_text_item_unittest.mm", "table_view_text_button_item_unittest.mm", "table_view_text_edit_item_unittest.mm", diff --git a/chromium/ios/chrome/browser/ui/tabs/BUILD.gn b/chromium/ios/chrome/browser/ui/tabs/BUILD.gn index 02a082409b6..62c63c13c5a 100644 --- a/chromium/ios/chrome/browser/ui/tabs/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/tabs/BUILD.gn @@ -26,6 +26,7 @@ source_set("tabs") { ] public_deps = [ "//ios/chrome/browser/tabs" ] deps = [ + ":constants", "resources:open_new_tab_background", "resources:tabstrip_background_tab", "resources:tabstrip_foreground_tab", @@ -95,6 +96,14 @@ source_set("coordinator") { ] } +source_set("constants") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "tab_strip_constants.h", + "tab_strip_constants.mm", + ] +} + source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true @@ -122,7 +131,6 @@ source_set("unit_tests") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -130,6 +138,7 @@ source_set("eg2_tests") { testonly = true sources = [ "tab_strip_egtest.mm" ] deps = [ + ":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", diff --git a/chromium/ios/chrome/browser/ui/text_fragments/BUILD.gn b/chromium/ios/chrome/browser/ui/text_fragments/BUILD.gn new file mode 100644 index 00000000000..4d3360dea7b --- /dev/null +++ b/chromium/ios/chrome/browser/ui/text_fragments/BUILD.gn @@ -0,0 +1,19 @@ +# Copyright 2021 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_fragments") { + sources = [ + "text_fragments_coordinator.h", + "text_fragments_coordinator.mm", + "text_fragments_mediator.h", + "text_fragments_mediator.mm", + ] + deps = [ + "//ios/chrome/browser/main:public", + "//ios/chrome/browser/ui/coordinators:chrome_coordinators", + "//ios/chrome/browser/web_state_list", + "//ios/web/public/text_fragments", + ] + configs += [ "//build/config/compiler:enable_arc" ] +} diff --git a/chromium/ios/chrome/browser/ui/thumb_strip/BUILD.gn b/chromium/ios/chrome/browser/ui/thumb_strip/BUILD.gn index 3fc0a5fd217..014621c857f 100644 --- a/chromium/ios/chrome/browser/ui/thumb_strip/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/thumb_strip/BUILD.gn @@ -49,7 +49,6 @@ source_set("feature_flags") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn index 65bf97a82a7..12d7724d1a1 100644 --- a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn @@ -159,7 +159,6 @@ source_set("unit_tests") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -178,14 +177,18 @@ source_set("eg_app_support+eg2") { } 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 = [ "adaptive_toolbar_app_interface.h" ] + sources = [ + "adaptive_toolbar_app_interface.h", + "adaptive_toolbar_app_interface_stub.mm", + ] + + deps = [ "//ios/third_party/earl_grey2:test_lib" ] } source_set("eg2_tests") { @@ -193,7 +196,6 @@ source_set("eg2_tests") { "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", ] - defines = [ "CHROME_EARL_GREY_2" ] testonly = true sources = [ "adaptive_toolbar_egtest.mm", diff --git a/chromium/ios/chrome/browser/ui/util/BUILD.gn b/chromium/ios/chrome/browser/ui/util/BUILD.gn index 73de8c46dab..276ba109f03 100644 --- a/chromium/ios/chrome/browser/ui/util/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/util/BUILD.gn @@ -184,7 +184,6 @@ bundle_data("terms_resources") { } source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", @@ -203,7 +202,6 @@ source_set("eg_app_support+eg2") { } source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/webui/BUILD.gn b/chromium/ios/chrome/browser/ui/webui/BUILD.gn index 49bd3b13f10..2ab192c46f6 100644 --- a/chromium/ios/chrome/browser/ui/webui/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/webui/BUILD.gn @@ -47,6 +47,7 @@ source_set("webui") { "//build:branding_buildflags", "//components/autofill/core/browser", "//components/crash/core/browser", + "//components/crash/core/common:reporter_running_ios", "//components/download/public/background_service:public", "//components/download/resources/download_internals:resources", "//components/flags_ui", @@ -131,7 +132,6 @@ source_set("webui_internal") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", diff --git a/chromium/ios/chrome/browser/ui/webui/interstitials/BUILD.gn b/chromium/ios/chrome/browser/ui/webui/interstitials/BUILD.gn index b63ff572580..00f434e4eb7 100644 --- a/chromium/ios/chrome/browser/ui/webui/interstitials/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/webui/interstitials/BUILD.gn @@ -44,7 +44,6 @@ source_set("constants") { } source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] configs += [ "//build/config/compiler:enable_arc", "//build/config/ios:xctest_config", |