diff options
Diffstat (limited to 'chromium/ios/chrome/browser/ui')
85 files changed, 607 insertions, 236 deletions
diff --git a/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn b/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn index 9980d20a138..b4fae70d8e8 100644 --- a/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn @@ -108,6 +108,8 @@ source_set("eg2_tests") { deps = [ "//components/strings", "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser/ui/popup_menu:constants", + "//ios/chrome/browser/ui/popup_menu/overflow_menu: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/activity_services/data/BUILD.gn b/chromium/ios/chrome/browser/ui/activity_services/data/BUILD.gn index 2299b741235..520aad07cf8 100644 --- a/chromium/ios/chrome/browser/ui/activity_services/data/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/activity_services/data/BUILD.gn @@ -26,6 +26,7 @@ source_set("data") { "//components/send_tab_to_self", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/find_in_page", + "//ios/chrome/browser/signin", "//ios/chrome/browser/snapshots", "//ios/chrome/browser/sync", "//ios/chrome/browser/tabs", diff --git a/chromium/ios/chrome/browser/ui/authentication/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/BUILD.gn index 759e8616d86..9b3f4a3ef9e 100644 --- a/chromium/ios/chrome/browser/ui/authentication/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/BUILD.gn @@ -16,8 +16,6 @@ source_set("authentication") { "authentication_ui_util.mm", "re_signin_infobar_delegate.h", "re_signin_infobar_delegate.mm", - "signed_in_accounts_view_controller.h", - "signed_in_accounts_view_controller.mm", "signin_notification_infobar_delegate.h", "signin_notification_infobar_delegate.mm", "signin_promo_view_mediator.h", @@ -35,6 +33,7 @@ source_set("authentication") { "//components/infobars/core", "//components/policy/core/common", "//components/prefs", + "//components/signin/ios/browser", "//components/signin/public/identity_manager", "//components/signin/public/identity_manager/objc", "//components/strings", @@ -53,7 +52,6 @@ source_set("authentication") { "//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", "//ios/chrome/browser/ui/infobars/resources:infobar_warning", "//ios/chrome/browser/ui/settings:settings_root", @@ -74,7 +72,6 @@ source_set("authentication") { public_deps = [ "//base", "//ios/chrome/browser/ui/authentication/signin:constants", - "//ios/chrome/browser/ui/collection_view", ] if (is_chrome_branded) { deps += [ "resources:signin_promo_logo_chrome_color" ] @@ -109,7 +106,6 @@ source_set("unit_tests") { "authentication_flow_unittest.mm", "authentication_ui_util_unittest.mm", "re_signin_infobar_delegate_unittest.mm", - "signed_in_accounts_view_controller_unittest.mm", "signin_promo_view_mediator_unittest.mm", "signout_action_sheet_coordinator_unittest.mm", ] @@ -124,7 +120,7 @@ source_set("unit_tests") { "//components/prefs", "//components/signin/public/identity_manager", "//components/signin/public/identity_manager:test_support", - "//components/sync/driver:test_support", + "//components/sync:test_support", "//components/sync_preferences", "//components/sync_preferences:test_support", "//components/variations", @@ -145,7 +141,6 @@ source_set("unit_tests") { "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/authentication/cells", "//ios/chrome/browser/ui/authentication/unified_consent:unified_consent_ui", - "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/table_view:styler", "//ios/chrome/browser/unified_consent", diff --git a/chromium/ios/chrome/browser/ui/authentication/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/cells/BUILD.gn index 5f2041e267f..c615966de14 100644 --- a/chromium/ios/chrome/browser/ui/authentication/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/cells/BUILD.gn @@ -32,7 +32,6 @@ source_set("cells") { "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/authentication/views", "//ios/chrome/browser/ui/collection_view/cells", - "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/settings/cells:public", "//ios/chrome/browser/ui/table_view:styler", @@ -78,7 +77,6 @@ source_set("unit_tests") { "//ios/chrome/browser/signin:test_support", "//ios/chrome/browser/sync", "//ios/chrome/browser/ui:feature_flags", - "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/table_view:styler", "//ios/chrome/browser/ui/table_view/cells", diff --git a/chromium/ios/chrome/browser/ui/authentication/signed_in_accounts/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/signed_in_accounts/BUILD.gn new file mode 100644 index 00000000000..fc9ba7be5e4 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/authentication/signed_in_accounts/BUILD.gn @@ -0,0 +1,57 @@ +# Copyright 2022 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("signed_in_accounts") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "signed_in_accounts_presentation_controller.h", + "signed_in_accounts_presentation_controller.mm", + "signed_in_accounts_table_view_controller.h", + "signed_in_accounts_table_view_controller.mm", + "signed_in_accounts_view_controller.h", + "signed_in_accounts_view_controller.mm", + ] + deps = [ + "//components/signin/public/identity_manager", + "//components/signin/public/identity_manager/objc", + "//ios/chrome/app/strings", + "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/signin", + "//ios/chrome/browser/ui/authentication/cells", + "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/image_util", + "//ios/chrome/browser/ui/table_view", + "//ios/chrome/browser/ui/util", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/util", + "//ios/public/provider/chrome/browser/signin", + ] + public_deps = [ "//base" ] + frameworks = [ "UIKit.framework" ] +} + +source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ "signed_in_accounts_view_controller_unittest.mm" ] + deps = [ + ":signed_in_accounts", + "//base", + "//base/test:test_support", + "//components/signin/public/identity_manager:test_support", + "//components/variations:test_support", + "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/signin", + "//ios/chrome/browser/signin:test_support", + "//ios/chrome/browser/sync", + "//ios/chrome/browser/sync:test_support", + "//ios/chrome/test:block_cleanup_test", + "//ios/chrome/test:test_support", + "//ios/public/provider/chrome/browser/signin:fake_chrome_identity", + "//ios/public/provider/chrome/browser/signin:test_support", + "//ios/web/public/test", + ] +} diff --git a/chromium/ios/chrome/browser/ui/authentication/signin/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/signin/BUILD.gn index 745bdca7ea7..ba60a8e8304 100644 --- a/chromium/ios/chrome/browser/ui/authentication/signin/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/signin/BUILD.gn @@ -122,6 +122,8 @@ source_set("eg2_tests") { "//base", "//base/test:test_support", "//components/policy:policy_code_generate", + "//components/signin/internal/identity_manager", + "//components/signin/ios/browser:features", "//components/signin/public/base", "//components/strings:components_strings_grit", "//ios/chrome/app/strings", @@ -131,11 +133,13 @@ source_set("eg2_tests") { "//ios/chrome/browser/policy:policy_util", "//ios/chrome/browser/ui/authentication:eg_test_support+eg2", "//ios/chrome/browser/ui/authentication/views:views_constants", + "//ios/chrome/browser/ui/bookmarks:eg_test_support+eg2", "//ios/chrome/browser/ui/content_suggestions:feature_flags", "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui_constants", "//ios/chrome/browser/ui/settings:constants", "//ios/chrome/browser/ui/settings/google_services:constants", "//ios/chrome/test/earl_grey:eg_test_support+eg2", + "//ios/public/provider/chrome/browser/signin", "//ios/public/provider/chrome/browser/signin:constants", "//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/authentication/signin/advanced_settings_signin/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/signin/advanced_settings_signin/BUILD.gn index 8737ef36bad..5c706ee68f4 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 @@ -57,7 +57,7 @@ source_set("unit_tests") { "//components/prefs", "//components/prefs:test_support", "//components/signin/public/identity_manager", - "//components/sync/driver:test_support", + "//components/sync:test_support", "//components/sync_preferences", "//components/sync_preferences:test_support", "//ios/chrome/app/strings", diff --git a/chromium/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_default_account/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_default_account/BUILD.gn index 8872d717f7d..e7e03eca530 100644 --- a/chromium/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_default_account/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_default_account/BUILD.gn @@ -17,6 +17,7 @@ source_set("consistency_default_account") { ] deps = [ "//components/prefs", + "//components/strings", "//ios/chrome/app/strings", "//ios/chrome/browser", "//ios/chrome/browser/main:public", 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 ea73680b6a9..d3f14768f49 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 @@ -51,6 +51,7 @@ source_set("eg2_tests") { "//ios/chrome/browser/ui/first_run:eg_test_support+eg2", "//ios/chrome/browser/ui/settings/google_services:constants", "//ios/chrome/common:string_util", + "//ios/chrome/common/ui/promo_style:constants", "//ios/chrome/test/earl_grey:eg_test_support+eg2", "//ios/public/provider/chrome/browser/signin:constants", "//ios/public/provider/chrome/browser/signin:fake_chrome_identity", diff --git a/chromium/ios/chrome/browser/ui/authentication/signin/trusted_vault_reauthentication/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/signin/trusted_vault_reauthentication/BUILD.gn index 9d09226230b..3d930f992cc 100644 --- a/chromium/ios/chrome/browser/ui/authentication/signin/trusted_vault_reauthentication/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/signin/trusted_vault_reauthentication/BUILD.gn @@ -16,10 +16,10 @@ source_set("trusted_vault_reauthentication") { "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser/main:public", "//ios/chrome/browser/signin", + "//ios/chrome/browser/signin:trusted_vault", + "//ios/chrome/browser/signin:trusted_vault_factory", "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/authentication/signin:signin_protected", - "//ios/public/provider/chrome/browser", - "//ios/public/provider/chrome/browser/signin", "//ui/base", ] public_deps = @@ -38,7 +38,9 @@ source_set("unit_tests") { "//ios/chrome/browser/main:test_support", "//ios/chrome/browser/signin", "//ios/chrome/browser/signin:test_support", + "//ios/chrome/browser/signin:trusted_vault_factory", "//ios/chrome/test:test_support", + "//ios/chrome/test/providers/signin:trusted_vault", "//ios/public/provider/chrome/browser/signin:fake_chrome_identity", "//ios/public/provider/chrome/browser/signin:test_support", "//ios/web/common:uikit", 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 eac4d108dc1..aca8c61fb3b 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 @@ -68,7 +68,7 @@ source_set("unit_tests") { "//components/consent_auditor:test_support", "//components/prefs", "//components/prefs:test_support", - "//components/sync/driver:test_support", + "//components/sync:test_support", "//components/sync_preferences", "//components/sync_preferences:test_support", "//ios/chrome/app/strings", diff --git a/chromium/ios/chrome/browser/ui/authentication/signin_sync/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/signin_sync/BUILD.gn index 9b340f36243..6ed075618ca 100644 --- a/chromium/ios/chrome/browser/ui/authentication/signin_sync/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/signin_sync/BUILD.gn @@ -87,8 +87,8 @@ source_set("unit_tests") { "//components/consent_auditor:test_support", "//components/prefs", "//components/signin/public/identity_manager", + "//components/sync:test_support", "//components/sync/driver", - "//components/sync/driver:test_support", "//components/unified_consent", "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/main:test_support", 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 35e10c4c447..14bb59283a4 100644 --- a/chromium/ios/chrome/browser/ui/authentication/unified_consent/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/unified_consent/BUILD.gn @@ -46,7 +46,6 @@ source_set("unified_consent_ui") { "//ios/chrome/browser/ui/authentication:authentication_constants", "//ios/chrome/browser/ui/authentication/unified_consent/identity_chooser:identity_chooser_ui", "//ios/chrome/browser/ui/authentication/views", - "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/util", "//ios/chrome/common:string_util", "//ios/chrome/common/ui/colors", diff --git a/chromium/ios/chrome/browser/ui/authentication/unified_consent/identity_chooser/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/unified_consent/identity_chooser/BUILD.gn index ba7edc7e843..37a59d0fbd8 100644 --- a/chromium/ios/chrome/browser/ui/authentication/unified_consent/identity_chooser/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/unified_consent/identity_chooser/BUILD.gn @@ -55,7 +55,6 @@ source_set("identity_chooser_ui") { "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/authentication/cells", "//ios/chrome/browser/ui/authentication/views", - "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/image_util", "//ios/chrome/browser/ui/list_model", "//ios/chrome/browser/ui/resources:menu_shadow", diff --git a/chromium/ios/chrome/browser/ui/autofill/BUILD.gn b/chromium/ios/chrome/browser/ui/autofill/BUILD.gn index 4b042daf752..3d4acdbf432 100644 --- a/chromium/ios/chrome/browser/ui/autofill/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/autofill/BUILD.gn @@ -47,7 +47,6 @@ source_set("autofill") { "//ios/chrome/browser/ui/autofill/manual_fill:manual_fill", "//ios/chrome/browser/ui/autofill/manual_fill:manual_fill_ui", "//ios/chrome/browser/ui/collection_view/cells", - "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web_state_list:web_state_list", "//ios/chrome/browser/webdata_services", @@ -73,16 +72,23 @@ source_set("bridges") { "card_name_fix_flow_view_bridge.mm", "card_unmask_prompt_view_bridge.h", "card_unmask_prompt_view_bridge.mm", + "card_unmask_prompt_view_controller.h", + "card_unmask_prompt_view_controller.mm", + "create_card_unmask_prompt_view_bridge.h", + "create_card_unmask_prompt_view_bridge.mm", + "legacy_card_unmask_prompt_view_bridge.h", + "legacy_card_unmask_prompt_view_bridge.mm", ] deps = [ ":autofill_ui", + ":features", "//base", "//components/autofill/core/browser", "//components/strings", "//ios/chrome/browser/ui/autofill/cells", "//ios/chrome/browser/ui/collection_view/cells", - "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/list_model", + "//ios/chrome/browser/ui/table_view:utils", "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/browser/ui/util", "//ios/chrome/common/ui/colors", @@ -90,7 +96,10 @@ source_set("bridges") { "//ios/web", "//ui/base", ] - public_deps = [ "//ios/chrome/browser/ui/collection_view" ] + public_deps = [ + "//ios/chrome/browser/ui/collection_view", + "//ios/chrome/browser/ui/table_view", + ] frameworks = [ "UIKit.framework" ] } @@ -111,7 +120,6 @@ source_set("autofill_ui") { "//ios/chrome/browser/infobars", "//ios/chrome/browser/infobars:public", "//ios/chrome/browser/ui:feature_flags", - "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/image_util", "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/util", @@ -237,3 +245,12 @@ source_set("eg_test_support+eg2") { "//ios/third_party/earl_grey2:test_lib", ] } + +source_set("features") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "features.cc", + "features.h", + ] + public_deps = [ "//base" ] +} diff --git a/chromium/ios/chrome/browser/ui/autofill/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/autofill/cells/BUILD.gn index 7d8689433dc..011e48d066d 100644 --- a/chromium/ios/chrome/browser/ui/autofill/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/autofill/cells/BUILD.gn @@ -6,6 +6,8 @@ source_set("cells") { sources = [ "autofill_edit_item.h", "autofill_edit_item.mm", + "cvc_header_item.h", + "cvc_header_item.mm", "cvc_item.h", "cvc_item.mm", "legacy_autofill_edit_item.h", @@ -28,7 +30,6 @@ source_set("cells") { "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/autofill:autofill_ui_type", "//ios/chrome/browser/ui/collection_view/cells", - "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/ntp:logo", "//ios/chrome/browser/ui/table_view:styler", "//ios/chrome/browser/ui/table_view/cells", @@ -47,6 +48,7 @@ source_set("cells") { source_set("unit_tests") { testonly = true sources = [ + "cvc_header_item_unittest.mm", "cvc_item_unittest.mm", "legacy_autofill_edit_item_unittest.mm", "status_item_unittest.mm", 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 784e0810d88..8b9a2e7552c 100644 --- a/chromium/ios/chrome/browser/ui/autofill/manual_fill/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/autofill/manual_fill/BUILD.gn @@ -174,6 +174,7 @@ source_set("unit_tests") { "//ios/chrome/browser/infobars", "//ios/chrome/browser/ui/autofill", "//ios/chrome/browser/ui/autofill:bridges", + "//ios/chrome/browser/ui/autofill:features", "//ios/chrome/browser/web_state_list:test_support", "//ios/chrome/browser/web_state_list:web_state_list", "//ios/chrome/test:test_support", diff --git a/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn index 3336bbce396..9fb924c7d70 100644 --- a/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn @@ -74,7 +74,6 @@ source_set("bookmarks") { "//ios/chrome/browser/ui/keyboard", "//ios/chrome/browser/ui/list_model", "//ios/chrome/browser/ui/main:scene_state_header", - "//ios/chrome/browser/ui/material_components", "//ios/chrome/browser/ui/menu", "//ios/chrome/browser/ui/sharing", "//ios/chrome/browser/ui/table_view", @@ -90,6 +89,7 @@ source_set("bookmarks") { "//ios/chrome/common/ui/favicon:favicon", "//ios/chrome/common/ui/favicon:favicon_constants", "//ios/chrome/common/ui/util", + "//ios/third_party/material_components_ios", "//ui/base", ] frameworks = [ "UIKit.framework" ] @@ -124,13 +124,12 @@ source_set("core") { "//ios/chrome/browser/bookmarks", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/main:public", - "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/default_promo:utils", - "//ios/chrome/browser/ui/material_components", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/ui/util:url_with_title", "//ios/chrome/browser/undo", "//ios/chrome/common/ui/colors", + "//ios/third_party/material_components_ios", "//ui/base", ] frameworks = [ "UIKit.framework" ] @@ -165,7 +164,6 @@ source_set("bookmarks_ui") { "//ios/chrome/browser/ui/icons", "//ios/chrome/browser/ui/image_util", "//ios/chrome/browser/ui/keyboard", - "//ios/chrome/browser/ui/material_components", "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/table_view:presentation", "//ios/chrome/browser/ui/table_view:styler", @@ -234,10 +232,13 @@ source_set("unit_tests") { "//ios/chrome/browser", "//ios/chrome/browser/bookmarks", "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/main:public", "//ios/chrome/browser/main:test_support", + "//ios/chrome/browser/ui/commands", "//ios/chrome/test:test_support", "//ios/web/public/test", "//testing/gtest", + "//third_party/ocmock:ocmock", ] } diff --git a/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn index f20db4d7ebc..9e3bbe90a2a 100644 --- a/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/bookmarks/cells/BUILD.gn @@ -27,7 +27,6 @@ source_set("cells") { "//ios/chrome/browser/ui/authentication/cells", "//ios/chrome/browser/ui/bookmarks:constants", "//ios/chrome/browser/ui/bookmarks:core", - "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/icons", "//ios/chrome/browser/ui/ntp:logo", "//ios/chrome/browser/ui/table_view:styler", diff --git a/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn b/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn index 5067fc8c71c..19a43fd1c4d 100644 --- a/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn @@ -11,11 +11,11 @@ source_set("browser_view") { "browser_view_controller+private.h", "browser_view_controller.h", "browser_view_controller.mm", - "browser_view_controller_helper.h", - "browser_view_controller_helper.mm", "common_tab_helper_delegate.h", "key_commands_provider.h", "key_commands_provider.mm", + "tab_events_mediator.h", + "tab_events_mediator.mm", "tab_lifecycle_mediator.h", "tab_lifecycle_mediator.mm", ] @@ -52,6 +52,8 @@ source_set("browser_view") { "//ios/chrome/browser/favicon", "//ios/chrome/browser/feature_engagement", "//ios/chrome/browser/find_in_page", + "//ios/chrome/browser/follow:browser_agent", + "//ios/chrome/browser/follow:service", "//ios/chrome/browser/follow:tab_helper", "//ios/chrome/browser/geolocation", "//ios/chrome/browser/infobars", @@ -95,7 +97,6 @@ source_set("browser_view") { "//ios/chrome/browser/ui/browser_container", "//ios/chrome/browser/ui/browser_container:ui", "//ios/chrome/browser/ui/bubble", - "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/content_suggestions", "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant", @@ -125,7 +126,6 @@ source_set("browser_view") { "//ios/chrome/browser/ui/infobars:public", "//ios/chrome/browser/ui/keyboard", "//ios/chrome/browser/ui/lens:coordinator", - "//ios/chrome/browser/ui/location_bar:location_bar_model_delegate", "//ios/chrome/browser/ui/main:default_browser_scene_agent", "//ios/chrome/browser/ui/main:scene_state_header", "//ios/chrome/browser/ui/main_content:main_content_ui", @@ -232,7 +232,6 @@ source_set("unit_tests") { testonly = true sources = [ "browser_coordinator_unittest.mm", - "browser_view_controller_helper_unittest.mm", "browser_view_controller_unittest.mm", "key_commands_provider_unittest.mm", ] @@ -251,6 +250,7 @@ source_set("unit_tests") { "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/download", "//ios/chrome/browser/favicon", + "//ios/chrome/browser/find_in_page", "//ios/chrome/browser/history", "//ios/chrome/browser/main:test_support", "//ios/chrome/browser/prerender", @@ -265,6 +265,7 @@ source_set("unit_tests") { "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/activity_services", "//ios/chrome/browser/ui/alert_coordinator", + "//ios/chrome/browser/ui/bookmarks", "//ios/chrome/browser/ui/browser_container:ui", "//ios/chrome/browser/ui/bubble", "//ios/chrome/browser/ui/commands", @@ -274,8 +275,11 @@ source_set("unit_tests") { "//ios/chrome/browser/ui/fullscreen:internal", "//ios/chrome/browser/ui/fullscreen/test", "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_scene_agent", + "//ios/chrome/browser/ui/keyboard", "//ios/chrome/browser/ui/main:scene_state_header", + "//ios/chrome/browser/ui/popup_menu", "//ios/chrome/browser/ui/sharing", + "//ios/chrome/browser/ui/side_swipe", "//ios/chrome/browser/ui/tab_switcher/tab_strip", "//ios/chrome/browser/ui/tabs:coordinator", "//ios/chrome/browser/ui/toolbar", @@ -293,6 +297,7 @@ source_set("unit_tests") { "//ios/chrome/test:block_cleanup_test", "//ios/chrome/test:test_support", "//ios/net", + "//ios/web/find_in_page", "//ios/web/public", "//ios/web/public/test", "//ios/web/public/test/fakes", @@ -320,7 +325,11 @@ source_set("eg2_tests") { "//base/test:test_support", "//components/strings", "//ios/chrome/app/strings", + "//ios/chrome/browser:pref_names", "//ios/chrome/browser/ntp:features", + "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/browser/ui/content_suggestions:constants", + "//ios/chrome/browser/ui/content_suggestions:feature_flags", "//ios/chrome/browser/ui/popup_menu:constants", "//ios/chrome/browser/ui/start_surface:feature_flags", "//ios/chrome/test:eg_test_support+eg2", diff --git a/chromium/ios/chrome/browser/ui/bubble/BUILD.gn b/chromium/ios/chrome/browser/ui/bubble/BUILD.gn index cf5d5744c38..a3182f751c4 100644 --- a/chromium/ios/chrome/browser/ui/bubble/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/bubble/BUILD.gn @@ -23,9 +23,9 @@ source_set("bubble") { "//components/feature_engagement/public", "//ios/chrome/app/strings", "//ios/chrome/browser:chrome_url_constants", + "//ios/chrome/browser:utils", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/feature_engagement", - "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/icons:symbols", "//ios/chrome/browser/ui/util", diff --git a/chromium/ios/chrome/browser/ui/collection_view/BUILD.gn b/chromium/ios/chrome/browser/ui/collection_view/BUILD.gn index 51ea6c13a69..31a807be01b 100644 --- a/chromium/ios/chrome/browser/ui/collection_view/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/collection_view/BUILD.gn @@ -13,7 +13,6 @@ source_set("collection_view") { deps = [ "//base", "//ios/chrome/browser/ui/list_model", - "//ios/chrome/browser/ui/material_components", "//ios/chrome/common/ui/colors", ] public_deps = [ diff --git a/chromium/ios/chrome/browser/ui/collection_view/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/collection_view/cells/BUILD.gn index 4fcdc474b58..2846030e338 100644 --- a/chromium/ios/chrome/browser/ui/collection_view/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/collection_view/cells/BUILD.gn @@ -21,9 +21,7 @@ source_set("cells") { "//base", "//ios/chrome/app/strings", "//ios/chrome/browser", - "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/list_model", - "//ios/chrome/browser/ui/material_components", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/ui/util", "//ios/chrome/common", diff --git a/chromium/ios/chrome/browser/ui/colors/BUILD.gn b/chromium/ios/chrome/browser/ui/colors/BUILD.gn deleted file mode 100644 index 42e057fbe3d..00000000000 --- a/chromium/ios/chrome/browser/ui/colors/BUILD.gn +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2016 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -source_set("colors") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "MDCPalette+CrAdditions.h", - "MDCPalette+CrAdditions.mm", - ] - deps = [ "//ios/web" ] - public_deps = [ "//ios/third_party/material_components_ios" ] -} diff --git a/chromium/ios/chrome/browser/ui/commands/BUILD.gn b/chromium/ios/chrome/browser/ui/commands/BUILD.gn index 6b1f8372335..327cb9f6dc0 100644 --- a/chromium/ios/chrome/browser/ui/commands/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/commands/BUILD.gn @@ -54,6 +54,7 @@ source_set("commands") { ] deps = [ + "//ios/chrome/browser/tabs", "//ios/chrome/browser/ui/util:url_with_title", "//ios/public/provider/chrome/browser/user_feedback", "//ios/web", diff --git a/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn b/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn index f22ac7e7fb2..73c36424f1c 100644 --- a/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn @@ -2,6 +2,28 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +source_set("start_suggest") { + sources = [ + "start_suggest_service_factory.h", + "start_suggest_service_factory.mm", + "start_suggest_service_response_bridge.h", + "start_suggest_service_response_bridge.mm", + ] + deps = [ + "//base", + "//components/keyed_service/core", + "//components/keyed_service/ios", + "//components/prefs", + "//components/search:start_suggest", + "//ios/chrome/browser:chrome_url_constants", + "//ios/chrome/browser/autocomplete", + "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/search_engines", + "//services/network/public/cpp", + ] + configs += [ "//build/config/compiler:enable_arc" ] +} + source_set("content_suggestions") { sources = [ "content_suggestions_category_wrapper.h", @@ -22,6 +44,7 @@ source_set("content_suggestions") { ":feature_flags", ":metrics", ":public", + ":start_suggest", "//base", "//components/favicon/core", "//components/favicon/ios", @@ -34,6 +57,7 @@ source_set("content_suggestions") { "//components/prefs/ios", "//components/reading_list/core", "//components/reading_list/ios:ios", + "//components/search:start_suggest", "//components/search_engines:search_engines", "//components/signin/public/identity_manager", "//components/signin/public/identity_manager/objc", @@ -95,6 +119,7 @@ source_set("content_suggestions") { "//ui/strings", ] configs += [ "//build/config/compiler:enable_arc" ] + public_deps = [ "//ios/third_party/material_components_ios" ] } source_set("metrics") { @@ -120,22 +145,17 @@ source_set("constants") { source_set("public") { sources = [ "content_suggestions_menu_provider.h" ] - public_deps = [ "//ios/third_party/material_components_ios" ] configs += [ "//build/config/compiler:enable_arc" ] } source_set("content_suggestions_ui") { sources = [ - "content_suggestions_collection_consumer.h", "content_suggestions_collection_controlling.h", "content_suggestions_collection_synchronizing.h", - "content_suggestions_collection_view_controller.h", - "content_suggestions_collection_view_controller.mm", "content_suggestions_commands.h", "content_suggestions_consumer.h", "content_suggestions_header_commands.h", "content_suggestions_header_controlling.h", - "content_suggestions_header_provider.h", "content_suggestions_header_synchronizer.h", "content_suggestions_header_synchronizer.mm", "content_suggestions_header_synchronizing.h", @@ -144,8 +164,6 @@ source_set("content_suggestions_ui") { "content_suggestions_header_view_controller.h", "content_suggestions_header_view_controller.mm", "content_suggestions_header_view_controller_delegate.h", - "content_suggestions_layout.h", - "content_suggestions_layout.mm", "content_suggestions_view_controller.h", "content_suggestions_view_controller.mm", "content_suggestions_view_controller_audience.h", @@ -168,6 +186,7 @@ source_set("content_suggestions_ui") { "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/collection_view", "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/content_suggestions:metrics", "//ios/chrome/browser/ui/content_suggestions/cells", "//ios/chrome/browser/ui/content_suggestions/cells:constants", "//ios/chrome/browser/ui/content_suggestions/identifier", @@ -175,6 +194,7 @@ source_set("content_suggestions_ui") { "//ios/chrome/browser/ui/list_model", "//ios/chrome/browser/ui/ntp", "//ios/chrome/browser/ui/ntp:logo", + "//ios/chrome/browser/ui/omnibox:features", "//ios/chrome/browser/ui/omnibox:omnibox_internal", "//ios/chrome/browser/ui/omnibox:omnibox_popup_shared", "//ios/chrome/browser/ui/start_surface:feature_flags", @@ -190,10 +210,7 @@ source_set("content_suggestions_ui") { "//ios/web/common", "//ui/base", ] - public_deps = [ - ":content_suggestions_ui_util", - "//ios/third_party/material_components_ios", - ] + public_deps = [ ":content_suggestions_ui_util" ] configs += [ "//build/config/compiler:enable_arc" ] } @@ -229,7 +246,6 @@ source_set("content_suggestions_ui_util") { "//ios/chrome/common/ui/colors", "//ios/chrome/common/ui/util", "//ios/components/ui_util", - "//ios/third_party/material_components_ios", "//ios/web/common", "//ui/base", ] @@ -255,7 +271,10 @@ source_set("unit_tests") { "//components/favicon/core/test:test_support", "//components/ntp_snippets", "//components/ntp_tiles", + "//components/omnibox/browser:test_support", "//components/reading_list/core", + "//components/search", + "//components/search_engines", "//components/signin/public/identity_manager", "//components/sync_preferences:test_support", "//ios/chrome/browser", @@ -263,6 +282,7 @@ source_set("unit_tests") { "//ios/chrome/browser/favicon", "//ios/chrome/browser/main:public", "//ios/chrome/browser/main:test_support", + "//ios/chrome/browser/ntp", "//ios/chrome/browser/ntp_snippets", "//ios/chrome/browser/reading_list", "//ios/chrome/browser/search_engines", @@ -292,6 +312,7 @@ source_set("unit_tests") { "//ios/testing:block_swizzler", "//ios/web/public/test", "//ios/web/public/test/fakes", + "//services/network:test_support", "//testing/gtest", "//testing/gtest", "//third_party/ocmock", 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 8c55420fcf4..d6b0d1b80b6 100644 --- a/chromium/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn @@ -5,24 +5,16 @@ source_set("cells") { sources = [ "content_suggestions_gesture_commands.h", - "content_suggestions_header_item.h", - "content_suggestions_header_item.mm", "content_suggestions_module_container.h", "content_suggestions_module_container.mm", - "content_suggestions_most_visited_action_cell.h", - "content_suggestions_most_visited_action_cell.mm", "content_suggestions_most_visited_action_item.h", "content_suggestions_most_visited_action_item.mm", - "content_suggestions_most_visited_cell.h", - "content_suggestions_most_visited_cell.mm", "content_suggestions_most_visited_constants.h", "content_suggestions_most_visited_constants.mm", "content_suggestions_most_visited_item.h", "content_suggestions_most_visited_item.mm", "content_suggestions_most_visited_tile_view.h", "content_suggestions_most_visited_tile_view.mm", - "content_suggestions_parent_item.h", - "content_suggestions_parent_item.mm", "content_suggestions_return_to_recent_tab_item.h", "content_suggestions_return_to_recent_tab_item.mm", "content_suggestions_return_to_recent_tab_view.h", @@ -40,6 +32,8 @@ source_set("cells") { "content_suggestions_whats_new_item.mm", "content_suggestions_whats_new_view.h", "content_suggestions_whats_new_view.mm", + "query_suggestion_view.h", + "query_suggestion_view.mm", "suggested_content.h", ] deps = [ @@ -54,7 +48,6 @@ source_set("cells") { "//ios/chrome/app/strings", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/collection_view", - "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/content_suggestions:constants", "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant", "//ios/chrome/browser/ui/content_suggestions:content_suggestions_ui_util", @@ -63,7 +56,7 @@ source_set("cells") { "//ios/chrome/browser/ui/content_suggestions/identifier", "//ios/chrome/browser/ui/icons:symbols", "//ios/chrome/browser/ui/image_util", - "//ios/chrome/browser/ui/material_components", + "//ios/chrome/browser/ui/resources:module_shadow", "//ios/chrome/browser/ui/util", "//ios/chrome/common:string_util", "//ios/chrome/common:timing", @@ -72,11 +65,9 @@ source_set("cells") { "//ios/chrome/common/ui/table_view:cells_constants", "//ios/chrome/common/ui/util", "//ios/chrome/common/ui/util:dynamic_type_util", - "//ios/third_party/material_components_ios", "//ui/base", "//url", ] - public_deps = [ "//ios/third_party/material_components_ios" ] configs += [ "//build/config/compiler:enable_arc" ] } @@ -91,19 +82,15 @@ source_set("constants") { deps = [ "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser/ui/content_suggestions:feature_flags", "//ios/chrome/browser/ui/icons:symbols", - "//ios/third_party/material_components_ios", "//ui/base:base", ] } source_set("unit_tests") { testonly = true - sources = [ - "content_suggestions_header_item_unittest.mm", - "content_suggestions_tile_layout_util_unittest.mm", - "content_suggestions_whats_new_item_unittest.mm", - ] + sources = [ "content_suggestions_tile_layout_util_unittest.mm" ] deps = [ ":cells", "//base", diff --git a/chromium/ios/chrome/browser/ui/context_menu/BUILD.gn b/chromium/ios/chrome/browser/ui/context_menu/BUILD.gn index 199c6b2a805..36cbc884de2 100644 --- a/chromium/ios/chrome/browser/ui/context_menu/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/context_menu/BUILD.gn @@ -32,6 +32,7 @@ source_set("context_menu") { "//ios/chrome/browser/ui/util", "//ios/chrome/browser/ui/util:url_with_title", "//ios/chrome/browser/url_loading", + "//ios/chrome/browser/web", "//ios/chrome/browser/web/image_fetch", "//ios/chrome/browser/web_state_list", "//ios/chrome/common/ui/favicon:favicon_constants", @@ -93,6 +94,7 @@ source_set("eg2_tests") { "//components/url_param_filter/core", "//components/url_param_filter/core:test_support", "//ios/chrome/app/strings", + "//ios/chrome/browser/metrics:eg_test_support+eg2", "//ios/chrome/browser/ui/fullscreen:feature_flags", "//ios/chrome/browser/ui/fullscreen/test:eg_test_support+eg2", "//ios/chrome/test:eg_test_support+eg2", diff --git a/chromium/ios/chrome/browser/ui/download/BUILD.gn b/chromium/ios/chrome/browser/ui/download/BUILD.gn index 76cccf05bae..3fafa7ab1be 100644 --- a/chromium/ios/chrome/browser/ui/download/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/download/BUILD.gn @@ -49,7 +49,6 @@ source_set("download") { "//ios/chrome/browser/store_kit", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/alert_coordinator", - "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/download/activities", diff --git a/chromium/ios/chrome/browser/ui/elements/BUILD.gn b/chromium/ios/chrome/browser/ui/elements/BUILD.gn index 3d3a2ff1771..cabf1ef0ab0 100644 --- a/chromium/ios/chrome/browser/ui/elements/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/elements/BUILD.gn @@ -29,14 +29,22 @@ source_set("elements") { deps = [ "//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:string_util", "//ios/chrome/common/ui/colors", "//ios/chrome/common/ui/util", "//ios/chrome/common/ui/util:dynamic_type_util", + "//ios/third_party/material_components_ios", + ] +} + +source_set("constants") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "elements_constants.h", + "elements_constants.mm", ] + deps = [ "//base" ] } source_set("unit_tests") { @@ -76,11 +84,11 @@ source_set("elements_internal") { "chrome_activity_overlay_view_controller.mm", ] deps = [ + ":constants", "//base", "//ios/chrome/browser", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/main:scene_state_header", - "//ios/chrome/browser/ui/material_components", "//ios/chrome/browser/ui/scoped_ui_blocker:scoped_ui_blocker", "//ios/chrome/browser/ui/util", "//ios/chrome/common/ui/colors", diff --git a/chromium/ios/chrome/browser/ui/fancy_ui/BUILD.gn b/chromium/ios/chrome/browser/ui/fancy_ui/BUILD.gn index 5e7a20b2980..9249ab67bd7 100644 --- a/chromium/ios/chrome/browser/ui/fancy_ui/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/fancy_ui/BUILD.gn @@ -5,8 +5,6 @@ source_set("fancy_ui") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ - "bidi_container_view.h", - "bidi_container_view.mm", "primary_action_button.h", "primary_action_button.mm", ] @@ -14,22 +12,9 @@ source_set("fancy_ui") { "//base", "//base:i18n", "//ios/chrome/browser/ui:feature_flags", - "//ios/chrome/browser/ui/colors", "//ios/chrome/common/ui/colors", "//ios/chrome/common/ui/util", ] public_deps = [ "//ios/third_party/material_components_ios" ] frameworks = [ "UIKit.framework" ] } - -source_set("unit_tests") { - testonly = true - sources = [ "bidi_container_view_unittest.mm" ] - deps = [ - ":fancy_ui", - "//base", - "//base:i18n", - "//testing/gtest", - ] - configs += [ "//build/config/compiler:enable_arc" ] -} diff --git a/chromium/ios/chrome/browser/ui/first_run/BUILD.gn b/chromium/ios/chrome/browser/ui/first_run/BUILD.gn index 20d2d108bf3..99d3e0c0d18 100644 --- a/chromium/ios/chrome/browser/ui/first_run/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/first_run/BUILD.gn @@ -9,6 +9,8 @@ source_set("field_trial") { "fre_field_trial.h", "ios_first_run_field_trials.cc", "ios_first_run_field_trials.h", + "trending_queries_field_trial.cc", + "trending_queries_field_trial.h", ] deps = [ "//base", @@ -18,6 +20,7 @@ source_set("field_trial") { "//components/version_info", "//ios/chrome/browser/first_run", "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/browser/ui/content_suggestions:feature_flags", "//ios/chrome/common", ] } @@ -163,10 +166,8 @@ source_set("static_file_ui") { "//ios/chrome/app/strings", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/ui/icons", - "//ios/chrome/browser/ui/material_components", "//ios/chrome/browser/ui/util", "//ios/chrome/common/ui/colors", - "//ios/third_party/material_components_ios", "//ios/web/common:web_view_creation_util", ] } @@ -190,9 +191,12 @@ source_set("unit_tests") { testonly = true sources = [ "first_run_util_unittest.mm", + "fre_field_trial_unittest.mm", + "trending_queries_field_trial_unittest.mm", "welcome_to_chrome_view_controller_unittest.mm", ] deps = [ + ":field_trial", ":first_run", ":utils", "//base", @@ -201,9 +205,12 @@ source_set("unit_tests") { "//components/policy/core/common:common_constants", "//components/prefs", "//components/prefs:test_support", + "//components/variations", "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/main:test_support", + "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/authentication", + "//ios/chrome/browser/ui/content_suggestions:feature_flags", "//ios/chrome/browser/ui/fancy_ui", "//ios/chrome/browser/ui/util", "//ios/chrome/test:test_support", @@ -224,7 +231,10 @@ source_set("eg2_tests") { ] testonly = true sources = [ + "enterprise_loading_screen_egtest.mm", "first_run_egtest.mm", + "first_run_two_steps_egtest.mm", + "first_run_uma_dialog_egtest.mm", "legacy_first_run_egtest.mm", ] deps = [ @@ -233,12 +243,17 @@ source_set("eg2_tests") { ":field_trial", "//base", "//base/test:test_support", + "//components/enterprise", + "//components/enterprise:test_support", "//components/policy:policy_code_generate", "//components/policy/core/common:common_constants", + "//components/policy/test_support:test_support", "//components/signin/ios/browser:features", + "//ios/chrome/app/strings", "//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/policy:policy_util", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/authentication:authentication_constants", "//ios/chrome/browser/ui/authentication:eg_test_support+eg2", @@ -247,6 +262,7 @@ source_set("eg2_tests") { "//ios/chrome/browser/ui/settings/google_services:constants", "//ios/chrome/common:string_util", "//ios/chrome/common/ui/promo_style:constants", + "//ios/chrome/common/ui/table_view:cells_constants", "//ios/chrome/test/earl_grey:eg_test_support+eg2", "//ios/chrome/test/earl_grey:switches", "//ios/public/provider/chrome/browser/signin:constants", 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 e186179a124..26cb01c62b1 100644 --- a/chromium/ios/chrome/browser/ui/first_run/signin/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/first_run/signin/BUILD.gn @@ -14,6 +14,7 @@ source_set("signin") { ":signin_ui", "//components/metrics", "//components/prefs", + "//components/web_resource", "//ios/chrome/browser:application_context", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/first_run", 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 459787fa726..f47bfdccc32 100644 --- a/chromium/ios/chrome/browser/ui/first_run/sync/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/first_run/sync/BUILD.gn @@ -80,7 +80,7 @@ source_set("unit_tests") { "//base/test:test_support", "//components/consent_auditor:test_support", "//components/prefs", - "//components/sync/driver:test_support", + "//components/sync:test_support", "//components/unified_consent", "//ios/chrome/app/application_delegate:app_state_header", "//ios/chrome/browser/browser_state:test_support", diff --git a/chromium/ios/chrome/browser/ui/first_run/welcome/BUILD.gn b/chromium/ios/chrome/browser/ui/first_run/welcome/BUILD.gn index f0c7edfcefe..80bbcd837bd 100644 --- a/chromium/ios/chrome/browser/ui/first_run/welcome/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/first_run/welcome/BUILD.gn @@ -14,10 +14,12 @@ source_set("welcome") { ":welcome_ui", "//base", "//components/metrics", + "//components/strings:components_strings_grit", "//ios/chrome/app/strings", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/first_run", "//ios/chrome/browser/main:public", + "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", @@ -49,6 +51,7 @@ source_set("welcome_ui") { "//base", "//components/metrics", "//components/prefs", + "//components/web_resource", "//ios/chrome/app/strings", "//ios/chrome/browser", "//ios/chrome/browser/ui/commands", @@ -69,3 +72,14 @@ source_set("welcome_ui") { ] frameworks = [ "UIKit.framework" ] } + +source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ "tos_unittest.mm" ] + deps = [ + ":welcome", + "//testing/gtest", + "//third_party/ocmock", + ] +} diff --git a/chromium/ios/chrome/browser/ui/follow/BUILD.gn b/chromium/ios/chrome/browser/ui/follow/BUILD.gn index d17687a2eb0..07eaa36aacd 100644 --- a/chromium/ios/chrome/browser/ui/follow/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/follow/BUILD.gn @@ -5,9 +5,6 @@ source_set("follow") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ - "follow_block_types.h", - "follow_web_page_urls.h", - "follow_web_page_urls.mm", "followed_web_channel.h", "followed_web_channel.mm", ] @@ -46,6 +43,7 @@ source_set("first_follow") { "//ios/chrome/browser/discover_feed", "//ios/chrome/browser/discover_feed:discover_feed_factory", "//ios/chrome/browser/favicon", + "//ios/chrome/browser/follow:service", "//ios/chrome/browser/main:public", "//ios/chrome/browser/net:crurl", "//ios/chrome/browser/ui/commands", @@ -59,7 +57,6 @@ source_set("first_follow") { source_set("first_follow_ui") { sources = [ - "first_follow_favicon_data_source.h", "first_follow_view_controller.h", "first_follow_view_controller.mm", ] diff --git a/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn b/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn index ea5fa55cc06..d196cb6e895 100644 --- a/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/fullscreen/BUILD.gn @@ -174,6 +174,8 @@ source_set("eg2_tests") { deps = [ "//base", "//base/test:test_support", + "//components/translate/core/browser:translate_pref_names", + "//ios/chrome/browser/ui/fullscreen:feature_flags", "//ios/chrome/browser/ui/fullscreen/test:eg_test_support+eg2", "//ios/chrome/browser/ui/util", "//ios/chrome/test:eg_test_support+eg2", diff --git a/chromium/ios/chrome/browser/ui/icons/BUILD.gn b/chromium/ios/chrome/browser/ui/icons/BUILD.gn index bdbb23f363f..13c59213b07 100644 --- a/chromium/ios/chrome/browser/ui/icons/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/icons/BUILD.gn @@ -60,6 +60,29 @@ source_set("item_icons") { frameworks = [ "UIKit.framework" ] } +source_set("custom_symbols") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "custom_symbol.h", + "custom_symbol.mm", + ] + deps = [ + "//ios/chrome/common/ui/table_view:cells_constants", + "//ios/chrome/common/ui/util:image_util", + ] + frameworks = [ "UIKit.framework" ] +} + +source_set("settings_icons") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "settings_icon.h", + "settings_icon.mm", + ] + deps = [ ":symbols" ] + frameworks = [ "UIKit.framework" ] +} + source_set("symbols") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ @@ -75,6 +98,8 @@ source_set("symbols") { "//ios/chrome/browser/ui/icons/resources:camera_fill", "//ios/chrome/browser/ui/icons/resources:incognito", "//ios/chrome/browser/ui/icons/resources:incognito_circle_fill", + "//ios/chrome/browser/ui/icons/resources:photo_badge_magnifyingglass", + "//ios/chrome/browser/ui/icons/resources:photo_badge_plus", "//ios/chrome/browser/ui/icons/resources:plus_circle_fill", "//ios/chrome/browser/ui/icons/resources:popup_badge_minus", "//ios/chrome/browser/ui/icons/resources:square_number", diff --git a/chromium/ios/chrome/browser/ui/icons/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/icons/resources/BUILD.gn index 7d4bb698401..390d721c402 100644 --- a/chromium/ios/chrome/browser/ui/icons/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/icons/resources/BUILD.gn @@ -73,3 +73,16 @@ symbolset("popup_badge_minus") { "popup_badge_minus.symbolset/popup.badge.minus.cr.svg", ] } + +symbolset("photo_badge_plus") { + sources = [ + "photo_badge_plus.symbolset/Contents.json", + "photo_badge_plus.symbolset/photo.badge.plus.cr.svg", + ] +} +symbolset("photo_badge_magnifyingglass") { + sources = [ + "photo_badge_magnifyingglass.symbolset/Contents.json", + "photo_badge_magnifyingglass.symbolset/photo.badge.magnifyingglass.cr.svg", + ] +} diff --git a/chromium/ios/chrome/browser/ui/incognito_interstitial/BUILD.gn b/chromium/ios/chrome/browser/ui/incognito_interstitial/BUILD.gn new file mode 100644 index 00000000000..4b89df34238 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/incognito_interstitial/BUILD.gn @@ -0,0 +1,79 @@ +# Copyright 2022 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("constants") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "incognito_interstitial_constants.h", + "incognito_interstitial_constants.mm", + ] +} + +source_set("incognito_interstitial_ui") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "incognito_interstitial_view_controller.h", + "incognito_interstitial_view_controller.mm", + "incognito_interstitial_view_controller_delegate.h", + ] + deps = [ + ":constants", + "resources:incognito_interstitial_screen_banner", + "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/browser/ui/elements:elements", + "//ios/chrome/browser/ui/ntp:ntp_internal", + "//ios/chrome/browser/ui/util:util", + "//ios/chrome/common/ui/colors:colors", + "//ios/chrome/common/ui/promo_style:promo_style", + "//ios/chrome/common/ui/util:util", + "//ui/base:base", + ] + frameworks = [ "UIKit.framework" ] +} + +source_set("incognito_interstitial") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "incognito_interstitial_coordinator.h", + "incognito_interstitial_coordinator.mm", + "incognito_interstitial_coordinator_delegate.h", + ] + deps = [ + ":constants", + ":incognito_interstitial_ui", + "//base:base", + "//ios/chrome/app:mode", + "//ios/chrome/app/application_delegate:tab_opening", + "//ios/chrome/browser/ui/coordinators:chrome_coordinators", + "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_scene_agent", + "//ios/chrome/browser/ui/main:scene_state_header", + "//ios/chrome/browser/ui/ntp:ntp_internal", + "//ios/chrome/browser/url_loading:url_loading", + "//ios/chrome/browser/url_loading:url_loading_params_header", + ] + frameworks = [ "UIKit.framework" ] +} + +source_set("eg2_tests") { + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + testonly = true + sources = [ "incognito_interstitial_egtest.mm" ] + deps = [ + "//components/policy:generated", + "//ios/chrome/browser:pref_names", + "//ios/chrome/browser/policy:eg_test_support+eg2", + "//ios/chrome/browser/policy:policy_util", + "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/test:eg_test_support+eg2", + "//ios/chrome/test/earl_grey:eg_test_support+eg2", + "//ios/testing/earl_grey:eg_test_support+eg2", + "//ios/third_party/earl_grey2:test_lib", + "//net:test_support", + ] + frameworks = [ "UIKit.framework" ] +} diff --git a/chromium/ios/chrome/browser/ui/incognito_interstitial/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/incognito_interstitial/resources/BUILD.gn new file mode 100644 index 00000000000..2990d945330 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/incognito_interstitial/resources/BUILD.gn @@ -0,0 +1,14 @@ +# Copyright 2022 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("incognito_interstitial_screen_banner") { + sources = [ + "incognito_interstitial_screen_banner.imageset/Contents.json", + "incognito_interstitial_screen_banner.imageset/incognito_interstitial_screen_banner@1x.png", + "incognito_interstitial_screen_banner.imageset/incognito_interstitial_screen_banner@2x.png", + "incognito_interstitial_screen_banner.imageset/incognito_interstitial_screen_banner@3x.png", + ] +} diff --git a/chromium/ios/chrome/browser/ui/infobars/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/BUILD.gn index 761d32820d8..0f35b6001ca 100644 --- a/chromium/ios/chrome/browser/ui/infobars/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/infobars/BUILD.gn @@ -3,7 +3,7 @@ # found in the LICENSE file. source_set("public") { - sources = [ "infobar_positioner.h" ] + sources = [] } source_set("constants") { diff --git a/chromium/ios/chrome/browser/ui/lens/BUILD.gn b/chromium/ios/chrome/browser/ui/lens/BUILD.gn index 412b1ec5bc9..d5b8125ba78 100644 --- a/chromium/ios/chrome/browser/ui/lens/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/lens/BUILD.gn @@ -9,12 +9,14 @@ source_set("coordinator") { "lens_coordinator.mm", ] deps = [ + ":lens_entrypoint", "//ios/chrome/browser/browser_state:browser_state", "//ios/chrome/browser/main:public", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/url_loading", "//ios/public/provider/chrome/browser/lens:lens_api", + "//ios/web/public/navigation", ] } @@ -26,3 +28,12 @@ source_set("lens_availability") { ] deps = [] } + +source_set("lens_entrypoint") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "lens_entrypoint.h", + "lens_entrypoint.mm", + ] + deps = [] +} diff --git a/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn b/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn index 5794f082fc4..65c1a726d41 100644 --- a/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn @@ -22,6 +22,7 @@ source_set("location_bar") { ] deps = [ ":constants", + ":location_bar_model_delegate", "resources:location_bar_connection_dangerous", "resources:location_bar_connection_info", "resources:location_bar_connection_offline", @@ -35,7 +36,6 @@ source_set("location_bar") { "//components/search_engines", "//components/security_state/ios", "//components/strings", - "//components/variations/net", "//ios/chrome/app/strings", "//ios/chrome/app/theme", "//ios/chrome/browser", diff --git a/chromium/ios/chrome/browser/ui/main/BUILD.gn b/chromium/ios/chrome/browser/ui/main/BUILD.gn index 1446f7623fe..0e8d287f978 100644 --- a/chromium/ios/chrome/browser/ui/main/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/main/BUILD.gn @@ -111,8 +111,6 @@ source_set("scene") { "scene_delegate.h", "scene_delegate.mm", "scene_state.mm", - "signin_policy_scene_agent.h", - "signin_policy_scene_agent.mm", "ui_blocker_scene_agent.h", "ui_blocker_scene_agent.mm", ] @@ -137,6 +135,7 @@ source_set("scene") { "//components/signin/public/identity_manager", "//components/signin/public/identity_manager/objc", "//components/url_formatter", + "//components/url_param_filter/core", "//components/version_info", "//components/web_resource", "//ios/chrome/app:app", @@ -156,8 +155,6 @@ source_set("scene") { "//ios/chrome/browser/crash_report:crash_report_internal", "//ios/chrome/browser/crash_report/breadcrumbs", "//ios/chrome/browser/default_browser", - "//ios/chrome/browser/discover_feed", - "//ios/chrome/browser/discover_feed:discover_feed_factory", "//ios/chrome/browser/first_run", "//ios/chrome/browser/geolocation", "//ios/chrome/browser/infobars", @@ -167,6 +164,8 @@ source_set("scene") { "//ios/chrome/browser/ntp:features", "//ios/chrome/browser/policy", "//ios/chrome/browser/policy:policy_util", + "//ios/chrome/browser/promos_manager:features", + "//ios/chrome/browser/promos_manager:promos_manager_scene_agent", "//ios/chrome/browser/screenshot", "//ios/chrome/browser/sessions:scene_util", "//ios/chrome/browser/sessions:session_saving", @@ -176,6 +175,7 @@ source_set("scene") { "//ios/chrome/browser/ui/appearance", "//ios/chrome/browser/ui/authentication", "//ios/chrome/browser/ui/authentication/enterprise:enterprise_utils", + "//ios/chrome/browser/ui/authentication/signed_in_accounts", "//ios/chrome/browser/ui/authentication/signin", "//ios/chrome/browser/ui/blocking_overlay", "//ios/chrome/browser/ui/browser_view", @@ -186,6 +186,7 @@ source_set("scene") { "//ios/chrome/browser/ui/first_run:field_trial", "//ios/chrome/browser/ui/first_run:utils", "//ios/chrome/browser/ui/history", + "//ios/chrome/browser/ui/incognito_interstitial:incognito_interstitial", "//ios/chrome/browser/ui/incognito_reauth:incognito_reauth_scene_agent", "//ios/chrome/browser/ui/main:browser_interface_provider", "//ios/chrome/browser/ui/ntp:feature_flags", @@ -199,8 +200,6 @@ source_set("scene") { "//ios/chrome/browser/ui/thumb_strip:feature_flags", "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/util", - "//ios/chrome/browser/ui/util:features", - "//ios/chrome/browser/ui/util:util_swift", "//ios/chrome/browser/url_loading", "//ios/chrome/browser/web_state_list", "//ios/chrome/browser/web_state_list:agents", @@ -212,6 +211,7 @@ source_set("scene") { "//ios/public/provider/chrome/browser/signin", "//ios/public/provider/chrome/browser/ui_utils:ui_utils_api", "//ios/public/provider/chrome/browser/user_feedback", + "//ios/third_party/material_components_ios", "//ui/base:base", ] public_deps = [ @@ -286,6 +286,7 @@ source_set("main") { "//ios/chrome/browser/ui/reading_list", "//ios/chrome/browser/ui/recent_tabs", "//ios/chrome/browser/ui/settings/sync", + "//ios/chrome/browser/ui/settings/sync/utils", "//ios/chrome/browser/ui/snackbar", "//ios/chrome/browser/ui/tabs:constants", "//ios/chrome/browser/ui/thumb_strip", diff --git a/chromium/ios/chrome/browser/ui/material_components/BUILD.gn b/chromium/ios/chrome/browser/ui/material_components/BUILD.gn deleted file mode 100644 index a110b76e764..00000000000 --- a/chromium/ios/chrome/browser/ui/material_components/BUILD.gn +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2016 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -source_set("material_components") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "activity_indicator.h", - "activity_indicator.mm", - "app_bar_view_controller_presenting.h", - "chrome_app_bar_view_controller.h", - "chrome_app_bar_view_controller.m", - "utils.h", - "utils.mm", - ] - deps = [ - "//base", - "//build:branding_buildflags", - "//ios/chrome/browser/ui/colors", - "//ios/chrome/common/ui/colors", - "//ios/third_party/material_components_ios", - ] - frameworks = [ "UIKit.framework" ] -} diff --git a/chromium/ios/chrome/browser/ui/ntp/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp/BUILD.gn index fdedc06ec2b..a8421701522 100644 --- a/chromium/ios/chrome/browser/ui/ntp/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/ntp/BUILD.gn @@ -4,9 +4,9 @@ source_set("ntp") { sources = [ - "discover_feed_delegate.h", "discover_feed_preview_delegate.h", "feed_control_delegate.h", + "feed_delegate.h", "new_tab_page_configuring.h", "new_tab_page_content_delegate.h", "new_tab_page_controller_delegate.h", @@ -67,7 +67,10 @@ source_set("coordinator") { "//ios/chrome/browser/browser_state", "//ios/chrome/browser/discover_feed", "//ios/chrome/browser/discover_feed:discover_feed_factory", + "//ios/chrome/browser/follow:browser_agent", + "//ios/chrome/browser/follow:service", "//ios/chrome/browser/main:public", + "//ios/chrome/browser/ntp", "//ios/chrome/browser/ntp:features", "//ios/chrome/browser/reading_list", "//ios/chrome/browser/search_engines", @@ -81,10 +84,12 @@ source_set("coordinator") { "//ios/chrome/browser/ui/content_suggestions:metrics", "//ios/chrome/browser/ui/context_menu/link_preview", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", + "//ios/chrome/browser/ui/follow", "//ios/chrome/browser/ui/main:scene_state_header", "//ios/chrome/browser/ui/main:scene_state_observer", "//ios/chrome/browser/ui/ntp:metrics", "//ios/chrome/browser/ui/ntp/feed_management", + "//ios/chrome/browser/ui/ntp/feed_top_section", "//ios/chrome/browser/ui/overscroll_actions", "//ios/chrome/browser/ui/settings/utils", "//ios/chrome/browser/ui/util", @@ -92,7 +97,6 @@ source_set("coordinator") { "//ios/chrome/browser/voice", "//ios/chrome/browser/web_state_list", "//ios/chrome/common/ui/util", - "//ios/public/provider/chrome/browser/follow", "//ios/public/provider/chrome/browser/ui_utils:ui_utils_api", "//ios/web/public", "//ui/base", @@ -115,17 +119,11 @@ source_set("util") { source_set("ntp_internal") { configs += [ "//build/config/compiler:enable_arc" ] 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", - "feed_top_section_coordinator.h", - "feed_top_section_coordinator.mm", - "feed_top_section_mediator.h", - "feed_top_section_mediator.mm", - "feed_top_section_view_controller.h", - "feed_top_section_view_controller.mm", + "feed_wrapper_view_controller.h", + "feed_wrapper_view_controller.mm", "incognito_view.h", "incognito_view.mm", "incognito_view_controller.h", @@ -200,6 +198,7 @@ source_set("ntp_internal") { "//ios/chrome/browser/ui/favicon", "//ios/chrome/browser/ui/gestures", "//ios/chrome/browser/ui/icons:symbols", + "//ios/chrome/browser/ui/ntp/feed_top_section", "//ios/chrome/browser/ui/overscroll_actions", "//ios/chrome/browser/ui/settings/cells", "//ios/chrome/browser/ui/thumb_strip:public", diff --git a/chromium/ios/chrome/browser/ui/ntp/feed_management/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp/feed_management/BUILD.gn index 0e34717fab4..55e40b9420c 100644 --- a/chromium/ios/chrome/browser/ui/ntp/feed_management/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/ntp/feed_management/BUILD.gn @@ -13,12 +13,13 @@ source_set("feed_management") { ":follow_management", ":follow_management_ui", "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/follow:browser_agent", "//ios/chrome/browser/main:public", + "//ios/chrome/browser/net:crurl", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", + "//ios/chrome/browser/ui/follow", "//ios/chrome/browser/ui/ntp:metrics", "//ios/chrome/browser/ui/table_view", - "//ios/public/provider/chrome/browser", - "//ios/public/provider/chrome/browser/follow", ] public_deps = [ ":navigation_delegate" ] } @@ -52,17 +53,18 @@ source_set("follow_management") { deps = [ ":follow_management_ui", "//ios/chrome/browser/favicon", + "//ios/chrome/browser/follow:browser_agent", + "//ios/chrome/browser/main:public", "//ios/chrome/browser/net:crurl", "//ios/chrome/browser/ui/follow", "//ios/chrome/browser/ui/table_view", "//ios/chrome/common/ui/favicon:favicon_constants", - "//ios/public/provider/chrome/browser", - "//ios/public/provider/chrome/browser/follow", ] } source_set("follow_management_ui") { sources = [ + "follow_management_follow_delegate.h", "follow_management_ui_updater.h", "follow_management_view_controller.h", "follow_management_view_controller.mm", @@ -73,6 +75,7 @@ source_set("follow_management_ui") { ] configs += [ "//build/config/compiler:enable_arc" ] deps = [ + ":feed_management_ui", "resources:following_empty", "//base", "//ios/chrome/app/strings:ios_strings_grit", diff --git a/chromium/ios/chrome/browser/ui/ntp/feed_top_section/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp/feed_top_section/BUILD.gn new file mode 100644 index 00000000000..fadf3dfa308 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/ntp/feed_top_section/BUILD.gn @@ -0,0 +1,35 @@ +# Copyright 2022 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("feed_top_section") { + sources = [ + "feed_top_section_consumer.h", + "feed_top_section_coordinator.h", + "feed_top_section_coordinator.mm", + "feed_top_section_mediator.h", + "feed_top_section_mediator.mm", + "feed_top_section_view_controller.h", + "feed_top_section_view_controller.mm", + "feed_top_section_view_controller_delegate.h", + ] + configs += [ "//build/config/compiler:enable_arc" ] + deps = [ + "resources:ntp_feed_signin_promo_icon", + "//components/signin/public/identity_manager/objc", + "//ios/chrome/app/strings", + "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/discover_feed:constants", + "//ios/chrome/browser/main:public", + "//ios/chrome/browser/signin", + "//ios/chrome/browser/ui/authentication", + "//ios/chrome/browser/ui/authentication:signin_presenter", + "//ios/chrome/browser/ui/authentication/cells", + "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/coordinators:chrome_coordinators", + "//ios/chrome/browser/ui/ntp", + "//ios/chrome/browser/ui/ntp:constants", + "//ios/chrome/browser/ui/ntp:feature_flags", + "//ios/chrome/common/ui/colors", + ] +} diff --git a/chromium/ios/chrome/browser/ui/ntp/feed_top_section/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp/feed_top_section/resources/BUILD.gn new file mode 100644 index 00000000000..dc85b376af6 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/ntp/feed_top_section/resources/BUILD.gn @@ -0,0 +1,13 @@ +# Copyright 2022 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("ntp_feed_signin_promo_icon") { + sources = [ + "ntp_feed_signin_promo_icon.imageset/Contents.json", + "ntp_feed_signin_promo_icon.imageset/ntp_feed_signin_promo_icon@2x.png", + "ntp_feed_signin_promo_icon.imageset/ntp_feed_signin_promo_icon@3x.png", + ] +} diff --git a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn index 38fb3e2335a..fba672f6b3a 100644 --- a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn @@ -7,7 +7,6 @@ source_set("omnibox") { sources = [ "location_bar_delegate.h", - "omnibox_left_image_consumer.h", "web_omnibox_edit_controller.cc", "web_omnibox_edit_controller.h", ] @@ -137,11 +136,14 @@ source_set("omnibox_internal") { "omnibox_view_ios.mm", "web_omnibox_edit_controller_impl.h", "web_omnibox_edit_controller_impl.mm", + "zero_suggest_prefetch_helper.h", + "zero_suggest_prefetch_helper.mm", ] deps = [ ":features", ":omnibox", ":omnibox_popup_shared", + ":omnibox_suggestion_icon_util", ":omnibox_util", "resources:omnibox_clear_icon", "//base", @@ -158,6 +160,7 @@ source_set("omnibox_internal") { "//ios/chrome/browser/bookmarks:bookmarks_utils", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/favicon", + "//ios/chrome/browser/https_upgrades", "//ios/chrome/browser/main:public", "//ios/chrome/browser/net", "//ios/chrome/browser/prerender", @@ -174,6 +177,7 @@ source_set("omnibox_internal") { "//ios/chrome/browser/ui/main:default_browser_scene_agent", "//ios/chrome/browser/ui/main:scene_state_header", "//ios/chrome/browser/ui/omnibox/popup", + "//ios/chrome/browser/ui/omnibox/popup:popup_ui_protocols", "//ios/chrome/browser/ui/orchestrator:orchestrator", "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/util", @@ -185,6 +189,7 @@ source_set("omnibox_internal") { "//ios/chrome/common/ui/favicon:favicon_constants", "//ios/chrome/common/ui/util", "//ios/chrome/common/ui/util:dynamic_type_util", + "//ios/components/security_interstitials/https_only_mode", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/branded_images:branded_images_api", "//ios/web", @@ -275,6 +280,7 @@ source_set("unit_tests") { "omnibox_text_field_ios_experimental_unittest.mm", "omnibox_text_field_ios_unittest.mm", "omnibox_view_ios_unittest.mm", + "zero_suggest_prefetch_helper_unittest.mm", ] deps = [ ":omnibox", @@ -282,11 +288,18 @@ source_set("unit_tests") { ":resources_unit_tests", "//base", "//base/test:test_support", + "//components/omnibox/browser:test_support", + "//components/search_engines", "//ios/chrome/app/strings", "//ios/chrome/browser", "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/main", + "//ios/chrome/browser/main:test_support", "//ios/chrome/browser/ui/util", + "//ios/chrome/browser/web_state_list", + "//ios/chrome/browser/web_state_list:test_support", "//ios/web/common:uikit", + "//ios/web/public/test/fakes", "//testing/gtest", "//third_party/ocmock", "//ui/base", @@ -308,4 +321,5 @@ source_set("features") { "omnibox_ui_features.h", ] public_deps = [ "//base" ] + deps = [ "//ios/chrome/browser/ui:feature_flags" ] } diff --git a/chromium/ios/chrome/browser/ui/omnibox/keyboard_assist/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/keyboard_assist/BUILD.gn index 699ecc7c766..a2cc6d331af 100644 --- a/chromium/ios/chrome/browser/ui/omnibox/keyboard_assist/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/omnibox/keyboard_assist/BUILD.gn @@ -31,6 +31,7 @@ source_set("keyboard_assist") { "//ios/chrome/browser", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/location_bar:constants", + "//ios/chrome/browser/ui/omnibox:features", "//ios/chrome/browser/ui/omnibox:omnibox_internal", "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/util/", diff --git a/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn index ed2441f3f08..fa8ca83ed88 100644 --- a/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn @@ -24,6 +24,7 @@ swift_source_set("popup_swift") { "shared/popup_ui_configuration.swift", "shared/popup_ui_variation.swift", "shared/popup_view.swift", + "shared/popup_visible_suggestion_count.swift", "shared/pressed_preference_key_button_style.swift", "shared/self_sizing_list.swift", ] @@ -89,6 +90,7 @@ source_set("popup") { "//ios/chrome/browser/ui/main:default_browser_scene_agent", "//ios/chrome/browser/ui/main:scene_state_header", "//ios/chrome/browser/ui/ntp:util", + "//ios/chrome/browser/ui/omnibox:features", "//ios/chrome/browser/ui/omnibox:omnibox_util", "//ios/chrome/browser/ui/omnibox/resources:pedal_clear_browsing_data", "//ios/chrome/browser/ui/omnibox/resources:pedal_default_browser", @@ -144,22 +146,25 @@ source_set("popup_ui") { "resources:omnibox_suggestion_answer_icon_dark_color", "resources:omnibox_suggestion_icon_color", "resources:omnibox_suggestion_icon_dark_color", + "resources:omnibox_suggestion_row_highlight_color", "//base", "//components/omnibox/common", "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/app/theme", "//ios/chrome/browser/net:crurl", "//ios/chrome/browser/ui:feature_flags", - "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/content_suggestions/cells", "//ios/chrome/browser/ui/elements", + "//ios/chrome/browser/ui/icons:symbols", + "//ios/chrome/browser/ui/omnibox:features", "//ios/chrome/browser/ui/omnibox:omnibox_popup_shared", "//ios/chrome/browser/ui/omnibox:omnibox_suggestion_icon_util", "//ios/chrome/browser/ui/toolbar/buttons", "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/util", "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/elements:elements", "//ios/chrome/common/ui/util", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/branded_images:branded_images_api", @@ -187,7 +192,7 @@ source_set("popup_internal") { "//ios/chrome/browser/browser_state", "//ios/chrome/browser/net:crurl", "//ios/chrome/browser/ui:feature_flags", - "//ios/chrome/browser/ui/colors", + "//ios/chrome/browser/ui/omnibox:features", "//ios/chrome/browser/ui/omnibox:omnibox_util", "//ios/chrome/browser/ui/util", "//ios/chrome/common/ui/colors", @@ -212,6 +217,7 @@ source_set("unit_tests") { testonly = true sources = [ "omnibox_pedal_annotator_unittest.mm", + "omnibox_popup_mediator_unittest.mm", "omnibox_popup_row_cell_unittest.mm", "pedal_section_extractor_unittest.mm", ] @@ -222,9 +228,11 @@ source_set("unit_tests") { ":popup_ui_protocols", "//base", "//base/test:test_support", + "//components/image_fetcher/core", "//components/omnibox/browser", "//ios/chrome/app/strings", "//ios/chrome/browser", + "//ios/chrome/browser/favicon", "//testing/gtest", "//third_party/ocmock", "//ui/base", diff --git a/chromium/ios/chrome/browser/ui/omnibox/popup/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/popup/resources/BUILD.gn index 08f18d87903..4f454036355 100644 --- a/chromium/ios/chrome/browser/ui/omnibox/popup/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/omnibox/popup/resources/BUILD.gn @@ -31,6 +31,10 @@ colorset("omnibox_suggestion_icon_dark_color") { sources = [ "omnibox_suggestion_icon_dark_color.colorset/Contents.json" ] } +colorset("omnibox_suggestion_row_highlight_color") { + sources = [ "omnibox_suggestion_row_highlight_color.colorset/Contents.json" ] +} + imageset("omnibox_popup_tab_match") { sources = [ "omnibox_popup_tab_match.imageset/Contents.json", diff --git a/chromium/ios/chrome/browser/ui/open_in/BUILD.gn b/chromium/ios/chrome/browser/ui/open_in/BUILD.gn index 4786240fdc5..5b01d781e48 100644 --- a/chromium/ios/chrome/browser/ui/open_in/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/open_in/BUILD.gn @@ -5,6 +5,9 @@ source_set("open_in_ui") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ + "open_in_activity_delegate.h", + "open_in_activity_view_controller.h", + "open_in_activity_view_controller.mm", "open_in_controller.h", "open_in_controller.mm", "open_in_controller_testing.h", @@ -18,7 +21,6 @@ source_set("open_in_ui") { "//ios/chrome/browser/main:public", "//ios/chrome/browser/open_in", "//ios/chrome/browser/ui/alert_coordinator", - "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/util", "//ios/chrome/common/ui/colors", "//ios/chrome/common/ui/util", diff --git a/chromium/ios/chrome/browser/ui/overlays/infobar_banner/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/BUILD.gn index ec3a11f060b..3a4f7258c16 100644 --- a/chromium/ios/chrome/browser/ui/overlays/infobar_banner/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/BUILD.gn @@ -14,20 +14,6 @@ source_set("infobar_banner") { ] } -source_set("feature_flags") { - sources = [ - "infobar_banner_features.h", - "infobar_banner_features.mm", - ] - - configs += [ "//build/config/compiler:enable_arc" ] - - deps = [ - "//base", - "//ios/chrome/browser/ui/infobars:constants", - ] -} - source_set("coordinators") { sources = [ "infobar_banner_overlay_coordinator.h", @@ -37,7 +23,6 @@ source_set("coordinators") { configs += [ "//build/config/compiler:enable_arc" ] deps = [ - ":feature_flags", ":mediators", "//base", "//ios/chrome/browser/overlays", diff --git a/chromium/ios/chrome/browser/ui/policy/BUILD.gn b/chromium/ios/chrome/browser/ui/policy/BUILD.gn index b4146d5302a..4535e15f889 100644 --- a/chromium/ios/chrome/browser/ui/policy/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/policy/BUILD.gn @@ -5,6 +5,8 @@ source_set("user_policy_scene_agent") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ + "signin_policy_scene_agent.h", + "signin_policy_scene_agent.mm", "user_policy_scene_agent.h", "user_policy_scene_agent.mm", "user_policy_util.h", @@ -15,19 +17,28 @@ source_set("user_policy_scene_agent") { "//base/ios", "//components/policy/core/common:common_constants", "//components/prefs", + "//components/prefs/ios", "//components/signin/public/base", + "//components/signin/public/identity_manager", + "//components/signin/public/identity_manager/objc", "//ios/chrome/app/application_delegate:app_state_header", "//ios/chrome/app/strings", + "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/main:public", "//ios/chrome/browser/policy", + "//ios/chrome/browser/policy:policy_util", "//ios/chrome/browser/signin", "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/authentication", + "//ios/chrome/browser/ui/authentication/enterprise:enterprise_utils", + "//ios/chrome/browser/ui/authentication/signin", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/main:browser_interface_provider", "//ios/chrome/browser/ui/main:observing_scene_agent", "//ios/chrome/browser/ui/main:scene_ui_provider", + "//ios/chrome/browser/ui/scoped_ui_blocker", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/signin", "//ui/base", diff --git a/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn index 817d5ee5dec..e878cff2a69 100644 --- a/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn @@ -60,11 +60,9 @@ source_set("popup_menu") { "//ios/chrome/browser/bookmarks", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/browser_state_metrics", - "//ios/chrome/browser/discover_feed", - "//ios/chrome/browser/discover_feed:discover_feed_factory", "//ios/chrome/browser/feature_engagement", "//ios/chrome/browser/find_in_page", - "//ios/chrome/browser/follow", + "//ios/chrome/browser/follow:browser_agent", "//ios/chrome/browser/follow:enums", "//ios/chrome/browser/follow:tab_helper", "//ios/chrome/browser/follow:utils", @@ -112,7 +110,6 @@ source_set("popup_menu") { "//ios/chrome/common/ui/colors", "//ios/components/webui:url_constants", "//ios/public/provider/chrome/browser", - "//ios/public/provider/chrome/browser/follow", "//ios/public/provider/chrome/browser/text_zoom:text_zoom_api", "//ios/public/provider/chrome/browser/user_feedback", "//ios/web", @@ -211,7 +208,6 @@ source_set("eg2_tests") { "//ios/chrome/app/strings", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/settings:constants", - "//ios/chrome/browser/ui/tab_switcher/tab_grid:features", "//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/popup_menu/overflow_menu/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/overflow_menu/BUILD.gn index 2db9e1dddfd..1c059f9de01 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 @@ -37,6 +37,7 @@ source_set("overflow_menu") { "resources:overflow_menu_action_request_desktop", "resources:overflow_menu_action_request_mobile", "resources:overflow_menu_action_settings", + "resources:overflow_menu_action_share_chrome", "resources:overflow_menu_action_stop", "resources:overflow_menu_action_text_zoom", "resources:overflow_menu_action_translate", @@ -70,8 +71,9 @@ source_set("overflow_menu") { "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser:chrome_url_constants", "//ios/chrome/browser:pref_names", + "//ios/chrome/browser/browser_state", "//ios/chrome/browser/find_in_page", - "//ios/chrome/browser/follow", + "//ios/chrome/browser/follow:browser_agent", "//ios/chrome/browser/follow:enums", "//ios/chrome/browser/follow:tab_helper", "//ios/chrome/browser/follow:utils", @@ -100,7 +102,6 @@ source_set("overflow_menu") { "//ios/chrome/browser/web_state_list", "//ios/chrome/browser/window_activities", "//ios/public/provider/chrome/browser", - "//ios/public/provider/chrome/browser/follow", "//ios/public/provider/chrome/browser/user_feedback", "//ios/web/common:user_agent", "//ios/web/public", @@ -125,6 +126,7 @@ swift_source_set("overflow_menu_swift") { "overflow_menu_hosting_controller.swift", "overflow_menu_item.swift", "overflow_menu_model.swift", + "overflow_menu_ui_configuration.swift", "overflow_menu_view.swift", "overflow_menu_view_provider.swift", ] diff --git a/chromium/ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history/BUILD.gn index 5fc694baa04..2baaa5f79c5 100644 --- a/chromium/ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/popup_menu/overflow_menu/destination_usage_history/BUILD.gn @@ -29,3 +29,21 @@ source_set("unit_tests") { ] configs += [ "//build/config/compiler:enable_arc" ] } + +source_set("eg2_tests") { + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + testonly = true + sources = [ "destination_usage_history_egtest.mm" ] + deps = [ + ":destination_usage_history", + "//ios/chrome/browser:pref_names", + "//ios/chrome/browser/ui/popup_menu: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", + ] + frameworks = [ "UIKit.framework" ] +} 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 index cdc0c423934..28fa805fdf3 100644 --- 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 @@ -124,6 +124,14 @@ imageset("overflow_menu_action_settings") { ] } +imageset("overflow_menu_action_share_chrome") { + sources = [ + "overflow_menu_action_share_chrome.imageset/Contents.json", + "overflow_menu_action_share_chrome.imageset/overflow_menu_action_share_chrome@2x.png", + "overflow_menu_action_share_chrome.imageset/overflow_menu_action_share_chrome@3x.png", + ] +} + imageset("overflow_menu_action_stop") { sources = [ "overflow_menu_action_stop.imageset/Contents.json", diff --git a/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn b/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn index d46b9387703..0dcf43ff008 100644 --- a/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn @@ -147,7 +147,6 @@ source_set("reading_list_ui") { "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/keyboard", "//ios/chrome/browser/ui/list_model", - "//ios/chrome/browser/ui/material_components", "//ios/chrome/browser/ui/settings/cells", "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/table_view:utils", diff --git a/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn b/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn index 66c9fcaa8de..37a7f0d9ad1 100644 --- a/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn @@ -103,7 +103,6 @@ source_set("recent_tabs_ui") { "//ios/chrome/browser/ui/authentication/signin:signin_headers", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/settings/sync/utils", - "//ios/chrome/browser/ui/tab_switcher/tab_grid:features", "//ios/chrome/browser/ui/tab_switcher/tab_grid/suggested_actions/resources", "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/table_view:presentation", @@ -143,7 +142,7 @@ source_set("unit_tests") { "//components/browser_sync", "//components/signin/public/identity_manager", "//components/signin/public/identity_manager:test_support", - "//components/sync:test_support_model", + "//components/sync:test_support", "//components/sync_sessions", "//components/sync_user_events", "//ios/chrome/browser/browser_state:test_support", diff --git a/chromium/ios/chrome/browser/ui/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/resources/BUILD.gn index c0f9ea220c3..42dcbf3031e 100644 --- a/chromium/ios/chrome/browser/ui/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/resources/BUILD.gn @@ -13,6 +13,15 @@ imageset("menu_shadow") { ] } +imageset("module_shadow") { + sources = [ + "module_shadow.imageset/Contents.json", + "module_shadow.imageset/module_shadow.png", + "module_shadow.imageset/module_shadow@2x.png", + "module_shadow.imageset/module_shadow@3x.png", + ] +} + imageset("legacy_password_key") { sources = [ "legacy_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 930a99289a0..c6fa4d6cc6d 100644 --- a/chromium/ios/chrome/browser/ui/sad_tab/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/sad_tab/BUILD.gn @@ -17,7 +17,6 @@ source_set("sad_tab") { "//components/ui_metrics", "//ios/chrome/browser", "//ios/chrome/browser/ui:feature_flags", - "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/overscroll_actions", "//ios/chrome/browser/ui/util", diff --git a/chromium/ios/chrome/browser/ui/send_tab_to_self/BUILD.gn b/chromium/ios/chrome/browser/ui/send_tab_to_self/BUILD.gn index 02760f43574..dc50ff9b6e5 100644 --- a/chromium/ios/chrome/browser/ui/send_tab_to_self/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/send_tab_to_self/BUILD.gn @@ -20,6 +20,7 @@ source_set("send_tab_to_self") { "//ios/chrome/browser/send_tab_to_self", "//ios/chrome/browser/signin", "//ios/chrome/browser/sync", + "//ios/chrome/browser/ui/authentication:signin_presenter", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/infobars/presentation", @@ -30,6 +31,7 @@ source_set("send_tab_to_self") { "//url", ] } + source_set("send_tab_to_self_ui") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ @@ -60,6 +62,29 @@ source_set("send_tab_to_self_ui") { "//ios/chrome/common:string_util", "//ios/chrome/common/ui/colors", "//ios/chrome/common/ui/table_view:cells_constants", + "//ios/chrome/common/ui/util:util", + "//ui/base", + ] +} + +source_set("eg2_tests") { + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + testonly = true + sources = [ "send_tab_to_self_coordinator_egtest.mm" ] + deps = [ + "//base", + "//components/send_tab_to_self", + "//ios/chrome/app/strings", + "//ios/chrome/browser/ui/authentication:eg_test_support+eg2", + "//ios/chrome/test/earl_grey:eg_test_support+eg2", + "//ios/public/provider/chrome/browser/signin:fake_chrome_identity", + "//ios/testing/earl_grey:eg_test_support+eg2", + "//ios/third_party/earl_grey2:test_lib", + "//net:test_support", "//ui/base", ] + frameworks = [ "UIKit.framework" ] } diff --git a/chromium/ios/chrome/browser/ui/settings/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/BUILD.gn index 4ea12cd2edb..2efcaf09f0a 100644 --- a/chromium/ios/chrome/browser/ui/settings/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/BUILD.gn @@ -91,7 +91,6 @@ source_set("settings") { "resources:settings_search_engine", "resources:settings_unsafe_state", "resources:settings_voice_search", - "resources:sync_and_google_services", "resources:sync_and_google_services_sync_off", "resources:sync_and_google_services_sync_on", "//base", @@ -133,6 +132,7 @@ source_set("settings") { "//ios/chrome/browser/history", "//ios/chrome/browser/main", "//ios/chrome/browser/net:crurl", + "//ios/chrome/browser/ntp:features", "//ios/chrome/browser/passwords", "//ios/chrome/browser/prerender:prerender_pref", "//ios/chrome/browser/search_engines", @@ -147,7 +147,6 @@ source_set("settings") { "//ios/chrome/browser/ui/authentication/enterprise:enterprise_utils", "//ios/chrome/browser/ui/authentication/signin:signin_headers", "//ios/chrome/browser/ui/autofill/cells", - "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/content_suggestions:feature_flags", "//ios/chrome/browser/ui/content_suggestions/cells", @@ -155,6 +154,8 @@ source_set("settings") { "//ios/chrome/browser/ui/elements:elements_internal", "//ios/chrome/browser/ui/first_run:field_trial", "//ios/chrome/browser/ui/icons", + "//ios/chrome/browser/ui/icons:custom_symbols", + "//ios/chrome/browser/ui/icons:settings_icons", "//ios/chrome/browser/ui/icons:symbols", "//ios/chrome/browser/ui/keyboard", "//ios/chrome/browser/ui/list_model", @@ -209,6 +210,7 @@ source_set("settings") { "//url", ] allow_circular_includes_from = [ "//ios/chrome/browser/ui/authentication" ] + public_deps = [ "//ios/third_party/material_components_ios" ] frameworks = [ "CoreLocation.framework", "UIKit.framework", @@ -303,7 +305,7 @@ source_set("unit_tests") { "//components/search_engines", "//components/signin/public/base", "//components/strings", - "//components/sync/driver:test_support", + "//components/sync:test_support", "//components/sync_preferences", "//components/sync_preferences:test_support", "//components/translate/core/browser", diff --git a/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn index 8690b2e54ed..afb694a9d20 100644 --- a/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn @@ -40,7 +40,6 @@ source_set("cells") { "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/authentication:authentication_constants", "//ios/chrome/browser/ui/collection_view/cells", - "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/icons", "//ios/chrome/browser/ui/settings:constants", "//ios/chrome/browser/ui/table_view:styler", 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 ec9cb0aad5b..22ed3951aa4 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 @@ -32,6 +32,7 @@ source_set("clear_browsing_data") { "//components/prefs/ios", "//components/search_engines", "//components/signin/public/identity_manager", + "//components/signin/public/identity_manager/objc", "//components/strings", "//ios/chrome/app/strings", "//ios/chrome/browser", @@ -45,10 +46,9 @@ source_set("clear_browsing_data") { "//ios/chrome/browser/search_engines", "//ios/chrome/browser/signin", "//ios/chrome/browser/sync", - "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/alert_coordinator", + "//ios/chrome/browser/ui/authentication", "//ios/chrome/browser/ui/collection_view", - "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/elements:elements_internal", 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 fafcc48eaaa..0ff1d5fccba 100644 --- a/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn @@ -162,6 +162,7 @@ source_set("eg2_tests") { "//ios/chrome/browser/ui/authentication:eg_test_support+eg2", "//ios/chrome/browser/ui/bookmarks:eg_test_support+eg2", "//ios/chrome/browser/ui/bookmarks:eg_test_support+eg2", + "//ios/chrome/browser/ui/elements:constants", "//ios/chrome/browser/ui/settings:constants", "//ios/chrome/browser/ui/settings/google_services:constants", "//ios/chrome/test/earl_grey:eg_test_support+eg2", @@ -187,8 +188,8 @@ source_set("unit_tests") { "//components/autofill/core/common", "//components/prefs", "//components/prefs:test_support", + "//components/sync:test_support", "//components/sync/driver", - "//components/sync/driver:test_support", "//components/variations:test_support", "//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/browser/browser_state:test_support", @@ -197,6 +198,7 @@ source_set("unit_tests") { "//ios/chrome/browser/signin:test_support", "//ios/chrome/browser/sync", "//ios/chrome/browser/sync:test_support", + "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/settings/cells", "//ios/chrome/browser/ui/settings/google_services:constants", "//ios/chrome/browser/ui/table_view", diff --git a/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn index beab3d70223..bc9f1619ba7 100644 --- a/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn @@ -5,8 +5,6 @@ source_set("password") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ - "password_issue_with_form.h", - "password_issue_with_form.mm", "password_issues_coordinator.h", "password_issues_coordinator.mm", "password_issues_mediator.h", @@ -60,18 +58,19 @@ source_set("password_ui") { "password_exporter.h", "password_exporter.mm", "password_issue.h", + "password_issue.mm", "password_issue_content_item.h", "password_issue_content_item.mm", "password_issues_consumer.h", "password_issues_presenter.h", "password_issues_table_view_controller.h", "password_issues_table_view_controller.mm", + "password_manager_view_controller.h", + "password_manager_view_controller.mm", + "password_manager_view_controller_delegate.h", + "password_manager_view_controller_presentation_delegate.h", "passwords_consumer.h", "passwords_settings_commands.h", - "passwords_table_view_controller.h", - "passwords_table_view_controller.mm", - "passwords_table_view_controller_delegate.h", - "passwords_table_view_controller_presentation_delegate.h", ] deps = [ ":password_constants", @@ -144,8 +143,8 @@ source_set("unit_tests") { "password_exporter_unittest.mm", "password_issues_mediator_unittest.mm", "password_issues_table_view_controller_unittest.mm", + "password_manager_view_controller_unittest.mm", "passwords_mediator_unittest.mm", - "passwords_table_view_controller_unittest.mm", ] deps = [ ":password", @@ -247,7 +246,10 @@ source_set("eg2_tests") { "//build/config/ios:xctest_config", ] testonly = true - sources = [ "passwords_settings_egtest.mm" ] + sources = [ + "legacy_password_settings_egtest.mm", + "password_manager_egtest.mm", + ] deps = [ ":eg_test_support+eg2", ":password_constants", @@ -257,6 +259,7 @@ source_set("eg2_tests") { "//components/strings:components_strings_grit", "//components/sync/driver", "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser/metrics:eg_test_support+eg2", "//ios/chrome/browser/ui/authentication:eg_test_support+eg2", "//ios/chrome/browser/ui/settings:settings_root_constants", "//ios/chrome/browser/ui/settings/google_services:constants", diff --git a/chromium/ios/chrome/browser/ui/settings/privacy/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/privacy/BUILD.gn index 771c821c625..51b37008a67 100644 --- a/chromium/ios/chrome/browser/ui/settings/privacy/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/privacy/BUILD.gn @@ -43,10 +43,10 @@ source_set("privacy_ui") { "//ios/chrome/browser/sync", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/alert_coordinator", - "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/icons:symbols", + "//ios/chrome/browser/ui/incognito_interstitial:constants", "//ios/chrome/browser/ui/list_model", "//ios/chrome/browser/ui/settings:constants", "//ios/chrome/browser/ui/settings:settings_root", @@ -127,7 +127,7 @@ source_set("unit_tests") { "//components/safe_browsing/core/common", "//components/safe_browsing/core/common:safe_browsing_prefs", "//components/strings", - "//components/sync/driver:test_support", + "//components/sync:test_support", "//components/sync_preferences", "//components/sync_preferences:test_support", "//ios/chrome/app/strings", @@ -152,3 +152,28 @@ source_set("unit_tests") { "//ui/base", ] } + +source_set("eg2_tests") { + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + testonly = true + sources = [ "privacy_safe_browsing_egtest.mm" ] + deps = [ + "//base", + "//base/test:test_support", + "//components/safe_browsing/core/common", + "//components/safe_browsing/core/common:safe_browsing_prefs", + "//components/strings:components_strings_grit", + "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser/ui/popup_menu/overflow_menu:feature_flags", + "//ios/chrome/browser/ui/settings/privacy:privacy_constants", + "//ios/chrome/browser/ui/settings/privacy/safe_browsing:safe_browsing_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/safe_browsing/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/privacy/safe_browsing/BUILD.gn index 6cf3ad31679..5d7a451716e 100644 --- a/chromium/ios/chrome/browser/ui/settings/privacy/safe_browsing/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/privacy/safe_browsing/BUILD.gn @@ -5,8 +5,6 @@ source_set("safe_browsing") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ - "safe_browsing_constants.h", - "safe_browsing_constants.mm", "safe_browsing_enhanced_protection_consumer.h", "safe_browsing_enhanced_protection_coordinator.h", "safe_browsing_enhanced_protection_coordinator.mm", @@ -24,6 +22,7 @@ source_set("safe_browsing") { "safe_browsing_standard_protection_view_controller_delegate.h", ] deps = [ + ":safe_browsing_constants", "resources:bar_chart", "resources:g_icon", "resources:globe", @@ -60,3 +59,11 @@ source_set("safe_browsing") { "//ui/base", ] } + +source_set("safe_browsing_constants") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "safe_browsing_constants.h", + "safe_browsing_constants.mm", + ] +} diff --git a/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn index 8dbd486479b..66c9d8e2e3e 100644 --- a/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn @@ -198,14 +198,6 @@ imageset("settings_voice_search") { ] } -imageset("sync_and_google_services") { - sources = [ - "sync_and_google_services.imageset/Contents.json", - "sync_and_google_services.imageset/sync_and_google_services@2x.png", - "sync_and_google_services.imageset/sync_and_google_services@3x.png", - ] -} - imageset("sync_and_google_services_sync_off") { sources = [ "sync_and_google_services_sync_off.imageset/Contents.json", diff --git a/chromium/ios/chrome/browser/ui/settings/sync/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/sync/BUILD.gn index c164fcf6065..123057c8c06 100644 --- a/chromium/ios/chrome/browser/ui/settings/sync/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/sync/BUILD.gn @@ -36,7 +36,6 @@ source_set("sync") { "//ios/chrome/browser/ui/authentication/cells", "//ios/chrome/browser/ui/collection_view", "//ios/chrome/browser/ui/collection_view/cells", - "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/main:scene_state_header", "//ios/chrome/browser/ui/scoped_ui_blocker", diff --git a/chromium/ios/chrome/browser/ui/start_surface/BUILD.gn b/chromium/ios/chrome/browser/ui/start_surface/BUILD.gn index e5d1d96f137..2c96162d27d 100644 --- a/chromium/ios/chrome/browser/ui/start_surface/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/start_surface/BUILD.gn @@ -34,6 +34,7 @@ source_set("start_surface") { ":feature_flags", "//base", "//components/favicon/ios", + "//components/url_param_filter/core", "//ios/chrome/app/application_delegate:app_state_header", "//ios/chrome/app/strings:ios_strings", "//ios/chrome/browser", 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 5826e635194..10a63f485cf 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 @@ -16,7 +16,6 @@ source_set("tab_grid") { configs += [ "//build/config/compiler:enable_arc" ] deps = [ - ":features", ":tab_grid_paging", ":tab_grid_ui", "grid:grid_ui", @@ -124,7 +123,6 @@ source_set("tab_grid_ui") { configs += [ "//build/config/compiler:enable_arc" ] deps = [ - ":features", ":tab_grid_paging", ":tab_grid_ui_constants", "grid:grid_ui", @@ -163,15 +161,6 @@ source_set("tab_grid_ui") { ] } -source_set("features") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "features.h", - "features.mm", - ] - deps = [ "//base" ] -} - source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true @@ -254,7 +243,6 @@ source_set("eg2_tests") { "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui_constants", "//ios/chrome/browser/ui/settings:eg_test_support+eg2", "//ios/chrome/browser/ui/start_surface:feature_flags", - "//ios/chrome/browser/ui/tab_switcher/tab_grid:features", "//ios/chrome/browser/ui/tab_switcher/tab_grid/grid:grid_ui_constants", "//ios/chrome/browser/ui/thumb_strip:feature_flags", "//ios/chrome/browser/ui/util", 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 315bc267479..b49ca915f6f 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 @@ -71,7 +71,6 @@ source_set("grid_ui") { "//ios/chrome/browser/ui/menu:context_menu_delegate", "//ios/chrome/browser/ui/ntp:util", "//ios/chrome/browser/ui/tab_switcher", - "//ios/chrome/browser/ui/tab_switcher/tab_grid:features", "//ios/chrome/browser/ui/tab_switcher/tab_grid:tab_grid_paging", "//ios/chrome/browser/ui/tab_switcher/tab_grid/suggested_actions", "//ios/chrome/browser/ui/tab_switcher/tab_grid/transitions", diff --git a/chromium/ios/chrome/browser/ui/table_view/BUILD.gn b/chromium/ios/chrome/browser/ui/table_view/BUILD.gn index 2e552299fd1..19dfd165c90 100644 --- a/chromium/ios/chrome/browser/ui/table_view/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/table_view/BUILD.gn @@ -21,7 +21,6 @@ source_set("table_view") { "//base", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/list_model", - "//ios/chrome/browser/ui/material_components", "//ios/chrome/common/ui/colors", "//ios/third_party/material_components_ios", ] @@ -86,8 +85,6 @@ source_set("views") { deps = [ ":constants", "//base", - "//ios/chrome/browser/ui/colors", - "//ios/chrome/browser/ui/material_components", "//ios/chrome/browser/ui/util", "//ios/chrome/common/ui/colors", "//ios/third_party/material_components_ios", diff --git a/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn index 112102a2fc6..be6c8215e89 100644 --- a/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn @@ -66,7 +66,6 @@ source_set("cells") { "//ios/chrome/app/strings", "//ios/chrome/browser/net:crurl", "//ios/chrome/browser/ui:feature_flags", - "//ios/chrome/browser/ui/colors:colors", "//ios/chrome/browser/ui/elements", "//ios/chrome/browser/ui/icons:item_icons", "//ios/chrome/browser/ui/icons:symbols", @@ -81,7 +80,6 @@ source_set("cells") { "//ios/chrome/common/ui/table_view", "//ios/chrome/common/ui/table_view:cells_constants", "//ios/chrome/common/ui/util", - "//ios/chrome/common/ui/util:image_util", "//ios/third_party/material_components_ios", "//net", "//ui/base", @@ -112,6 +110,7 @@ source_set("unit_tests") { "//components/url_formatter", "//ios/chrome/browser/net:crurl", "//ios/chrome/browser/ui/icons", + "//ios/chrome/browser/ui/icons:custom_symbols", "//ios/chrome/browser/ui/icons:item_icons", "//ios/chrome/browser/ui/icons:symbols", "//ios/chrome/browser/ui/table_view:styler", diff --git a/chromium/ios/chrome/browser/ui/tabs/BUILD.gn b/chromium/ios/chrome/browser/ui/tabs/BUILD.gn index 21ad0538339..9b5ab40c1af 100644 --- a/chromium/ios/chrome/browser/ui/tabs/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/tabs/BUILD.gn @@ -47,7 +47,6 @@ source_set("tabs") { "//ios/chrome/browser/snapshots", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/bubble", - "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/elements", "//ios/chrome/browser/ui/fullscreen", diff --git a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn index 8fdfbf09481..56248d79f9a 100644 --- a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn @@ -9,6 +9,8 @@ source_set("toolbar") { "adaptive_toolbar_coordinator.mm", "primary_toolbar_coordinator.h", "primary_toolbar_coordinator.mm", + "primary_toolbar_mediator.h", + "primary_toolbar_mediator.mm", "secondary_toolbar_coordinator.h", "secondary_toolbar_coordinator.mm", "toolbar_coordinatee.h", @@ -38,8 +40,10 @@ source_set("toolbar") { "//ios/chrome/browser/bookmarks", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/main", + "//ios/chrome/browser/ntp", "//ios/chrome/browser/overlays", "//ios/chrome/browser/policy:policy_util", + "//ios/chrome/browser/prerender", "//ios/chrome/browser/reading_list", "//ios/chrome/browser/search_engines", "//ios/chrome/browser/ui:feature_flags", @@ -53,8 +57,11 @@ source_set("toolbar") { "//ios/chrome/browser/ui/icons:infobar_icons", "//ios/chrome/browser/ui/icons:symbols", "//ios/chrome/browser/ui/location_bar", + "//ios/chrome/browser/ui/main:layout_guide_scene_agent", + "//ios/chrome/browser/ui/main:scene_state_header", "//ios/chrome/browser/ui/menu", "//ios/chrome/browser/ui/ntp", + "//ios/chrome/browser/ui/ntp:coordinator", "//ios/chrome/browser/ui/ntp:util", "//ios/chrome/browser/ui/omnibox", "//ios/chrome/browser/ui/omnibox:omnibox_internal", @@ -70,6 +77,7 @@ source_set("toolbar") { "//ios/chrome/browser/web", "//ios/chrome/browser/web_state_list", "//ios/chrome/common", + "//ios/components/webui:url_constants", "//ios/public/provider/chrome/browser/voice_search:voice_search_api", "//ios/web", "//ui/base", @@ -108,6 +116,7 @@ source_set("toolbar_ui") { "//ios/chrome/browser/ui/gestures", "//ios/chrome/browser/ui/icons:symbols", "//ios/chrome/browser/ui/ntp:ntp", + "//ios/chrome/browser/ui/omnibox:features", "//ios/chrome/browser/ui/orchestrator", "//ios/chrome/browser/ui/popup_menu/public", "//ios/chrome/browser/ui/thumb_strip:feature_flags", diff --git a/chromium/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn index a49dc16b1eb..db06d4395f0 100644 --- a/chromium/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/toolbar/buttons/BUILD.gn @@ -48,6 +48,7 @@ source_set("buttons") { "//ios/chrome/browser/ui/icons:symbols", "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/util", + "//ios/chrome/browser/ui/util:util_swift", "//ios/chrome/browser/web", "//ios/chrome/browser/web_state_list", "//ios/chrome/common/ui/colors", diff --git a/chromium/ios/chrome/browser/ui/util/BUILD.gn b/chromium/ios/chrome/browser/ui/util/BUILD.gn index dde7947e471..fab233e106a 100644 --- a/chromium/ios/chrome/browser/ui/util/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/util/BUILD.gn @@ -247,12 +247,3 @@ source_set("eg_test_support+eg2") { "//ios/third_party/earl_grey2:test_lib", ] } - -source_set("features") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "features.cc", - "features.h", - ] - public_deps = [ "//base" ] -} diff --git a/chromium/ios/chrome/browser/ui/webui/BUILD.gn b/chromium/ios/chrome/browser/ui/webui/BUILD.gn index a055fca1ca6..85556aaa519 100644 --- a/chromium/ios/chrome/browser/ui/webui/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/webui/BUILD.gn @@ -57,6 +57,9 @@ source_set("webui") { "//components/metrics_services_manager", "//components/ntp_tiles", "//components/password_manager/core/browser", + "//components/policy/core/browser", + "//components/policy/core/common", + "//components/policy/proto", "//components/prefs", "//components/resources", "//components/strings", @@ -112,6 +115,7 @@ source_set("webui_internal") { ":webui", "//components/resources", "//components/signin/public/identity_manager", + "//components/sync/invalidations", "//ios/chrome/app/resources:ios_resources", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", |