diff options
Diffstat (limited to 'chromium/ios/chrome/browser/ui')
61 files changed, 698 insertions, 269 deletions
diff --git a/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn b/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn index 92e86b4e597..da76e5964dd 100644 --- a/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn @@ -2,37 +2,28 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -source_set("activity_services_ui") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "activity_type_util.h", - "activity_type_util.mm", - ] - deps = [ - "//base", - "//ios/chrome/app/strings:ios_strings", - "//ui/base", - ] - libs = [ "UIKit.framework" ] -} - source_set("activity_services") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ + "activity_scenario.h", "activity_service_coordinator.h", "activity_service_coordinator.mm", + "activity_service_histograms.h", + "activity_service_histograms.mm", "activity_service_mediator.h", "activity_service_mediator.mm", + "activity_type_util.h", + "activity_type_util.mm", "canonical_url_retriever.h", "canonical_url_retriever.mm", ] deps = [ - ":activity_services_ui", "//base", "//components/bookmarks/browser", "//components/bookmarks/common", "//components/prefs", "//components/ui_metrics", + "//ios/chrome/app/strings:ios_strings", "//ios/chrome/browser", "//ios/chrome/browser/bookmarks", "//ios/chrome/browser/browser_state", @@ -62,7 +53,6 @@ source_set("unit_tests") { ] deps = [ ":activity_services", - ":activity_services_ui", "//base", "//base/test:test_support", "//components/bookmarks/browser", diff --git a/chromium/ios/chrome/browser/ui/activity_services/activities/BUILD.gn b/chromium/ios/chrome/browser/ui/activity_services/activities/BUILD.gn index a5109367733..22bde5fc79a 100644 --- a/chromium/ios/chrome/browser/ui/activity_services/activities/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/activity_services/activities/BUILD.gn @@ -44,7 +44,6 @@ source_set("activities") { "//ios/chrome/browser/ui/activity_services/data", "//ios/chrome/browser/ui/activity_services/requirements", "//ios/chrome/browser/ui/commands", - "//ios/chrome/browser/ui/context_menu", "//ios/chrome/browser/ui/util", "//ios/web/common:user_agent", "//ios/web/public", diff --git a/chromium/ios/chrome/browser/ui/authentication/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/BUILD.gn index fb1af2924a1..d99068aa954 100644 --- a/chromium/ios/chrome/browser/ui/authentication/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/BUILD.gn @@ -14,8 +14,6 @@ source_set("authentication") { "authentication_flow_performer_delegate.h", "authentication_ui_util.h", "authentication_ui_util.mm", - "chrome_signin_view_controller.h", - "chrome_signin_view_controller.mm", "re_signin_infobar_delegate.h", "re_signin_infobar_delegate.mm", "resized_avatar_cache.h", @@ -44,7 +42,6 @@ source_set("authentication") { "//ios/chrome/browser/browser_state", "//ios/chrome/browser/infobars", "//ios/chrome/browser/main:public", - "//ios/chrome/browser/metrics", "//ios/chrome/browser/signin", "//ios/chrome/browser/sync", "//ios/chrome/browser/ui:feature_flags", @@ -97,7 +94,6 @@ source_set("unit_tests") { sources = [ "authentication_flow_unittest.mm", "authentication_ui_util_unittest.mm", - "chrome_signin_view_controller_unittest.mm", "re_signin_infobar_delegate_unittest.mm", "signed_in_accounts_view_controller_unittest.mm", "signin_promo_view_mediator_unittest.mm", @@ -119,7 +115,6 @@ source_set("unit_tests") { "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/infobars", "//ios/chrome/browser/main:test_support", - "//ios/chrome/browser/metrics", "//ios/chrome/browser/prefs:browser_prefs", "//ios/chrome/browser/signin", "//ios/chrome/browser/signin:test_support", @@ -167,7 +162,6 @@ source_set("eg_test_support") { "//ios/chrome/browser/ui/authentication/cells", "//ios/chrome/browser/ui/authentication/unified_consent:unified_consent_ui", "//ios/chrome/browser/ui/authentication/unified_consent/identity_chooser:identity_chooser_ui", - "//ios/chrome/browser/ui/signin_interaction:eg_test_support", "//ios/chrome/browser/ui/util", "//ios/chrome/test:eg_test_support", "//ios/chrome/test/app:test_support", @@ -234,7 +228,6 @@ source_set("eg_test_support+eg2") { "//ios/chrome/app/strings", "//ios/chrome/browser/ui/authentication/cells:constants", "//ios/chrome/browser/ui/authentication/unified_consent:constants", - "//ios/chrome/browser/ui/signin_interaction:eg_test_support+eg2", "//ios/chrome/test:eg_test_support+eg2", "//ios/chrome/test/earl_grey:eg_test_support+eg2", "//ios/public/provider/chrome/browser/signin", diff --git a/chromium/ios/chrome/browser/ui/authentication/signin/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/signin/BUILD.gn index ecc50bad754..879128262a9 100644 --- a/chromium/ios/chrome/browser/ui/authentication/signin/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/signin/BUILD.gn @@ -92,3 +92,65 @@ source_set("constants") { ] frameworks = [ "Foundation.framework" ] } + +source_set("eg_tests") { + defines = [ "CHROME_EARL_GREY_1" ] + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ "signin_coordinator_egtest.mm" ] + deps = [ + "//base", + "//base/test:test_support", + "//ios/chrome/app:app_internal", + "//ios/chrome/app/strings", + "//ios/chrome/browser", + "//ios/chrome/browser/signin", + "//ios/chrome/browser/tabs", + "//ios/chrome/browser/ui/authentication", + "//ios/chrome/browser/ui/authentication:eg_test_support", + "//ios/chrome/browser/ui/authentication/cells", + "//ios/chrome/browser/ui/authentication/unified_consent/identity_chooser:identity_chooser_ui", + "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant", + "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui_constants", + "//ios/chrome/browser/ui/settings", + "//ios/chrome/browser/ui/settings/google_services:constants", + "//ios/chrome/browser/ui/table_view/cells", + "//ios/chrome/browser/ui/util", + "//ios/chrome/browser/web_state_list", + "//ios/chrome/test:eg_test_support", + "//ios/chrome/test/app:test_support", + "//ios/chrome/test/earl_grey:test_support", + "//ios/public/provider/chrome/browser/signin:constants", + "//ios/public/provider/chrome/browser/signin:fake_chrome_identity", + "//ios/testing/earl_grey:earl_grey_support", + "//ios/third_party/earl_grey:earl_grey+link", + "//ui/base", + "//ui/base", + ] + libs = [ "XCTest.framework" ] +} + +source_set("eg2_tests") { + defines = [ "CHROME_EARL_GREY_2" ] + configs += [ + "//build/config/compiler:enable_arc", + "//build/config/ios:xctest_config", + ] + testonly = true + sources = [ "signin_coordinator_egtest.mm" ] + deps = [ + "//base", + "//base/test:test_support", + "//ios/chrome/app/strings", + "//ios/chrome/browser/ui/authentication:eg_test_support+eg2", + "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui_constants", + "//ios/chrome/test/earl_grey:eg_test_support+eg2", + "//ios/public/provider/chrome/browser/signin:constants", + "//ios/public/provider/chrome/browser/signin:fake_chrome_identity", + "//ios/testing/earl_grey:eg_test_support+eg2", + "//ios/third_party/earl_grey2:test_lib", + "//ui/base", + ] + libs = [ "UIKit.framework" ] +} diff --git a/chromium/ios/chrome/browser/ui/authentication/signin/add_account_signin/BUILD.gn b/chromium/ios/chrome/browser/ui/authentication/signin/add_account_signin/BUILD.gn index d4a66cdc6ac..21a4a24de5f 100644 --- a/chromium/ios/chrome/browser/ui/authentication/signin/add_account_signin/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/signin/add_account_signin/BUILD.gn @@ -10,8 +10,8 @@ source_set("add_account_signin") { "add_account_signin_coordinator.h", "add_account_signin_coordinator.mm", "add_account_signin_enums.h", - "add_account_signin_mediator.h", - "add_account_signin_mediator.mm", + "add_account_signin_manager.h", + "add_account_signin_manager.mm", ] deps = [ "//components/prefs", @@ -34,7 +34,7 @@ source_set("add_account_signin") { source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true - sources = [ "add_account_signin_mediator_unittest.mm" ] + sources = [ "add_account_signin_manager_unittest.mm" ] deps = [ ":add_account_signin", "//base/test:test_support", diff --git a/chromium/ios/chrome/browser/ui/autofill/BUILD.gn b/chromium/ios/chrome/browser/ui/autofill/BUILD.gn index b390d00e652..7b64cc707c7 100644 --- a/chromium/ios/chrome/browser/ui/autofill/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/autofill/BUILD.gn @@ -119,6 +119,7 @@ source_set("autofill_ui") { "//ios/chrome/browser", "//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/infobars:infobars_ui", 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 7586fdcd23c..2fa6642482c 100644 --- a/chromium/ios/chrome/browser/ui/autofill/manual_fill/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/autofill/manual_fill/BUILD.gn @@ -164,6 +164,7 @@ source_set("unit_tests") { "//components/autofill/ios/form_util:form_util", "//components/autofill/ios/form_util:test_support", "//components/leveldb_proto:leveldb_proto", + "//components/prefs", "//ios/chrome/browser", "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/infobars", diff --git a/chromium/ios/chrome/browser/ui/blocking_overlay/BUILD.gn b/chromium/ios/chrome/browser/ui/blocking_overlay/BUILD.gn new file mode 100644 index 00000000000..8d3df803250 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/blocking_overlay/BUILD.gn @@ -0,0 +1,18 @@ +# Copyright 2020 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +source_set("blocking_overlay") { + configs += [ "//build/config/compiler:enable_arc" ] + + sources = [ + "blocking_overlay_view_controller.h", + "blocking_overlay_view_controller.mm", + ] + deps = [ + "//base", + "//ios/chrome/app:blocking_scene_commands", + "//ios/chrome/common/ui/util", + "//ui/base", + ] +} diff --git a/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn index ce103d652df..32003aea099 100644 --- a/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn @@ -75,6 +75,7 @@ source_set("bookmarks") { "//ios/chrome/browser/bookmarks", "//ios/chrome/browser/bookmarks:bookmarks_utils", "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/drag_and_drop", "//ios/chrome/browser/favicon", "//ios/chrome/browser/main:public", "//ios/chrome/browser/metrics:metrics_internal", @@ -100,9 +101,11 @@ source_set("bookmarks") { "//ios/chrome/browser/ui/table_view:presentation", "//ios/chrome/browser/ui/table_view:styler", "//ios/chrome/browser/ui/util", + "//ios/chrome/browser/ui/util:multiwindow_util", "//ios/chrome/browser/undo", "//ios/chrome/browser/url_loading", "//ios/chrome/browser/web_state_list", + "//ios/chrome/browser/window_activities", "//ios/chrome/common/ui/colors", "//ios/chrome/common/ui/favicon", "//ios/chrome/common/ui/util", diff --git a/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn b/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn index 423a1bdd630..f15495bd904 100644 --- a/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/browser_view/BUILD.gn @@ -89,7 +89,6 @@ source_set("browser_view") { "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/content_suggestions", "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant", - "//ios/chrome/browser/ui/context_menu", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/dialogs:dialogs_internal", "//ios/chrome/browser/ui/download", @@ -211,6 +210,7 @@ source_set("unit_tests") { "//components/bookmarks/browser", "//components/bookmarks/test", "//components/omnibox/browser:test_support", + "//components/open_from_clipboard:test_support", "//components/prefs:test_support", "//components/search_engines", "//components/sessions", diff --git a/chromium/ios/chrome/browser/ui/colors/BUILD.gn b/chromium/ios/chrome/browser/ui/colors/BUILD.gn index b1381eb8fb4..42e057fbe3d 100644 --- a/chromium/ios/chrome/browser/ui/colors/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/colors/BUILD.gn @@ -8,8 +8,6 @@ source_set("colors") { "MDCPalette+CrAdditions.h", "MDCPalette+CrAdditions.mm", ] - deps = [ - "//ios/third_party/material_components_ios", - "//ios/web", - ] + deps = [ "//ios/web" ] + public_deps = [ "//ios/third_party/material_components_ios" ] } diff --git a/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn b/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn index 2c13c8128ed..257fb51836c 100644 --- a/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn @@ -28,6 +28,7 @@ source_set("content_suggestions") { "ntp_home_metrics.mm", ] deps = [ + ":feature_flags", "//base", "//components/favicon/core", "//components/feed/core/shared_prefs:feed_shared_prefs", @@ -41,6 +42,7 @@ source_set("content_suggestions") { "//ios/chrome/app/strings", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/drag_and_drop", "//ios/chrome/browser/favicon", "//ios/chrome/browser/main:public", "//ios/chrome/browser/metrics:metrics_internal", @@ -77,6 +79,7 @@ source_set("content_suggestions") { "//ios/chrome/common/ui/favicon", "//ios/chrome/common/ui/util", "//ios/public/provider/chrome/browser", + "//ios/public/provider/chrome/browser/discover_feed", "//ios/public/provider/chrome/browser/images", "//ios/public/provider/chrome/browser/signin", "//ios/public/provider/chrome/browser/ui", @@ -125,6 +128,7 @@ source_set("content_suggestions_ui") { ":constants", ":content_suggestions_constant", ":content_suggestions_ui_util", + ":feature_flags", "resources:content_suggestions_no_image", "resources:content_suggestions_offline", "resources:ntp_search_icon", @@ -419,3 +423,12 @@ source_set("test_support") { ] configs += [ "//build/config/compiler:enable_arc" ] } + +source_set("feature_flags") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "content_suggestions_feature.h", + "content_suggestions_feature.mm", + ] + public_deps = [ "//base" ] +} 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 27201983ed7..5ba5ba82fe4 100644 --- a/chromium/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn @@ -33,6 +33,8 @@ source_set("cells_ui") { "content_suggestions_articles_header_item.mm", "content_suggestions_cell.h", "content_suggestions_cell.mm", + "content_suggestions_discover_item.h", + "content_suggestions_discover_item.mm", "content_suggestions_footer_item.h", "content_suggestions_footer_item.mm", "content_suggestions_header_item.h", diff --git a/chromium/ios/chrome/browser/ui/context_menu/BUILD.gn b/chromium/ios/chrome/browser/ui/context_menu/BUILD.gn deleted file mode 100644 index d02973ffc13..00000000000 --- a/chromium/ios/chrome/browser/ui/context_menu/BUILD.gn +++ /dev/null @@ -1,32 +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("context_menu") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "context_menu_coordinator.h", - "context_menu_coordinator.mm", - ] - deps = [ - "//base", - "//ios/chrome/browser", - "//ios/chrome/browser/ui/alert_coordinator", - "//ios/chrome/browser/ui/coordinators:chrome_coordinators", - "//ui/base", - "//ui/strings", - ] -} - -source_set("unit_tests") { - configs += [ "//build/config/compiler:enable_arc" ] - testonly = true - sources = [ "context_menu_coordinator_unittest.mm" ] - deps = [ - ":context_menu", - "//base", - "//base/test:test_support", - "//ios/chrome/browser/main:test_support", - "//testing/gtest", - ] -} diff --git a/chromium/ios/chrome/browser/ui/elements/BUILD.gn b/chromium/ios/chrome/browser/ui/elements/BUILD.gn index 1d4a3ec8552..f21517bcd0f 100644 --- a/chromium/ios/chrome/browser/ui/elements/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/elements/BUILD.gn @@ -18,6 +18,8 @@ source_set("elements") { "selector_view_controller_delegate.h", "text_field_configuration.h", "text_field_configuration.mm", + "text_view_selection_disabled.h", + "text_view_selection_disabled.mm", "top_aligned_image_view.h", "top_aligned_image_view.mm", "windowed_container_view.h", diff --git a/chromium/ios/chrome/browser/ui/first_run/BUILD.gn b/chromium/ios/chrome/browser/ui/first_run/BUILD.gn index ed539619350..0ccd207f22c 100644 --- a/chromium/ios/chrome/browser/ui/first_run/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/first_run/BUILD.gn @@ -5,8 +5,6 @@ source_set("first_run") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ - "first_run_chrome_signin_view_controller.h", - "first_run_chrome_signin_view_controller.mm", "first_run_util.h", "first_run_util.mm", "orientation_limiting_navigation_controller.h", @@ -27,6 +25,7 @@ source_set("first_run") { "//components/metrics", "//components/prefs", "//components/signin/public/identity_manager", + "//ios/chrome/app:tests_hook", "//ios/chrome/app/strings", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", @@ -38,6 +37,7 @@ source_set("first_run") { "//ios/chrome/browser/ui/authentication", "//ios/chrome/browser/ui/authentication/signin", "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/elements", "//ios/chrome/browser/ui/fancy_ui", "//ios/chrome/browser/ui/icons", "//ios/chrome/browser/ui/material_components", diff --git a/chromium/ios/chrome/browser/ui/history/BUILD.gn b/chromium/ios/chrome/browser/ui/history/BUILD.gn index f13380b71e0..e82074921fd 100644 --- a/chromium/ios/chrome/browser/ui/history/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/history/BUILD.gn @@ -25,7 +25,7 @@ source_set("history") { "//ios/chrome/browser/history", "//ios/chrome/browser/main:public", "//ios/chrome/browser/sync", - "//ios/chrome/browser/ui/context_menu", + "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/table_view:feature_flags", @@ -81,12 +81,13 @@ source_set("history_ui") { "//ios/chrome/app/strings", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/drag_and_drop", "//ios/chrome/browser/main:public", "//ios/chrome/browser/metrics:metrics_internal", "//ios/chrome/browser/sync", + "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/collection_view/cells", "//ios/chrome/browser/ui/commands", - "//ios/chrome/browser/ui/context_menu", "//ios/chrome/browser/ui/list_model", "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/table_view:presentation", @@ -94,8 +95,10 @@ source_set("history_ui") { "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/browser/ui/table_view/cells:cells_constants", "//ios/chrome/browser/ui/util", + "//ios/chrome/browser/ui/util:multiwindow_util", "//ios/chrome/browser/url_loading", "//ios/chrome/browser/web_state_list", + "//ios/chrome/browser/window_activities", "//ios/chrome/common/ui/favicon", "//ios/chrome/common/ui/util", "//ui/base", diff --git a/chromium/ios/chrome/browser/ui/infobars/modals/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/modals/BUILD.gn index 7277a598555..cf5fedb8b80 100644 --- a/chromium/ios/chrome/browser/ui/infobars/modals/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/infobars/modals/BUILD.gn @@ -12,6 +12,7 @@ source_set("modals") { "infobar_password_modal_delegate.h", "infobar_password_table_view_controller.h", "infobar_password_table_view_controller.mm", + "infobar_save_card_modal_consumer.h", "infobar_save_card_modal_delegate.h", "infobar_save_card_table_view_controller.h", "infobar_save_card_table_view_controller.mm", diff --git a/chromium/ios/chrome/browser/ui/infobars/modals/test/BUILD.gn b/chromium/ios/chrome/browser/ui/infobars/modals/test/BUILD.gn index 8f8c62452b9..2b7c983e03a 100644 --- a/chromium/ios/chrome/browser/ui/infobars/modals/test/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/infobars/modals/test/BUILD.gn @@ -8,6 +8,11 @@ source_set("test") { sources = [ "fake_infobar_password_modal_consumer.h", "fake_infobar_password_modal_consumer.mm", + "fake_infobar_translate_modal_consumer.h", + "fake_infobar_translate_modal_consumer.mm", + ] + deps = [ + "//ios/chrome/browser/ui/infobars/coordinators:translate_public", + "//ios/chrome/browser/ui/infobars/modals", ] - deps = [ "//ios/chrome/browser/ui/infobars/modals" ] } diff --git a/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn b/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn index 4c473533908..96979190b68 100644 --- a/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/location_bar/BUILD.gn @@ -38,6 +38,7 @@ source_set("location_bar") { "//ios/chrome/browser", "//ios/chrome/browser/autocomplete", "//ios/chrome/browser/browser_state:browser_state", + "//ios/chrome/browser/drag_and_drop", "//ios/chrome/browser/geolocation:geolocation_internal", "//ios/chrome/browser/infobars:badge", "//ios/chrome/browser/infobars:public", @@ -70,6 +71,7 @@ source_set("location_bar") { "//ios/chrome/browser/ui/toolbar/public:feature_flags", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/ui/voice", + "//ios/chrome/browser/ui/whats_new:utils", "//ios/chrome/browser/url_loading", "//ios/chrome/browser/web", "//ios/chrome/browser/web_state_list", diff --git a/chromium/ios/chrome/browser/ui/main/BUILD.gn b/chromium/ios/chrome/browser/ui/main/BUILD.gn index aac15b3ee53..954200864d5 100644 --- a/chromium/ios/chrome/browser/ui/main/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/main/BUILD.gn @@ -26,6 +26,7 @@ source_set("scene_guts") { source_set("scene") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ + "connection_information.h", "scene_controller.h", "scene_controller.mm", "scene_delegate.h", @@ -42,9 +43,11 @@ source_set("scene") { "//components/signin/public/identity_manager", "//components/url_formatter", "//ios/chrome/app:app", + "//ios/chrome/app:blocking_scene_commands", "//ios/chrome/app:mode", "//ios/chrome/app:tests_hook", "//ios/chrome/app/application_delegate:tab_opening", + "//ios/chrome/app/application_delegate:url_opener_params", "//ios/chrome/browser", "//ios/chrome/browser:chrome_url_constants", "//ios/chrome/browser/browser_state", @@ -59,17 +62,15 @@ source_set("scene") { "//ios/chrome/browser/ntp_snippets:ntp_snippets", "//ios/chrome/browser/signin", "//ios/chrome/browser/snapshots", - "//ios/chrome/browser/tabs:tabs", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/authentication", "//ios/chrome/browser/ui/authentication/signin", + "//ios/chrome/browser/ui/blocking_overlay", "//ios/chrome/browser/ui/browser_view", "//ios/chrome/browser/ui/commands:commands", "//ios/chrome/browser/ui/first_run", "//ios/chrome/browser/ui/history", - "//ios/chrome/browser/ui/promos", "//ios/chrome/browser/ui/settings:settings_root", - "//ios/chrome/browser/ui/signin_interaction", "//ios/chrome/browser/ui/tab_grid", "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/util", @@ -77,6 +78,7 @@ source_set("scene") { "//ios/chrome/browser/url_loading", "//ios/chrome/browser/web_state_list", "//ios/chrome/browser/window_activities", + "//ios/chrome/common/ui/util", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/mailto", "//ios/public/provider/chrome/browser/signin", diff --git a/chromium/ios/chrome/browser/ui/main/test/BUILD.gn b/chromium/ios/chrome/browser/ui/main/test/BUILD.gn index a2e9ab29d83..0747f6c5ba8 100644 --- a/chromium/ios/chrome/browser/ui/main/test/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/main/test/BUILD.gn @@ -6,6 +6,8 @@ source_set("test") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ + "fake_connection_information.h", + "fake_connection_information.mm", "fake_scene_state.h", "fake_scene_state.mm", "stub_browser_interface.h", diff --git a/chromium/ios/chrome/browser/ui/ntp/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp/BUILD.gn index 1aeaaefe608..cccfe6d3201 100644 --- a/chromium/ios/chrome/browser/ui/ntp/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/ntp/BUILD.gn @@ -22,9 +22,12 @@ source_set("coordinator") { ":ntp", ":ntp_internal", "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/content_settings", "//ios/chrome/browser/main:public", + "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/content_suggestions", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", + "//ios/chrome/browser/ui/settings/privacy", "//ios/chrome/browser/url_loading", "//ios/chrome/browser/web_state_list", "//ios/public/provider/chrome/browser/voice", @@ -105,11 +108,11 @@ source_set("ntp_internal") { "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant", "//ios/chrome/browser/ui/content_suggestions/cells", - "//ios/chrome/browser/ui/context_menu", "//ios/chrome/browser/ui/favicon", "//ios/chrome/browser/ui/overscroll_actions", "//ios/chrome/browser/ui/page_info:features", "//ios/chrome/browser/ui/settings/cells", + "//ios/chrome/browser/ui/settings/privacy:privacy_ui", "//ios/chrome/browser/ui/toolbar/buttons", "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/util", diff --git a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn index aea36635b44..d8948053aff 100644 --- a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn @@ -160,6 +160,7 @@ source_set("omnibox_internal") { "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/toolbar/public:feature_flags", "//ios/chrome/browser/ui/util", + "//ios/chrome/browser/ui/whats_new:utils", "//ios/chrome/common", "//ios/chrome/common/ui/colors", "//ios/chrome/common/ui/favicon", diff --git a/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn index 690d0a6931d..19d659381aa 100644 --- a/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/omnibox/popup/BUILD.gn @@ -38,6 +38,7 @@ source_set("popup") { "//ios/chrome/browser/ui/toolbar/public", "//ios/chrome/browser/ui/toolbar/public:feature_flags", "//ios/chrome/browser/ui/util", + "//ios/chrome/browser/ui/whats_new:utils", "//ios/chrome/browser/web_state_list:web_state_list", "//ios/chrome/common/ui/colors", "//ios/chrome/common/ui/favicon", 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 e7b023eb62d..8785f23ca15 100644 --- a/chromium/ios/chrome/browser/ui/overlays/infobar_banner/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/BUILD.gn @@ -8,7 +8,10 @@ source_set("infobar_banner") { configs += [ "//build/config/compiler:enable_arc" ] - deps = [ ":coordinators" ] + deps = [ + ":coordinators", + "//ios/chrome/browser/ui/overlays/infobar_banner/translate:coordinators", + ] } source_set("coordinators") { @@ -31,6 +34,8 @@ source_set("coordinators") { "//ios/chrome/browser/ui/overlays:util", "//ios/chrome/browser/ui/overlays/infobar_banner/confirm", "//ios/chrome/browser/ui/overlays/infobar_banner/passwords", + "//ios/chrome/browser/ui/overlays/infobar_banner/save_card", + "//ios/chrome/browser/ui/overlays/infobar_banner/translate:mediators", "//ios/chrome/browser/ui/util", ] } diff --git a/chromium/ios/chrome/browser/ui/overlays/infobar_banner/save_card/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/save_card/BUILD.gn new file mode 100644 index 00000000000..69c920fa654 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/save_card/BUILD.gn @@ -0,0 +1,54 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +source_set("save_card") { + sources = [ + "save_card_infobar_banner_overlay_mediator.h", + "save_card_infobar_banner_overlay_mediator.mm", + ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + "//base", + "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/infobar_banner", + "//ios/chrome/browser/overlays/public/infobar_modal", + "//ios/chrome/browser/ui/infobars/banners", + "//ios/chrome/browser/ui/overlays:coordinators", + "//ios/chrome/browser/ui/overlays/infobar_banner:mediators", + "//ui/base", + ] +} + +source_set("unit_tests") { + testonly = true + sources = [ "save_card_infobar_banner_overlay_mediator_unittest.mm" ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + ":save_card", + "//base/test:test_support", + "//components/autofill/core/browser", + "//components/autofill/core/browser:test_support", + "//components/infobars/core", + "//components/prefs", + "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser/infobars", + "//ios/chrome/browser/infobars/test", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/infobar_banner", + "//ios/chrome/browser/overlays/public/infobar_modal", + "//ios/chrome/browser/overlays/test", + "//ios/chrome/browser/ui/infobars:feature_flags", + "//ios/chrome/browser/ui/infobars/banners/test", + "//ios/chrome/browser/ui/infobars/test", + "//ios/chrome/browser/ui/overlays/test", + "//testing/gmock", + "//testing/gtest", + "//ui/base", + ] +} diff --git a/chromium/ios/chrome/browser/ui/overlays/infobar_banner/translate/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/translate/BUILD.gn new file mode 100644 index 00000000000..d50f62b454c --- /dev/null +++ b/chromium/ios/chrome/browser/ui/overlays/infobar_banner/translate/BUILD.gn @@ -0,0 +1,69 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +source_set("coordinators") { + sources = [ + "translate_infobar_placeholder_overlay_coordinator.h", + "translate_infobar_placeholder_overlay_coordinator.mm", + ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + "//ios/chrome/browser/overlays/public/common/infobars", + "//ios/chrome/browser/overlays/public/infobar_banner", + "//ios/chrome/browser/ui/overlays:coordinators", + "//ios/chrome/browser/ui/overlays/infobar_banner:coordinators", + ] +} + +source_set("mediators") { + sources = [ + "translate_infobar_banner_overlay_mediator.h", + "translate_infobar_banner_overlay_mediator.mm", + ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + "//base", + "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/infobar_banner", + "//ios/chrome/browser/ui/infobars/banners", + "//ios/chrome/browser/ui/overlays:coordinators", + "//ios/chrome/browser/ui/overlays/infobar_banner:mediators", + "//ui/base", + ] +} + +source_set("unit_tests") { + testonly = true + sources = [ "translate_infobar_banner_overlay_mediator_unittest.mm" ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + ":mediators", + "//base/test:test_support", + "//components/infobars/core", + "//components/strings:components_strings_grit", + "//components/translate/core/browser:test_support", + "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser/infobars", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/common/infobars", + "//ios/chrome/browser/overlays/public/infobar_banner", + "//ios/chrome/browser/overlays/test", + "//ios/chrome/browser/translate:test_support", + "//ios/chrome/browser/ui/infobars:feature_flags", + "//ios/chrome/browser/ui/infobars/banners/test", + "//ios/chrome/browser/ui/infobars/test", + "//ios/chrome/browser/ui/overlays:coordinators", + "//ios/chrome/browser/ui/overlays/test", + "//testing/gmock", + "//testing/gtest", + "//ui/base", + ] +} diff --git a/chromium/ios/chrome/browser/ui/overlays/infobar_modal/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/infobar_modal/BUILD.gn index 3088738bf32..d7feb936026 100644 --- a/chromium/ios/chrome/browser/ui/overlays/infobar_modal/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/overlays/infobar_modal/BUILD.gn @@ -8,7 +8,11 @@ source_set("infobar_modal") { configs += [ "//build/config/compiler:enable_arc" ] - deps = [ "//ios/chrome/browser/ui/overlays/infobar_modal/passwords" ] + deps = [ + "//ios/chrome/browser/ui/overlays/infobar_modal/passwords", + "//ios/chrome/browser/ui/overlays/infobar_modal/save_card", + "//ios/chrome/browser/ui/overlays/infobar_modal/translate", + ] } source_set("coordinators") { diff --git a/chromium/ios/chrome/browser/ui/overlays/infobar_modal/save_card/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/infobar_modal/save_card/BUILD.gn new file mode 100644 index 00000000000..802a94a1271 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/overlays/infobar_modal/save_card/BUILD.gn @@ -0,0 +1,64 @@ +# Copyright 2020 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +source_set("save_card") { + sources = [ + "save_card_infobar_modal_overlay_coordinator.h", + "save_card_infobar_modal_overlay_coordinator.mm", + "save_card_infobar_modal_overlay_mediator.h", + "save_card_infobar_modal_overlay_mediator.mm", + "save_card_infobar_modal_overlay_mediator_delegate.h", + ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + "//base", + "//components/autofill/core/common", + "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/common/infobars", + "//ios/chrome/browser/overlays/public/infobar_modal", + "//ios/chrome/browser/ui/autofill:autofill_message", + "//ios/chrome/browser/ui/infobars/modals", + "//ios/chrome/browser/ui/overlays:coordinators", + "//ios/chrome/browser/ui/overlays/infobar_modal:coordinators", + "//ios/chrome/browser/ui/overlays/infobar_modal:mediators", + "//ios/chrome/browser/ui/util", + "//ui/base", + ] +} + +source_set("unit_tests") { + testonly = true + sources = [ "save_card_infobar_modal_overlay_mediator_unittest.mm" ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + "//base/test:test_support", + "//components/autofill/core/browser", + "//components/autofill/core/browser:test_support", + "//components/infobars/core", + "//components/infobars/core:feature_flags", + "//components/prefs", + "//ios/chrome/browser/infobars", + "//ios/chrome/browser/infobars/test", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/infobar_modal", + "//ios/chrome/browser/overlays/test", + "//ios/chrome/browser/ui/autofill:autofill_message", + "//ios/chrome/browser/ui/infobars:feature_flags", + "//ios/chrome/browser/ui/infobars/modals", + "//ios/chrome/browser/ui/infobars/modals/test", + "//ios/chrome/browser/ui/infobars/test", + "//ios/chrome/browser/ui/overlays/infobar_modal/save_card", + "//ios/chrome/browser/ui/overlays/test", + "//testing/gmock", + "//testing/gtest", + "//third_party/ocmock", + "//ui/base", + "//url", + ] +} diff --git a/chromium/ios/chrome/browser/ui/overlays/infobar_modal/translate/BUILD.gn b/chromium/ios/chrome/browser/ui/overlays/infobar_modal/translate/BUILD.gn new file mode 100644 index 00000000000..726e1c90d04 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/overlays/infobar_modal/translate/BUILD.gn @@ -0,0 +1,65 @@ +# Copyright 2020 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +source_set("translate") { + sources = [ + "translate_infobar_modal_overlay_coordinator.h", + "translate_infobar_modal_overlay_coordinator.mm", + "translate_infobar_modal_overlay_mediator.h", + "translate_infobar_modal_overlay_mediator.mm", + "translate_infobar_modal_overlay_mediator_delegate.h", + ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + "//base", + "//components/metrics", + "//components/translate/core/browser", + "//ios/chrome/app/strings:ios_strings_grit", + "//ios/chrome/browser/infobars:public", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/common/infobars", + "//ios/chrome/browser/overlays/public/infobar_modal", + "//ios/chrome/browser/translate:public", + "//ios/chrome/browser/ui/infobars/coordinators:translate_public", + "//ios/chrome/browser/ui/infobars/modals", + "//ios/chrome/browser/ui/list_model", + "//ios/chrome/browser/ui/overlays:coordinators", + "//ios/chrome/browser/ui/overlays/infobar_modal:coordinators", + "//ios/chrome/browser/ui/overlays/infobar_modal:mediators", + "//ios/chrome/browser/ui/table_view/cells", + "//ui/base", + ] +} + +source_set("unit_tests") { + testonly = true + sources = [ "translate_infobar_modal_overlay_mediator_unittest.mm" ] + + configs += [ "//build/config/compiler:enable_arc" ] + + deps = [ + ":translate", + "//base/test:test_support", + "//components/infobars/core", + "//components/infobars/core:feature_flags", + "//components/translate/core/browser:test_support", + "//ios/chrome/browser/infobars", + "//ios/chrome/browser/infobars/test", + "//ios/chrome/browser/overlays", + "//ios/chrome/browser/overlays/public/infobar_modal", + "//ios/chrome/browser/overlays/test", + "//ios/chrome/browser/translate:test_support", + "//ios/chrome/browser/ui/infobars:feature_flags", + "//ios/chrome/browser/ui/infobars/coordinators:translate_public", + "//ios/chrome/browser/ui/infobars/modals/test", + "//ios/chrome/browser/ui/infobars/test", + "//ios/chrome/browser/ui/overlays/test", + "//testing/gmock", + "//testing/gtest", + "//third_party/ocmock", + "//ui/base", + ] +} diff --git a/chromium/ios/chrome/browser/ui/page_info/BUILD.gn b/chromium/ios/chrome/browser/ui/page_info/BUILD.gn index 78d434db320..b1c3fe590a8 100644 --- a/chromium/ios/chrome/browser/ui/page_info/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/page_info/BUILD.gn @@ -7,12 +7,17 @@ source_set("page_info") { sources = [ "legacy_page_info_view_controller.h", "legacy_page_info_view_controller.mm", + "page_info_cookies_commands.h", "page_info_site_security_description.h", "page_info_site_security_description.mm", "page_info_view_controller.h", "page_info_view_controller.mm", ] deps = [ + "resources:cookies_icon", + "resources:security_icon_dangerous", + "resources:security_icon_not_secure", + "resources:security_icon_secure", "//base", "//base:i18n", "//components/keyed_service/core", @@ -23,12 +28,14 @@ source_set("page_info") { "//ios/chrome/app/theme", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/fancy_ui", "//ios/chrome/browser/ui/page_info:features", "//ios/chrome/browser/ui/page_info/requirements", "//ios/chrome/browser/ui/popup_menu", "//ios/chrome/browser/ui/settings/cells", + "//ios/chrome/browser/ui/settings/privacy:privacy_ui", "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/util", "//ios/chrome/common", @@ -73,25 +80,32 @@ source_set("coordinator") { "page_info_site_security_mediator.mm", ] deps = [ + ":features", ":page_info", "resources:page_info_bad", "resources:page_info_good", "resources:page_info_info", "resources:page_info_offline", "//base", + "//components/content_settings/core/browser", "//components/security_state/core", "//components/ssl_errors", "//components/strings", "//ios/chrome/app/strings", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/content_settings", "//ios/chrome/browser/main", "//ios/chrome/browser/reading_list", "//ios/chrome/browser/tabs", + "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/fullscreen:coordinators", "//ios/chrome/browser/ui/page_info/requirements", + "//ios/chrome/browser/ui/settings/privacy", + "//ios/chrome/browser/ui/settings/utils", + "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/web_state_list", "//ios/components/webui:url_constants", "//ios/web", diff --git a/chromium/ios/chrome/browser/ui/page_info/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/page_info/resources/BUILD.gn index 47541afa890..93f047d5b84 100644 --- a/chromium/ios/chrome/browser/ui/page_info/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/page_info/resources/BUILD.gn @@ -35,3 +35,36 @@ imageset("page_info_info") { "page_info_info.imageset/page_info_info@3x.png", ] } + +imageset("security_icon_dangerous") { + sources = [ + "security_icon_dangerous.imageset/Contents.json", + "security_icon_dangerous.imageset/security_icon_dangerous@2x.png", + "security_icon_dangerous.imageset/security_icon_dangerous@3x.png", + ] +} + +imageset("security_icon_not_secure") { + sources = [ + "security_icon_not_secure.imageset/Contents.json", + "security_icon_not_secure.imageset/security_icon_not_secure@2x.png", + "security_icon_not_secure.imageset/security_icon_not_secure@3x.png", + ] +} + +imageset("security_icon_secure") { + sources = [ + "security_icon_secure.imageset/Contents.json", + "security_icon_secure.imageset/security_icon_secure@2x.png", + "security_icon_secure.imageset/security_icon_secure@3x.png", + ] +} + +imageset("cookies_icon") { + sources = [ + "cookies_icon.imageset/Contents.json", + "cookies_icon.imageset/cookies_icon.png", + "cookies_icon.imageset/cookies_icon@2x.png", + "cookies_icon.imageset/cookies_icon@3x.png", + ] +} diff --git a/chromium/ios/chrome/browser/ui/passwords/BUILD.gn b/chromium/ios/chrome/browser/ui/passwords/BUILD.gn index 47f3c9f7c44..ddd2b74c14d 100644 --- a/chromium/ios/chrome/browser/ui/passwords/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/passwords/BUILD.gn @@ -10,8 +10,6 @@ source_set("passwords") { "password_breach_consumer.h", "password_breach_coordinator.h", "password_breach_coordinator.mm", - "password_breach_learn_more_view_controller.h", - "password_breach_learn_more_view_controller.mm", "password_breach_mediator.h", "password_breach_mediator.mm", "password_breach_presenter.h", @@ -31,6 +29,7 @@ source_set("passwords") { "//ios/chrome/browser/ui/util", "//ios/chrome/common/ui/colors", "//ios/chrome/common/ui/confirmation_alert", + "//ios/chrome/common/ui/elements:popover_label_view_controller", "//ios/chrome/common/ui/util", "//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 c7ceec7bc94..bfa2714a22f 100644 --- a/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/popup_menu/BUILD.gn @@ -20,6 +20,7 @@ source_set("popup_menu") { "resources:popup_menu_close_tab", "resources:popup_menu_downloads", "resources:popup_menu_edit_bookmark", + "resources:popup_menu_enterprise_icon", "resources:popup_menu_find_in_page", "resources:popup_menu_help", "resources:popup_menu_history", @@ -58,6 +59,7 @@ source_set("popup_menu") { "//ios/chrome/browser/find_in_page", "//ios/chrome/browser/main:public", "//ios/chrome/browser/overlays", + "//ios/chrome/browser/policy", "//ios/chrome/browser/policy:feature_flags", "//ios/chrome/browser/reading_list", "//ios/chrome/browser/search_engines", @@ -84,6 +86,7 @@ source_set("popup_menu") { "//ios/chrome/browser/web:feature_flags", "//ios/chrome/browser/web_state_list", "//ios/chrome/browser/window_activities", + "//ios/chrome/common/ui/colors", "//ios/components/webui:url_constants", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/user_feedback", @@ -167,6 +170,7 @@ source_set("eg2_tests") { ":constants", "//base/test:test_support", "//components/strings", + "//components/version_info", "//ios/chrome/app/strings", "//ios/chrome/test/earl_grey:eg_test_support+eg2", "//ios/testing/earl_grey:eg_test_support+eg2", @@ -191,6 +195,7 @@ source_set("eg_tests") { "//base", "//base/test:test_support", "//components/strings", + "//components/version_info", "//ios/chrome/app/strings", "//ios/chrome/browser/ui/popup_menu:constants", "//ios/chrome/browser/ui/util", diff --git a/chromium/ios/chrome/browser/ui/popup_menu/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/cells/BUILD.gn index d7ac625f952..5240eb1bc88 100644 --- a/chromium/ios/chrome/browser/ui/popup_menu/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/popup_menu/cells/BUILD.gn @@ -7,6 +7,8 @@ source_set("cells") { sources = [ "popup_menu_navigation_item.h", "popup_menu_navigation_item.mm", + "popup_menu_text_item.h", + "popup_menu_text_item.mm", "popup_menu_tools_item.h", "popup_menu_tools_item.mm", ] diff --git a/chromium/ios/chrome/browser/ui/popup_menu/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/popup_menu/resources/BUILD.gn index 46097a01a5b..6abd67909db 100644 --- a/chromium/ios/chrome/browser/ui/popup_menu/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/popup_menu/resources/BUILD.gn @@ -232,3 +232,11 @@ imageset("popup_menu_text_zoom") { "popup_menu_text_zoom.imageset/popup_menu_text_zoom@3x.png", ] } + +imageset("popup_menu_enterprise_icon") { + sources = [ + "popup_menu_enterprise_icon.imageset/Contents.json", + "popup_menu_enterprise_icon.imageset/popup_menu_enterprise_icon@2x.png", + "popup_menu_enterprise_icon.imageset/popup_menu_enterprise_icon@3x.png", + ] +} diff --git a/chromium/ios/chrome/browser/ui/promos/BUILD.gn b/chromium/ios/chrome/browser/ui/promos/BUILD.gn deleted file mode 100644 index 6d4777be449..00000000000 --- a/chromium/ios/chrome/browser/ui/promos/BUILD.gn +++ /dev/null @@ -1,34 +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("promos") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - # TODO(crbug.com/738881): Just move this into ui/signin - "signin_promo_view_controller.h", - "signin_promo_view_controller.mm", - ] - deps = [ - "//base", - "//components/signin/ios/browser", - "//components/signin/public/base", - "//components/version_info", - "//ios/chrome/app:tests_hook", - "//ios/chrome/app/strings", - "//ios/chrome/browser/browser_state", - "//ios/chrome/browser/main", - "//ios/chrome/browser/signin", - "//ios/chrome/browser/ui/authentication/signin", - "//ios/chrome/browser/ui/commands", - "//ios/chrome/common/ui/colors", - "//ios/public/provider/chrome/browser", - "//ios/public/provider/chrome/browser/signin", - "//net", - - # TODO(crbug.com/971989):Remove when this class is deprecated. - "//ios/chrome/browser/ui/authentication/signin/user_signin", - ] - public_deps = [ "//ios/chrome/browser/ui/authentication" ] - libs = [ "UIKit.framework" ] -} diff --git a/chromium/ios/chrome/browser/ui/qr_generator/BUILD.gn b/chromium/ios/chrome/browser/ui/qr_generator/BUILD.gn index 11c53fd2997..46e387de04e 100644 --- a/chromium/ios/chrome/browser/ui/qr_generator/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/qr_generator/BUILD.gn @@ -42,6 +42,7 @@ source_set("qr_generator") { "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/common/ui/confirmation_alert", + "//ios/chrome/common/ui/elements:popover_label_view_controller", "//net", "//ui/base", ] @@ -62,6 +63,7 @@ source_set("unit_tests") { "//ios/chrome/browser/main:test_support", "//ios/chrome/browser/ui/commands", "//ios/chrome/common/ui/confirmation_alert", + "//ios/chrome/common/ui/elements:popover_label_view_controller", "//ios/chrome/test:test_support", "//ios/chrome/test/fakes", "//ios/web", diff --git a/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn b/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn index 835a6c66047..e9f9c68808b 100644 --- a/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn @@ -6,7 +6,6 @@ source_set("reading_list") { sources = [ "reading_list_coordinator.h", "reading_list_coordinator.mm", - "reading_list_list_item.h", "reading_list_list_item_custom_action_factory.h", "reading_list_list_item_custom_action_factory.mm", "reading_list_list_item_factory.h", @@ -57,6 +56,7 @@ source_set("reading_list") { "//ios/chrome/browser/ui/util", "//ios/chrome/browser/url_loading", "//ios/chrome/browser/web_state_list", + "//ios/chrome/browser/window_activities", "//ios/chrome/common/ui/favicon", "//ios/web", "//ios/web/public", @@ -86,6 +86,7 @@ source_set("reading_list_ui") { "number_badge_view.mm", "reading_list_data_sink.h", "reading_list_data_source.h", + "reading_list_list_item.h", "reading_list_list_item_accessibility_delegate.h", "reading_list_list_item_updater.h", "reading_list_list_view_controller_audience.h", @@ -110,6 +111,7 @@ source_set("reading_list_ui") { "//components/url_formatter", "//ios/chrome/app/strings", "//ios/chrome/browser", + "//ios/chrome/browser/drag_and_drop", "//ios/chrome/browser/main:public", "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/keyboard", @@ -122,6 +124,7 @@ source_set("reading_list_ui") { "//ios/chrome/common", "//ios/chrome/common/ui/colors", "//ios/chrome/common/ui/favicon", + "//net", "//ui/base", "//ui/strings:ui_strings_grit", "//url", diff --git a/chromium/ios/chrome/browser/ui/reading_list/context_menu/BUILD.gn b/chromium/ios/chrome/browser/ui/reading_list/context_menu/BUILD.gn index 2854787356d..dc5b44617c0 100644 --- a/chromium/ios/chrome/browser/ui/reading_list/context_menu/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/reading_list/context_menu/BUILD.gn @@ -18,6 +18,7 @@ source_set("context_menu") { "//ios/chrome/browser/main:public", "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/util:multiwindow_util", "//ui/base", "//ui/strings:ui_strings_grit", "//url", diff --git a/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn b/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn index 6364cf491f7..7930d1a11cb 100644 --- a/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/recent_tabs/BUILD.gn @@ -71,16 +71,17 @@ source_set("recent_tabs_ui") { "//components/sync", "//ios/chrome/app/strings", "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/drag_and_drop", "//ios/chrome/browser/main:public", "//ios/chrome/browser/metrics:metrics_internal", "//ios/chrome/browser/sessions", "//ios/chrome/browser/sessions:serialisation", "//ios/chrome/browser/sync", "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/authentication", "//ios/chrome/browser/ui/authentication/cells", "//ios/chrome/browser/ui/commands", - "//ios/chrome/browser/ui/context_menu", "//ios/chrome/browser/ui/settings/sync/utils", "//ios/chrome/browser/ui/signin_interaction/public", "//ios/chrome/browser/ui/table_view", diff --git a/chromium/ios/chrome/browser/ui/settings/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/BUILD.gn index efe0a7e20ae..1c8652c3ada 100644 --- a/chromium/ios/chrome/browser/ui/settings/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/BUILD.gn @@ -73,6 +73,7 @@ source_set("settings") { ":settings_root", "resources:app_icon_placeholder", "resources:encryption_error", + "resources:enterprise_icon", "resources:settings_about_chrome", "resources:settings_accounts_add_account", "resources:settings_addresses", @@ -82,11 +83,14 @@ source_set("settings") { "resources:settings_content_settings", "resources:settings_debug", "resources:settings_error", + "resources:settings_info", "resources:settings_language_settings", "resources:settings_passwords", "resources:settings_payment_methods", "resources:settings_privacy", + "resources:settings_safe_state", "resources:settings_search_engine", + "resources:settings_unsafe_state", "resources:settings_voice_search", "resources:sync_and_google_services", "resources:sync_and_google_services_sync_error", @@ -106,6 +110,7 @@ source_set("settings") { "//components/keyed_service/core", "//components/password_manager/core/browser", "//components/password_manager/core/common", + "//components/prefs", "//components/prefs/ios", "//components/resources", "//components/search_engines", @@ -151,11 +156,13 @@ source_set("settings") { "//ios/chrome/browser/ui/settings/cells", "//ios/chrome/browser/ui/settings/cells:public", "//ios/chrome/browser/ui/settings/clear_browsing_data", + "//ios/chrome/browser/ui/settings/elements:enterprise_info_popover_view_controller", "//ios/chrome/browser/ui/settings/google_services", "//ios/chrome/browser/ui/settings/language:language", "//ios/chrome/browser/ui/settings/language:language_ui", "//ios/chrome/browser/ui/settings/password", "//ios/chrome/browser/ui/settings/privacy", + "//ios/chrome/browser/ui/settings/safety_check", "//ios/chrome/browser/ui/settings/sync", "//ios/chrome/browser/ui/settings/sync/utils", "//ios/chrome/browser/ui/settings/utils", diff --git a/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn index ed05c753e5b..d21536b39f7 100644 --- a/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/autofill/BUILD.gn @@ -52,6 +52,7 @@ source_set("autofill") { "//ios/chrome/browser/ui/settings/autofill/cells", "//ios/chrome/browser/ui/settings/cells", "//ios/chrome/browser/ui/settings/credit_card_scanner", + "//ios/chrome/browser/ui/settings/elements:enterprise_info_popover_view_controller", "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/browser/ui/table_view/cells:cells_constants", diff --git a/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn index 0be2e7306bb..4c8285696b8 100644 --- a/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn @@ -20,6 +20,10 @@ source_set("cells") { "settings_image_detail_text_item.mm", "settings_multiline_detail_item.h", "settings_multiline_detail_item.mm", + "settings_password_check_cell.h", + "settings_password_check_cell.mm", + "settings_password_check_item.h", + "settings_password_check_item.mm", "settings_switch_cell.h", "settings_switch_cell.mm", "settings_switch_item.h", @@ -82,6 +86,7 @@ source_set("unit_tests") { "passphrase_error_item_unittest.mm", "search_engine_item_unittest.mm", "settings_multiline_detail_item_unittest.mm", + "settings_password_check_item_unittest.mm", "version_item_unittest.mm", ] diff --git a/chromium/ios/chrome/browser/ui/settings/elements/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/elements/BUILD.gn new file mode 100644 index 00000000000..e0a189a1467 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/settings/elements/BUILD.gn @@ -0,0 +1,26 @@ +# Copyright 2020 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# import("//build/config/ios/ios_sdk.gni") + +source_set("enterprise_info_popover_view_controller") { + configs += [ "//build/config/compiler:enable_arc" ] + + sources = [ + "enterprise_info_popover_view_controller.h", + "enterprise_info_popover_view_controller.mm", + ] + + libs = [ "UIKit.framework" ] + + deps = [ + "//base:base", + "//ios/chrome/app/strings", + "//ios/chrome/common:common", + "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/elements:popover_label_view_controller", + "//ios/chrome/common/ui/util", + "//ui/base", + ] +} 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 ea6b65e0497..4be6baa2f2a 100644 --- a/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/google_services/BUILD.gn @@ -109,7 +109,6 @@ source_set("eg_tests") { "//components/safe_browsing/core/common:safe_browsing_prefs", "//ios/chrome/app/strings", "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/authentication:eg_test_support", "//ios/chrome/browser/ui/bookmarks:eg_test_support", "//ios/chrome/test/app:test_support", diff --git a/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn index fc5883e6fad..9fdc149070a 100644 --- a/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/password/BUILD.gn @@ -10,6 +10,9 @@ source_set("password") { "password_details_table_view_controller_delegate.h", "password_exporter.h", "password_exporter.mm", + "passwords_consumer.h", + "passwords_mediator.h", + "passwords_mediator.mm", "passwords_table_view_controller.h", "passwords_table_view_controller.mm", ] @@ -35,6 +38,7 @@ source_set("password") { "//ios/chrome/browser/ui/settings:settings_root", "//ios/chrome/browser/ui/settings/cells", "//ios/chrome/browser/ui/settings/cells:public", + "//ios/chrome/browser/ui/settings/elements:enterprise_info_popover_view_controller", "//ios/chrome/browser/ui/settings/utils", "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/table_view/cells", @@ -45,6 +49,7 @@ source_set("password") { "//ios/chrome/common/ui/util", "//ios/third_party/material_components_ios", "//ui/base", + "//ui/base/clipboard:clipboard_types", "//url", ] } @@ -90,6 +95,7 @@ source_set("unit_tests") { "//ios/chrome/app/strings", "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/passwords", + "//ios/chrome/browser/ui/settings/cells", "//ios/chrome/browser/ui/table_view:test_support", "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/browser/ui/table_view/cells:cells_constants", diff --git a/chromium/ios/chrome/browser/ui/settings/privacy/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/privacy/BUILD.gn index 9839e7f195c..db6bd6b97e0 100644 --- a/chromium/ios/chrome/browser/ui/settings/privacy/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/privacy/BUILD.gn @@ -7,6 +7,9 @@ source_set("privacy_ui") { sources = [ "cookies_commands.h", "cookies_consumer.h", + "cookies_status_consumer.h", + "cookies_status_description.h", + "cookies_status_description.mm", "cookies_view_controller.h", "cookies_view_controller.mm", "handoff_table_view_controller.h", @@ -16,6 +19,8 @@ source_set("privacy_ui") { "privacy_table_view_controller.mm", ] deps = [ + "resources:accessory_checkmark", + "resources:accessory_no_checkmark", "//base", "//components/handoff", "//components/prefs", @@ -42,6 +47,7 @@ source_set("privacy_ui") { "//ios/chrome/browser/ui/table_view/cells", "//ios/chrome/browser/ui/table_view/cells:cells_constants", "//ios/chrome/common/ui/colors", + "//ios/chrome/common/ui/elements:popover_label_view_controller", "//ui/base", ] } @@ -53,17 +59,29 @@ source_set("privacy") { "cookies_coordinator.mm", "cookies_mediator.h", "cookies_mediator.mm", + "cookies_status_mediator.h", + "cookies_status_mediator.mm", "privacy_coordinator.h", "privacy_coordinator.mm", ] deps = [ ":privacy_ui", + "//components/content_settings/core/browser", + "//components/content_settings/core/common", + "//components/prefs", + "//ios/chrome/app/strings", + "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/content_settings", "//ios/chrome/browser/main:public", + "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/coordinators:chrome_coordinators", "//ios/chrome/browser/ui/settings:settings_root", "//ios/chrome/browser/ui/settings/clear_browsing_data", + "//ios/chrome/browser/ui/settings/utils", + "//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/table_view/cells", + "//ui/base", ] libs = [ "UIKit.framework" ] } diff --git a/chromium/ios/chrome/browser/ui/settings/privacy/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/privacy/resources/BUILD.gn new file mode 100644 index 00000000000..6dc98952b58 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/settings/privacy/resources/BUILD.gn @@ -0,0 +1,21 @@ +# Copyright 2020 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/config/ios/asset_catalog.gni") + +imageset("accessory_checkmark") { + sources = [ + "accessory_checkmark.imageset/Contents.json", + "accessory_checkmark.imageset/accessory_checkmark@2x.png", + "accessory_checkmark.imageset/accessory_checkmark@3x.png", + ] +} + +imageset("accessory_no_checkmark") { + sources = [ + "accessory_no_checkmark.imageset/Contents.json", + "accessory_no_checkmark.imageset/accessory_no_checkmark@2x.png", + "accessory_no_checkmark.imageset/accessory_no_checkmark@3x.png", + ] +} diff --git a/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn index e1eea0408e8..3fe05c78784 100644 --- a/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/resources/BUILD.gn @@ -26,6 +26,14 @@ imageset("encryption_error") { ] } +imageset("enterprise_icon") { + sources = [ + "enterprise_icon.imageset/Contents.json", + "enterprise_icon.imageset/enterprise_icon@2x.png", + "enterprise_icon.imageset/enterprise_icon@3x.png", + ] +} + imageset("settings_accounts_add_account") { sources = [ "settings_accounts_add_account.imageset/Contents.json", @@ -182,3 +190,27 @@ imageset("sync_and_google_services_sync_on") { "sync_and_google_services_sync_on.imageset/sync_and_google_services_sync_on@3x.png", ] } + +imageset("settings_unsafe_state") { + sources = [ + "settings_unsafe_state.imageset/Contents.json", + "settings_unsafe_state.imageset/settings_unsafe_state@2x.png", + "settings_unsafe_state.imageset/settings_unsafe_state@3x.png", + ] +} + +imageset("settings_safe_state") { + sources = [ + "settings_safe_state.imageset/Contents.json", + "settings_safe_state.imageset/settings_safe_state@2x.png", + "settings_safe_state.imageset/settings_safe_state@3x.png", + ] +} + +imageset("settings_info") { + sources = [ + "settings_info.imageset/Contents.json", + "settings_info.imageset/settings_info@2x.png", + "settings_info.imageset/settings_info@3x.png", + ] +} diff --git a/chromium/ios/chrome/browser/ui/settings/safety_check/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/safety_check/BUILD.gn new file mode 100644 index 00000000000..d07416fda68 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/settings/safety_check/BUILD.gn @@ -0,0 +1,56 @@ +# Copyright 2020 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +source_set("safety_check_ui") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "safety_check_navigation_commands.h", + "safety_check_table_view_controller.h", + "safety_check_table_view_controller.mm", + ] + deps = [ + "//components/strings", + "//ios/chrome/app/strings", + "//ios/chrome/browser/ui:feature_flags", + "//ios/chrome/browser/ui/settings:settings_root", + "//ios/chrome/browser/ui/table_view", + "//ui/base", + ] +} + +source_set("safety_check") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "safety_check_coordinator.h", + "safety_check_coordinator.mm", + ] + deps = [ + ":safety_check_ui", + "//ios/chrome/browser/main:public", + "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/coordinators:chrome_coordinators", + "//ios/chrome/browser/ui/settings:settings_root", + ] + libs = [ "UIKit.framework" ] +} + +source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ "safety_check_table_view_controller_unittest.mm" ] + deps = [ + ":safety_check_ui", + "//base/test:test_support", + "//components/strings", + "//ios/chrome/app/strings", + "//ios/chrome/browser", + "//ios/chrome/browser/browser_state:test_support", + "//ios/chrome/browser/main:test_support", + "//ios/chrome/browser/ui/table_view:test_support", + "//ios/chrome/test:test_support", + "//ios/web/public/test", + "//testing/gtest", + "//ui/base", + ] +} diff --git a/chromium/ios/chrome/browser/ui/signin_interaction/BUILD.gn b/chromium/ios/chrome/browser/ui/signin_interaction/BUILD.gn deleted file mode 100644 index 52b8152d312..00000000000 --- a/chromium/ios/chrome/browser/ui/signin_interaction/BUILD.gn +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright 2017 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -source_set("signin_interaction") { - configs += [ "//build/config/compiler:enable_arc" ] - sources = [ - "signin_interaction_controller.h", - "signin_interaction_controller.mm", - "signin_interaction_coordinator.h", - "signin_interaction_coordinator.mm", - "signin_interaction_presenting.h", - ] - deps = [ - "//base", - "//components/prefs", - "//components/signin/public/identity_manager", - "//ios/chrome/browser", - "//ios/chrome/browser/browser_state", - "//ios/chrome/browser/main", - "//ios/chrome/browser/signin", - "//ios/chrome/browser/ui:feature_flags", - "//ios/chrome/browser/ui/alert_coordinator", - "//ios/chrome/browser/ui/authentication", - "//ios/chrome/browser/ui/authentication/signin", - "//ios/chrome/browser/ui/commands", - "//ios/chrome/browser/ui/coordinators:chrome_coordinators", - "//ios/public/provider/chrome/browser", - "//ios/public/provider/chrome/browser/signin", - ] -} - -source_set("eg_test_support") { - defines = [ "CHROME_EARL_GREY_1" ] - configs += [ "//build/config/compiler:enable_arc" ] - testonly = true - sources = [ - "signin_interaction_controller_app_interface.h", - "signin_interaction_controller_app_interface.mm", - "signin_interaction_controller_egtest_util.h", - "signin_interaction_controller_egtest_util.mm", - ] - - deps = [ - "//base", - "//base/test:test_support", - "//ios/chrome/browser/ui/authentication", - "//ios/chrome/test/app:test_support", - "//ios/chrome/test/earl_grey:test_support", - "//ios/testing/earl_grey:earl_grey_support", - ] -} - -source_set("eg_test_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] - configs += [ - "//build/config/compiler:enable_arc", - "//build/config/ios:xctest_config", - ] - testonly = true - sources = [ - "signin_interaction_controller_app_interface.h", - "signin_interaction_controller_egtest_util.h", - "signin_interaction_controller_egtest_util.mm", - ] - - deps = [ - "//base", - "//base/test:test_support", - "//ios/chrome/app/strings", - "//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", - ] -} - -source_set("eg_tests") { - defines = [ "CHROME_EARL_GREY_1" ] - configs += [ "//build/config/compiler:enable_arc" ] - testonly = true - sources = [ "signin_interaction_controller_egtest.mm" ] - deps = [ - ":eg_test_support", - "//base", - "//base/test:test_support", - "//ios/chrome/app:app_internal", - "//ios/chrome/app/strings", - "//ios/chrome/browser", - "//ios/chrome/browser/signin", - "//ios/chrome/browser/tabs", - "//ios/chrome/browser/ui/authentication", - "//ios/chrome/browser/ui/authentication:eg_test_support", - "//ios/chrome/browser/ui/authentication/cells", - "//ios/chrome/browser/ui/authentication/unified_consent/identity_chooser:identity_chooser_ui", - "//ios/chrome/browser/ui/commands", - "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant", - "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui_constants", - "//ios/chrome/browser/ui/settings", - "//ios/chrome/browser/ui/settings/google_services:constants", - "//ios/chrome/browser/ui/table_view/cells", - "//ios/chrome/browser/ui/util", - "//ios/chrome/browser/web_state_list", - "//ios/chrome/test:eg_test_support", - "//ios/chrome/test/app:test_support", - "//ios/chrome/test/earl_grey:test_support", - "//ios/public/provider/chrome/browser/signin:constants", - "//ios/public/provider/chrome/browser/signin:fake_chrome_identity", - "//ios/testing/earl_grey:earl_grey_support", - "//ios/third_party/earl_grey:earl_grey+link", - "//ui/base", - "//ui/base", - ] - libs = [ "XCTest.framework" ] -} - -source_set("eg_app_support+eg2") { - defines = [ "CHROME_EARL_GREY_2" ] - configs += [ "//build/config/compiler:enable_arc" ] - testonly = true - sources = [ - "signin_interaction_controller_app_interface.h", - "signin_interaction_controller_app_interface.mm", - ] - deps = [ - "//base", - "//ios/chrome/browser/ui/authentication", - ] -} - -source_set("eg2_tests") { - defines = [ "CHROME_EARL_GREY_2" ] - configs += [ - "//build/config/compiler:enable_arc", - "//build/config/ios:xctest_config", - ] - testonly = true - sources = [ "signin_interaction_controller_egtest.mm" ] - deps = [ - ":eg_test_support+eg2", - "//base", - "//base/test:test_support", - "//ios/chrome/app/strings", - "//ios/chrome/browser/ui/authentication:eg_test_support+eg2", - "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui_constants", - "//ios/chrome/test/earl_grey:eg_test_support+eg2", - "//ios/public/provider/chrome/browser/signin:constants", - "//ios/public/provider/chrome/browser/signin:fake_chrome_identity", - "//ios/testing/earl_grey:eg_test_support+eg2", - "//ios/third_party/earl_grey2:test_lib", - "//ui/base", - ] - libs = [ "UIKit.framework" ] -} diff --git a/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn index 747da879577..f3d7636a3b0 100644 --- a/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/tab_grid/BUILD.gn @@ -25,6 +25,7 @@ source_set("tab_grid") { "//components/sessions", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/drag_and_drop", "//ios/chrome/browser/main", "//ios/chrome/browser/sessions", "//ios/chrome/browser/sessions:restoration_agent", @@ -40,11 +41,13 @@ source_set("tab_grid") { "//ios/chrome/browser/ui/recent_tabs", "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui", "//ios/chrome/browser/ui/tab_grid/transitions", + "//ios/chrome/browser/ui/util", "//ios/chrome/browser/url_loading", "//ios/chrome/browser/web", "//ios/chrome/browser/web_state_list", "//ios/chrome/browser/web_state_list:agents", "//ios/chrome/browser/web_state_list/web_usage_enabler", + "//ios/chrome/browser/window_activities", "//ios/web", "//ui/base", "//ui/gfx", @@ -92,6 +95,8 @@ source_set("tab_grid_ui") { "resources:new_tab_toolbar_button", "resources:new_tab_toolbar_button_incognito", "resources:page_control_assets", + "resources:tab_grid_incognito_tabs_empty", + "resources:tab_grid_regular_tabs_empty", "//base", "//ios/chrome/app/strings", "//ios/chrome/browser", diff --git a/chromium/ios/chrome/browser/ui/tab_grid/grid/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_grid/grid/BUILD.gn index 6ce37896c41..8076b06d35c 100644 --- a/chromium/ios/chrome/browser/ui/tab_grid/grid/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/tab_grid/grid/BUILD.gn @@ -18,6 +18,7 @@ source_set("grid_ui") { "grid_cell.mm", "grid_commands.h", "grid_consumer.h", + "grid_drag_drop_handler.h", "grid_empty_view.h", "grid_image_data_source.h", "grid_item.h", @@ -39,6 +40,7 @@ source_set("grid_ui") { "//base", "//ios/chrome/app/strings", "//ios/chrome/browser", + "//ios/chrome/browser/drag_and_drop", "//ios/chrome/browser/ui:feature_flags", "//ios/chrome/browser/ui/elements", "//ios/chrome/browser/ui/tab_grid/transitions", diff --git a/chromium/ios/chrome/browser/ui/tab_grid/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/tab_grid/resources/BUILD.gn index a25c583233c..18b23c9de3f 100644 --- a/chromium/ios/chrome/browser/ui/tab_grid/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/tab_grid/resources/BUILD.gn @@ -88,6 +88,20 @@ imageset("page_control_remote_tabs_selected") { ] } +imageset("tab_grid_incognito_tabs_empty") { + sources = [ + "tab_grid_incognito_tabs_empty.imageset/Contents.json", + "tab_grid_incognito_tabs_empty.imageset/tab_grid_incognito_tabs_empty.pdf", + ] +} + +imageset("tab_grid_regular_tabs_empty") { + sources = [ + "tab_grid_regular_tabs_empty.imageset/Contents.json", + "tab_grid_regular_tabs_empty.imageset/tab_grid_regular_tabs_empty.pdf", + ] +} + group("page_control_assets") { public_deps = [ ":page_control_incognito_tabs", 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 cb27a0787b4..fb2aaf1a1dd 100644 --- a/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/table_view/cells/BUILD.gn @@ -18,6 +18,10 @@ source_set("cells") { "table_view_header_footer_item.mm", "table_view_image_item.h", "table_view_image_item.mm", + "table_view_info_button_cell.h", + "table_view_info_button_cell.mm", + "table_view_info_button_item.h", + "table_view_info_button_item.mm", "table_view_item.h", "table_view_item.mm", "table_view_link_header_footer_item.h", @@ -47,6 +51,7 @@ source_set("cells") { "resources:table_view_cell_edit_icon", "resources:table_view_cell_error_icon", "resources:table_view_cell_favicon_background", + "resources:table_view_cell_info", "//base", "//base:i18n", "//ios/chrome/app/strings", diff --git a/chromium/ios/chrome/browser/ui/table_view/cells/resources/BUILD.gn b/chromium/ios/chrome/browser/ui/table_view/cells/resources/BUILD.gn index 23f52d3c2c2..09bba6cd77e 100644 --- a/chromium/ios/chrome/browser/ui/table_view/cells/resources/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/table_view/cells/resources/BUILD.gn @@ -45,3 +45,11 @@ imageset("table_view_cell_error_icon") { "table_view_cell_error_icon.imageset/table_view_cell_error_icon@3x.png", ] } + +imageset("table_view_cell_info") { + sources = [ + "table_view_cell_info.imageset/Contents.json", + "table_view_cell_info.imageset/table_view_cell_info@2x.png", + "table_view_cell_info.imageset/table_view_cell_info@3x.png", + ] +} diff --git a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn index 6a9ace608c0..7a4bdd80998 100644 --- a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn @@ -35,6 +35,7 @@ source_set("toolbar") { "//ios/chrome/browser/bookmarks", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/main", + "//ios/chrome/browser/overlays", "//ios/chrome/browser/policy:feature_flags", "//ios/chrome/browser/reading_list", "//ios/chrome/browser/search_engines", diff --git a/chromium/ios/chrome/browser/ui/webui/interstitials/BUILD.gn b/chromium/ios/chrome/browser/ui/webui/interstitials/BUILD.gn index 50ecde24eaf..91e2151558d 100644 --- a/chromium/ios/chrome/browser/ui/webui/interstitials/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/webui/interstitials/BUILD.gn @@ -17,13 +17,13 @@ source_set("interstitials") { "//base", "//components/resources", "//components/safe_browsing/core/db:v4_protocol_manager_util", + "//components/safe_browsing/ios/browser:allow_list", "//components/security_interstitials/core", "//components/security_interstitials/core:unsafe_resource", "//ios/chrome/browser", "//ios/chrome/browser:chrome_url_constants", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/safe_browsing", - "//ios/chrome/browser/safe_browsing:allow_list", "//ios/chrome/browser/ssl", "//ios/components/security_interstitials", "//ios/web/public/security", diff --git a/chromium/ios/chrome/browser/ui/whats_new/BUILD.gn b/chromium/ios/chrome/browser/ui/whats_new/BUILD.gn new file mode 100644 index 00000000000..b7bae1905ef --- /dev/null +++ b/chromium/ios/chrome/browser/ui/whats_new/BUILD.gn @@ -0,0 +1,12 @@ +# Copyright 2015 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("utils") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "default_browser_utils.h", + "default_browser_utils.mm", + ] + deps = [ "//base" ] +} |