diff options
Diffstat (limited to 'chromium/ios/chrome')
69 files changed, 932 insertions, 162 deletions
diff --git a/chromium/ios/chrome/app/BUILD.gn b/chromium/ios/chrome/app/BUILD.gn index 82719317f6f..3704c77b029 100644 --- a/chromium/ios/chrome/app/BUILD.gn +++ b/chromium/ios/chrome/app/BUILD.gn @@ -149,7 +149,6 @@ source_set("app_internal") { "//components/metrics", "//components/prefs", "//components/proxy_config", - "//components/reading_list/core", "//components/signin/core/browser", "//components/suggestions", "//components/sync", diff --git a/chromium/ios/chrome/app/resources/BUILD.gn b/chromium/ios/chrome/app/resources/BUILD.gn index 02f882a5465..1a2f4d5716c 100644 --- a/chromium/ios/chrome/app/resources/BUILD.gn +++ b/chromium/ios/chrome/app/resources/BUILD.gn @@ -23,7 +23,6 @@ group("resources") { grit("ios_resources") { source = "ios_resources.grd" output_dir = "$root_gen_dir/ios/chrome" - use_qualified_include = true outputs = [ "grit/ios_resources.h", "ios_resources.pak", diff --git a/chromium/ios/chrome/app/strings/BUILD.gn b/chromium/ios/chrome/app/strings/BUILD.gn index 6d0e504ae76..be6b02b5a19 100644 --- a/chromium/ios/chrome/app/strings/BUILD.gn +++ b/chromium/ios/chrome/app/strings/BUILD.gn @@ -16,7 +16,6 @@ group("strings") { grit("ios_strings") { source = "ios_strings.grd" output_dir = "$root_gen_dir/ios/chrome" - use_qualified_include = true outputs = [ "grit/ios_strings.h", ] @@ -28,7 +27,6 @@ grit("ios_strings") { grit("ios_chromium_strings") { source = "ios_chromium_strings.grd" output_dir = "$root_gen_dir/ios/chrome" - use_qualified_include = true outputs = [ "grit/ios_chromium_strings.h", ] @@ -40,7 +38,6 @@ grit("ios_chromium_strings") { grit("ios_google_chrome_strings") { source = "ios_google_chrome_strings.grd" output_dir = "$root_gen_dir/ios/chrome" - use_qualified_include = true outputs = [ "grit/ios_google_chrome_strings.h", ] diff --git a/chromium/ios/chrome/browser/BUILD.gn b/chromium/ios/chrome/browser/BUILD.gn index 76d8f48c83f..de6beb485d0 100644 --- a/chromium/ios/chrome/browser/BUILD.gn +++ b/chromium/ios/chrome/browser/BUILD.gn @@ -28,6 +28,8 @@ source_set("browser") { "chrome_paths.h", "chrome_paths.mm", "chrome_paths_internal.h", + "chrome_root_coordinator.h", + "chrome_root_coordinator.mm", "chrome_switches.cc", "chrome_switches.h", "chrome_url_constants.cc", @@ -46,6 +48,8 @@ source_set("browser") { "installation_notifier.mm", "ios_chrome_field_trials.cc", "ios_chrome_field_trials.h", + "ios_chrome_flag_descriptions.cc", + "ios_chrome_flag_descriptions.h", "ios_chrome_io_thread.h", "ios_chrome_io_thread.mm", "notification_promo.cc", @@ -55,9 +59,6 @@ source_set("browser") { "pref_names.cc", "pref_names.h", "procedural_block_types.h", - "root_coordinator.h", - "root_coordinator.mm", - "storekit_launcher.h", "tab_parenting_global_observer.cc", "tab_parenting_global_observer.h", "web_data_service_factory.cc", @@ -85,7 +86,6 @@ source_set("browser") { "//components/pref_registry", "//components/prefs", "//components/proxy_config", - "//components/reading_list/core", "//components/reading_list/ios", "//components/search_engines", "//components/signin/core/browser", diff --git a/chromium/ios/chrome/browser/browser_state/BUILD.gn b/chromium/ios/chrome/browser/browser_state/BUILD.gn index 94c58d812d7..6fcca0662f0 100644 --- a/chromium/ios/chrome/browser/browser_state/BUILD.gn +++ b/chromium/ios/chrome/browser/browser_state/BUILD.gn @@ -14,6 +14,7 @@ source_set("browser_state") { "//base", "//components/prefs", "//components/sync_preferences", + "//ios/chrome/browser/net:net_types", "//ios/chrome/browser/tabs", "//ios/web", "//net", diff --git a/chromium/ios/chrome/browser/browsing_data/BUILD.gn b/chromium/ios/chrome/browser/browsing_data/BUILD.gn index 4ca5db67140..d7312f1ac28 100644 --- a/chromium/ios/chrome/browser/browsing_data/BUILD.gn +++ b/chromium/ios/chrome/browser/browsing_data/BUILD.gn @@ -34,6 +34,7 @@ source_set("browsing_data") { "//ios/chrome/browser/passwords", "//ios/chrome/browser/search_engines", "//ios/chrome/browser/sessions", + "//ios/chrome/browser/sessions:serialisation", "//ios/chrome/browser/signin", "//ios/chrome/browser/sync", "//ios/net", @@ -87,7 +88,7 @@ source_set("browsing_data_internal") { "//ios/chrome/browser:browser_internal", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/native_app_launcher:native_app_launcher_internal", - "//ios/chrome/browser/sessions", + "//ios/chrome/browser/sessions:serialisation", "//ios/chrome/browser/signin", "//ios/chrome/browser/snapshots", "//ios/chrome/browser/ui:ui_internal", diff --git a/chromium/ios/chrome/browser/content_suggestions/BUILD.gn b/chromium/ios/chrome/browser/content_suggestions/BUILD.gn index d492361ddf6..92b80c1e0c3 100644 --- a/chromium/ios/chrome/browser/content_suggestions/BUILD.gn +++ b/chromium/ios/chrome/browser/content_suggestions/BUILD.gn @@ -13,16 +13,30 @@ source_set("content_suggestions") { "content_suggestions_mediator.mm", "content_suggestions_service_bridge_observer.h", "content_suggestions_service_bridge_observer.mm", + "mediator_util.h", + "mediator_util.mm", ] deps = [ "//base", + "//components/favicon/core", "//components/ntp_snippets", + "//components/ntp_tiles", + "//components/rappor", + "//components/reading_list/core", "//ios/chrome/app/strings", "//ios/chrome/browser", + "//ios/chrome/browser/favicon", "//ios/chrome/browser/ntp_snippets", + "//ios/chrome/browser/ntp_tiles", + "//ios/chrome/browser/reading_list", "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/alert_coordinator", + "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/content_suggestions", + "//ios/chrome/browser/ui/content_suggestions/cells", + "//ios/chrome/browser/ui/content_suggestions/identifier", + "//ios/chrome/browser/ui/favicon", + "//ios/chrome/browser/ui/reading_list", "//ios/web", "//ui/base", "//ui/strings", diff --git a/chromium/ios/chrome/browser/crash_report/BUILD.gn b/chromium/ios/chrome/browser/crash_report/BUILD.gn index 07570f552c1..e49f8f6d95b 100644 --- a/chromium/ios/chrome/browser/crash_report/BUILD.gn +++ b/chromium/ios/chrome/browser/crash_report/BUILD.gn @@ -48,6 +48,7 @@ source_set("crash_report_internal") { "//ios/chrome/browser", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/sessions", + "//ios/chrome/browser/sessions:serialisation", "//ios/chrome/browser/tabs", "//ios/web", "//net", @@ -69,7 +70,7 @@ source_set("unit_tests") { "//breakpad:client", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/browser_state:test_support", - "//ios/chrome/browser/sessions", + "//ios/chrome/browser/sessions:serialisation", "//ios/chrome/test/base", "//ios/chrome/test/ocmock", "//ios/web:test_support", diff --git a/chromium/ios/chrome/browser/favicon/BUILD.gn b/chromium/ios/chrome/browser/favicon/BUILD.gn index 4b3e6af7520..a83c596f620 100644 --- a/chromium/ios/chrome/browser/favicon/BUILD.gn +++ b/chromium/ios/chrome/browser/favicon/BUILD.gn @@ -5,10 +5,6 @@ source_set("favicon") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ - "favicon_attributes.h", - "favicon_attributes.mm", - "favicon_attributes_provider.h", - "favicon_attributes_provider.mm", "favicon_client_impl.h", "favicon_client_impl.mm", "favicon_loader.h", @@ -28,6 +24,8 @@ source_set("favicon") { "//base", "//components/favicon/core", "//components/favicon_base", + "//components/image_fetcher/core", + "//components/image_fetcher/ios", "//components/keyed_service/core", "//components/keyed_service/ios", "//components/resources", diff --git a/chromium/ios/chrome/browser/find_in_page/BUILD.gn b/chromium/ios/chrome/browser/find_in_page/BUILD.gn index e13b876a278..38653e9dc7a 100644 --- a/chromium/ios/chrome/browser/find_in_page/BUILD.gn +++ b/chromium/ios/chrome/browser/find_in_page/BUILD.gn @@ -43,6 +43,8 @@ source_set("unit_tests") { ":find_in_page", ":unit_tests_nonarc", "//base", + "//base/test:test_support", + "//ios/chrome/browser/web:test_support", "//ios/web", "//ios/web:test_support", "//testing/gtest", diff --git a/chromium/ios/chrome/browser/interstitials/BUILD.gn b/chromium/ios/chrome/browser/interstitials/BUILD.gn index ef500ba684b..5cf360b9252 100644 --- a/chromium/ios/chrome/browser/interstitials/BUILD.gn +++ b/chromium/ios/chrome/browser/interstitials/BUILD.gn @@ -24,6 +24,7 @@ source_set("interstitials") { "//ios/chrome/browser/browser_state", "//ios/chrome/browser/history", "//ios/web", + "//ios/web:reload_type", "//ui/base", "//url", ] diff --git a/chromium/ios/chrome/browser/itunes_links/BUILD.gn b/chromium/ios/chrome/browser/itunes_links/BUILD.gn index 7faa8c1a20d..7552a6b60bb 100644 --- a/chromium/ios/chrome/browser/itunes_links/BUILD.gn +++ b/chromium/ios/chrome/browser/itunes_links/BUILD.gn @@ -10,7 +10,7 @@ source_set("itunes_links") { ] deps = [ "//base", - "//ios/chrome/browser", + "//ios/chrome/browser/store_kit", "//ios/web", "//url", ] @@ -25,7 +25,7 @@ source_set("unit_tests") { deps = [ ":itunes_links", "//base", - "//ios/chrome/browser", + "//ios/chrome/browser/store_kit", "//ios/web:test_support", "//testing/gtest", "//third_party/ocmock", diff --git a/chromium/ios/chrome/browser/metrics/BUILD.gn b/chromium/ios/chrome/browser/metrics/BUILD.gn index b89c71013cc..6f3f358a5a3 100644 --- a/chromium/ios/chrome/browser/metrics/BUILD.gn +++ b/chromium/ios/chrome/browser/metrics/BUILD.gn @@ -40,7 +40,6 @@ source_set("metrics") { "//components/rappor", "//components/signin/core/browser", "//components/sync", - "//components/translate/core/browser", "//components/ukm", "//components/ukm:observers", "//components/variations", @@ -54,6 +53,7 @@ source_set("metrics") { "//ios/chrome/browser/signin", "//ios/chrome/browser/sync", "//ios/chrome/browser/tabs", + "//ios/chrome/browser/translate", "//ios/chrome/browser/variations", "//ios/chrome/browser/variations:ios_chrome_ui_string_overrider_factory", "//ios/chrome/common", @@ -124,7 +124,7 @@ source_set("metrics_internal_arc") { deps = [ "//base", "//ios/chrome/browser/tabs", - "//ios/shared/chrome/browser/tabs", + "//ios/chrome/browser/web_state_list", ] configs += [ "//build/config/compiler:enable_arc" ] } @@ -159,11 +159,10 @@ source_set("eg_tests") { ] deps = [ ":metrics_internal", + ":test_support", "//base", "//base/test:test_support", "//components/strings", - "//ios/chrome/app/strings", - "//ios/chrome/browser", "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/settings", "//ios/chrome/browser/ui/toolbar", @@ -171,10 +170,48 @@ source_set("eg_tests") { "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", "//ios/testing:ios_test_support", - "//ios/third_party/earl_grey", "//ios/web:earl_grey_test_support", "//ios/web:test_support", "//ui/base", + "//url", + ] + libs = [ "XCTest.framework" ] +} + +# TODO(crbug.com/694662): These tests depend on loading errors, which are +# behaving differently when the network is not available. When the underlying +# issue is resolved, these tests can move back to |eg_tests|. +source_set("external_url_eg_tests") { + configs += [ "//build/config/compiler:enable_arc" ] + testonly = true + sources = [ + "external_url_tab_usage_recorder_egtest.mm", + ] + deps = [ + ":metrics_internal", + ":test_support", + "//ios/chrome/test/app:test_support", + "//ios/chrome/test/earl_grey:test_support", + "//ios/web:test_support", ] libs = [ "XCTest.framework" ] } + +source_set("test_support") { + testonly = true + sources = [ + "tab_usage_recorder_test_util.h", + "tab_usage_recorder_test_util.mm", + ] + deps = [ + "//base", + "//ios/chrome/app/strings", + "//ios/chrome/browser/ui", + "//ios/chrome/browser/ui/tools_menu", + "//ios/chrome/test/app:test_support", + "//ios/chrome/test/earl_grey:test_support", + "//ios/testing:ios_test_support", + "//ui/base", + ] + configs += [ "//build/config/compiler:enable_arc" ] +} diff --git a/chromium/ios/chrome/browser/native_app_launcher/BUILD.gn b/chromium/ios/chrome/browser/native_app_launcher/BUILD.gn index f873d674d3d..76ecaa68908 100644 --- a/chromium/ios/chrome/browser/native_app_launcher/BUILD.gn +++ b/chromium/ios/chrome/browser/native_app_launcher/BUILD.gn @@ -66,7 +66,9 @@ source_set("native_app_launcher_internal") { "//ios/chrome/browser", "//ios/chrome/browser/infobars", "//ios/chrome/browser/net", + "//ios/chrome/browser/store_kit", "//ios/chrome/browser/tabs", + "//ios/chrome/browser/web:web", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/native_app_launcher", "//ios/public/provider/chrome/browser/signin", @@ -92,6 +94,7 @@ source_set("unit_tests_internal") { "//base/test:test_support", "//components/infobars/core", "//ios/chrome/browser", + "//ios/chrome/browser/infobars:infobars", "//ios/chrome/browser/web:test_support", "//ios/chrome/test:test_support", "//ios/public/provider/chrome/browser", diff --git a/chromium/ios/chrome/browser/net/BUILD.gn b/chromium/ios/chrome/browser/net/BUILD.gn index 2d147ebf54e..c581c5982b9 100644 --- a/chromium/ios/chrome/browser/net/BUILD.gn +++ b/chromium/ios/chrome/browser/net/BUILD.gn @@ -21,7 +21,6 @@ source_set("net") { "ios_chrome_network_delegate.h", "ios_chrome_url_request_context_getter.cc", "ios_chrome_url_request_context_getter.h", - "net_types.h", "proxy_service_factory.cc", "proxy_service_factory.h", "retryable_url_fetcher.h", @@ -44,10 +43,21 @@ source_set("net") { "//net:extras", "//url", ] - allow_circular_includes_from = [ - "//ios/chrome/browser", - "//ios/chrome/browser/browser_state", + public_deps = [ + ":net_types", ] + allow_circular_includes_from = [ "//ios/chrome/browser" ] +} + +source_set("net_types") { + sources = [ + "net_types.h", + ] + deps = [ + "//base", + "//net", + ] + configs += [ "//build/config/compiler:enable_arc" ] } source_set("unit_tests") { diff --git a/chromium/ios/chrome/browser/ntp_snippets/BUILD.gn b/chromium/ios/chrome/browser/ntp_snippets/BUILD.gn index 18e1d87c014..7a6f37333ed 100644 --- a/chromium/ios/chrome/browser/ntp_snippets/BUILD.gn +++ b/chromium/ios/chrome/browser/ntp_snippets/BUILD.gn @@ -10,19 +10,22 @@ source_set("ntp_snippets") { deps = [ "//base", "//components/bookmarks/browser", - "//components/image_fetcher", + "//components/image_fetcher/core", + "//components/image_fetcher/ios", "//components/keyed_service/core", "//components/keyed_service/ios", "//components/ntp_snippets", + "//components/reading_list/core", "//components/signin/core/browser", "//components/version_info", "//google_apis", "//ios/chrome/browser", "//ios/chrome/browser/bookmarks", "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/favicon", "//ios/chrome/browser/history", + "//ios/chrome/browser/reading_list", "//ios/chrome/browser/signin", - "//ios/chrome/browser/suggestions", "//ios/chrome/common", "//ios/web", "//net", diff --git a/chromium/ios/chrome/browser/ntp_tiles/BUILD.gn b/chromium/ios/chrome/browser/ntp_tiles/BUILD.gn index a09c36d49b6..25b7dd900c2 100644 --- a/chromium/ios/chrome/browser/ntp_tiles/BUILD.gn +++ b/chromium/ios/chrome/browser/ntp_tiles/BUILD.gn @@ -8,11 +8,14 @@ source_set("ntp_tiles") { "ios_most_visited_sites_factory.h", "ios_popular_sites_factory.cc", "ios_popular_sites_factory.h", + "most_visited_sites_observer_bridge.h", + "most_visited_sites_observer_bridge.mm", ] deps = [ "//base", "//components/history/core/browser", - "//components/image_fetcher", + "//components/image_fetcher/core", + "//components/image_fetcher/ios", "//components/keyed_service/core", "//components/ntp_tiles", "//components/ntp_tiles:json_unsafe_parser", diff --git a/chromium/ios/chrome/browser/payments/BUILD.gn b/chromium/ios/chrome/browser/payments/BUILD.gn index 07d0054f411..0f778bf26f8 100644 --- a/chromium/ios/chrome/browser/payments/BUILD.gn +++ b/chromium/ios/chrome/browser/payments/BUILD.gn @@ -4,15 +4,13 @@ import("//ios/web/js_compile.gni") -js_compile_checked("injected_js") { - sources = [ - "resources/payment_request_manager.js", - ] -} - source_set("payments") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ + "credit_card_edit_coordinator.h", + "credit_card_edit_coordinator.mm", + "credit_card_edit_mediator.h", + "credit_card_edit_mediator.mm", "js_payment_request_manager.h", "js_payment_request_manager.mm", "payment_items_display_coordinator.h", @@ -53,11 +51,12 @@ source_set("payments") { "shipping_option_selection_view_controller_actions.h", ] deps = [ - ":injected_js", + ":payments_ui", "//base", "//components/autofill/core/browser", "//components/autofill/ios/browser", "//components/payments/core", + "//components/signin/core/browser", "//components/strings", "//ios/chrome/app/strings", "//ios/chrome/app/theme", @@ -65,12 +64,15 @@ source_set("payments") { "//ios/chrome/browser/autofill", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/payments/cells", + "//ios/chrome/browser/signin", "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/autofill", + "//ios/chrome/browser/ui/autofill:autofill_ui", "//ios/chrome/browser/ui/autofill/cells", "//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/icons", "//ios/third_party/material_components_ios", "//ios/third_party/material_roboto_font_loader_ios", @@ -80,10 +82,44 @@ source_set("payments") { libs = [ "UIKit.framework" ] } +source_set("payments_ui") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "credit_card_edit_view_controller.h", + "credit_card_edit_view_controller.mm", + "payment_request_edit_view_controller+internal.h", + "payment_request_edit_view_controller.h", + "payment_request_edit_view_controller.mm", + "payment_request_edit_view_controller_actions.h", + "payment_request_editor_field.h", + "payment_request_editor_field.mm", + "payment_request_picker_row.h", + "payment_request_picker_row.mm", + "payment_request_picker_view_controller.h", + "payment_request_picker_view_controller.mm", + ] + deps = [ + "//base", + "//components/strings", + "//ios/chrome/app/theme", + "//ios/chrome/browser/payments/cells", + "//ios/chrome/browser/ui", + "//ios/chrome/browser/ui/autofill:autofill_ui", + "//ios/chrome/browser/ui/autofill/cells", + "//ios/chrome/browser/ui/collection_view", + "//ios/chrome/browser/ui/colors", + "//ios/third_party/material_components_ios", + "//ui/base", + ] + libs = [ "UIKit.framework" ] +} + source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ + "credit_card_edit_coordinator_unittest.mm", + "credit_card_edit_view_controller_unittest.mm", "payment_items_display_coordinator_unittest.mm", "payment_items_display_view_controller_unittest.mm", "payment_method_selection_coordinator_unittest.mm", @@ -102,6 +138,7 @@ source_set("unit_tests") { ] deps = [ ":payments", + ":payments_ui", "//base", "//base/test:test_support", "//components/autofill/core/browser", @@ -110,7 +147,9 @@ source_set("unit_tests") { "//components/strings", "//ios/chrome/app/strings", "//ios/chrome/browser", + "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/payments/cells", + "//ios/chrome/browser/ui/autofill:autofill_ui", "//ios/chrome/browser/ui/autofill/cells", "//ios/chrome/browser/ui/collection_view:test_support", "//ios/chrome/browser/ui/collection_view/cells", @@ -120,6 +159,7 @@ source_set("unit_tests") { "//ios/third_party/material_components_ios", "//ios/web", "//ios/web:test_support", + "//testing/gmock", "//testing/gtest", "//third_party/ocmock", ] diff --git a/chromium/ios/chrome/browser/reading_list/BUILD.gn b/chromium/ios/chrome/browser/reading_list/BUILD.gn index 04ae8646b66..ede1a4c8b17 100644 --- a/chromium/ios/chrome/browser/reading_list/BUILD.gn +++ b/chromium/ios/chrome/browser/reading_list/BUILD.gn @@ -46,6 +46,7 @@ source_set("reading_list") { "//ios/chrome/browser/history", "//ios/chrome/common", "//ios/web", + "//ios/web:reload_type", "//net", "//url", ] @@ -62,7 +63,7 @@ source_set("reading_list_remover") { ] deps = [ "//base", - "//components/reading_list/ios", + "//components/reading_list/core", "//ios/chrome/browser/browser_state", ] public_deps = [ @@ -89,12 +90,13 @@ source_set("unit_tests") { "//base", "//base/test:test_support", "//components/favicon/ios", - "//components/reading_list/ios", + "//components/reading_list/core", "//ios/chrome/browser", "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/dom_distiller", "//ios/testing:ios_test_support", "//ios/web", + "//ios/web:reload_type", "//ios/web:test_support", "//net", "//testing/gtest", diff --git a/chromium/ios/chrome/browser/sessions/BUILD.gn b/chromium/ios/chrome/browser/sessions/BUILD.gn index cf8b95d284b..59b00fa33d4 100644 --- a/chromium/ios/chrome/browser/sessions/BUILD.gn +++ b/chromium/ios/chrome/browser/sessions/BUILD.gn @@ -13,6 +13,7 @@ source_set("sessions") { "ios_chrome_tab_restore_service_factory.h", ] deps = [ + ":serialisation", "//base", "//components/keyed_service/ios", "//components/sessions", @@ -26,19 +27,30 @@ source_set("sessions") { public_deps = [ ":sessions_non_arc", ] + allow_circular_includes_from = [ ":sessions_non_arc" ] } -source_set("sessions_non_arc") { - visibility = [ ":sessions" ] +source_set("serialisation") { sources = [ "NSCoder+Compatibility.h", "NSCoder+Compatibility.mm", - "session_service.h", - "session_service.mm", + "session_service_ios.h", + "session_service_ios.mm", "session_util.h", "session_util.mm", - "session_window.h", - "session_window.mm", + "session_window_ios.h", + "session_window_ios.mm", + ] + deps = [ + "//base", + "//ios/web", + ] + configs += [ "//build/config/compiler:enable_arc" ] +} + +source_set("sessions_non_arc") { + visibility = [ ":sessions" ] + sources = [ "tab_restore_service_delegate_impl_ios.h", "tab_restore_service_delegate_impl_ios.mm", "tab_restore_service_delegate_impl_ios_factory.h", @@ -51,6 +63,7 @@ source_set("sessions_non_arc") { "//components/sessions", "//ios/chrome/browser/browser_state", "//ios/chrome/browser/tabs", + "//ios/chrome/browser/web_state_list", "//ios/web", "//net", ] @@ -58,26 +71,31 @@ source_set("sessions_non_arc") { } source_set("test_support") { + configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ "test_session_service.h", "test_session_service.mm", ] deps = [ - ":sessions", + ":serialisation", + "//base", ] } source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ - "session_service_unittest.mm", - "session_window_unittest.mm", + "session_service_ios_unittest.mm", + "session_window_ios_unittest.mm", ] deps = [ ":resources_unit_tests", + ":serialisation", ":sessions", "//base", + "//base/test:test_support", "//ios/chrome/browser", "//ios/chrome/browser/browser_state:test_support", "//ios/web", @@ -85,6 +103,7 @@ source_set("unit_tests") { "//testing/gtest", "//third_party/ocmock", ] + libs = [ "Foundation.framework" ] } bundle_data("resources_unit_tests") { @@ -92,6 +111,8 @@ bundle_data("resources_unit_tests") { testonly = true sources = [ "//ios/chrome/test/data/sessions/corrupted.plist", + "//ios/chrome/test/data/sessions/session_m57.plist", + "//ios/chrome/test/data/sessions/session_m58.plist", ] outputs = [ "{{bundle_resources_dir}}/ios/chrome/test/data/sessions/{{source_file_part}}", diff --git a/chromium/ios/chrome/browser/share_extension/BUILD.gn b/chromium/ios/chrome/browser/share_extension/BUILD.gn index 632575cd2f0..9f28aa9af38 100644 --- a/chromium/ios/chrome/browser/share_extension/BUILD.gn +++ b/chromium/ios/chrome/browser/share_extension/BUILD.gn @@ -17,7 +17,7 @@ source_set("share_extension") { "//components/bookmarks/browser", "//components/keyed_service/core", "//components/keyed_service/ios", - "//components/reading_list/ios", + "//components/reading_list/core", "//ios/chrome/browser", "//ios/chrome/browser/bookmarks", "//ios/chrome/browser/browser_state", diff --git a/chromium/ios/chrome/browser/snapshots/BUILD.gn b/chromium/ios/chrome/browser/snapshots/BUILD.gn index 47edcd61a2b..a1db577d2bb 100644 --- a/chromium/ios/chrome/browser/snapshots/BUILD.gn +++ b/chromium/ios/chrome/browser/snapshots/BUILD.gn @@ -37,7 +37,7 @@ source_set("snapshots_arc") { deps = [ "//base", "//ios/chrome/browser/tabs", - "//ios/shared/chrome/browser/tabs", + "//ios/chrome/browser/web_state_list", ] configs += [ "//build/config/compiler:enable_arc" ] } diff --git a/chromium/ios/chrome/browser/store_kit/BUILD.gn b/chromium/ios/chrome/browser/store_kit/BUILD.gn new file mode 100644 index 00000000000..02e9d0682cd --- /dev/null +++ b/chromium/ios/chrome/browser/store_kit/BUILD.gn @@ -0,0 +1,32 @@ +# 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("store_kit") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "store_kit_launcher.h", + "store_kit_tab_helper.h", + "store_kit_tab_helper.mm", + ] + deps = [ + "//base", + "//ios/web", + ] +} + +source_set("unit_tests") { + testonly = true + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "store_kit_tab_helper_unittest.mm", + ] + deps = [ + ":store_kit", + "//base", + "//ios/web", + "//ios/web:test_support", + "//testing/gtest", + "//third_party/ocmock:ocmock", + ] +} diff --git a/chromium/ios/chrome/browser/suggestions/BUILD.gn b/chromium/ios/chrome/browser/suggestions/BUILD.gn index 7cf651ac6a8..b6951a58cf9 100644 --- a/chromium/ios/chrome/browser/suggestions/BUILD.gn +++ b/chromium/ios/chrome/browser/suggestions/BUILD.gn @@ -5,15 +5,13 @@ source_set("suggestions") { configs += [ "//build/config/compiler:enable_arc" ] sources = [ - "ios_image_decoder_impl.h", - "ios_image_decoder_impl.mm", "suggestions_service_factory.h", "suggestions_service_factory.mm", ] deps = [ "//base", "//components/browser_sync", - "//components/image_fetcher", + "//components/image_fetcher/core", "//components/image_fetcher/ios", "//components/keyed_service/ios", "//components/leveldb_proto", @@ -28,17 +26,3 @@ source_set("suggestions") { "//ui/gfx", ] } - -source_set("unit_tests") { - configs += [ "//build/config/compiler:enable_arc" ] - testonly = true - sources = [ - "ios_image_decoder_impl_unittest.mm", - ] - deps = [ - ":suggestions", - "//base", - "//testing/gtest", - "//ui/gfx", - ] -} diff --git a/chromium/ios/chrome/browser/sync/BUILD.gn b/chromium/ios/chrome/browser/sync/BUILD.gn index 14f9eed6e98..cd24a76546e 100644 --- a/chromium/ios/chrome/browser/sync/BUILD.gn +++ b/chromium/ios/chrome/browser/sync/BUILD.gn @@ -32,7 +32,6 @@ source_set("sync") { "//components/password_manager/sync/browser", "//components/prefs", "//components/reading_list/core", - "//components/reading_list/ios", "//components/search_engines", "//components/sessions", "//components/signin/core/browser", @@ -113,7 +112,6 @@ source_set("unit_tests") { ":sync", "//base", "//components/browser_sync", - "//components/reading_list/core", "//components/sync", "//ios/chrome/browser/browser_state:test_support", "//ios/web:test_support", diff --git a/chromium/ios/chrome/browser/tabs/BUILD.gn b/chromium/ios/chrome/browser/tabs/BUILD.gn index 343af87da3c..0555e7531e9 100644 --- a/chromium/ios/chrome/browser/tabs/BUILD.gn +++ b/chromium/ios/chrome/browser/tabs/BUILD.gn @@ -9,6 +9,7 @@ source_set("tabs") { "tab_delegate.h", "tab_dialog_delegate.h", "tab_headers_delegate.h", + "tab_helper_util.h", "tab_model.h", "tab_model_list.h", "tab_model_observer.h", @@ -21,8 +22,10 @@ source_set("tabs") { "//components/sessions", "//components/signin/ios/browser", "//components/sync_sessions", + "//ios/chrome/browser/web:sad_tab_tab_helper_delegate", "//ios/net", "//ios/web", + "//ios/web:user_agent", "//ui/base", ] libs = [ "UIKit.framework" ] @@ -30,6 +33,7 @@ source_set("tabs") { source_set("tabs_internal") { sources = [ + "tab.h", "tab.mm", "tab_model.mm", "tab_model_synced_window_delegate.mm", @@ -51,7 +55,6 @@ source_set("tabs_internal") { "//components/navigation_metrics", "//components/prefs", "//components/reading_list/core", - "//components/reading_list/ios", "//components/search_engines", "//components/sessions", "//components/signin/core/browser", @@ -78,11 +81,13 @@ source_set("tabs_internal") { "//ios/chrome/browser/reading_list", "//ios/chrome/browser/search_engines", "//ios/chrome/browser/sessions", + "//ios/chrome/browser/sessions:serialisation", "//ios/chrome/browser/signin", "//ios/chrome/browser/signin:signin_internal", "//ios/chrome/browser/snapshots", "//ios/chrome/browser/snapshots:snapshots_internal", "//ios/chrome/browser/ssl", + "//ios/chrome/browser/store_kit", "//ios/chrome/browser/sync", "//ios/chrome/browser/translate", "//ios/chrome/browser/u2f", @@ -97,12 +102,14 @@ source_set("tabs_internal") { "//ios/chrome/browser/ui/toolbar", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web", + "//ios/chrome/browser/web:sad_tab_tab_helper_delegate", "//ios/chrome/browser/web:web_internal", + "//ios/chrome/browser/web_state_list", "//ios/net", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/native_app_launcher", - "//ios/shared/chrome/browser/tabs", "//ios/web", + "//ios/web:user_agent", "//net", "//ui/base", "//url", @@ -117,6 +124,9 @@ source_set("tabs_internal") { source_set("tabs_internal_arc") { sources = [ "legacy_tab_helper.mm", + "tab_helper_util.mm", + "tab_model_closing_web_state_observer.h", + "tab_model_closing_web_state_observer.mm", "tab_model_list.mm", "tab_model_observers.h", "tab_model_observers.mm", @@ -124,16 +134,41 @@ source_set("tabs_internal_arc") { "tab_model_observers_bridge.mm", "tab_model_selected_tab_observer.h", "tab_model_selected_tab_observer.mm", + "tab_model_web_state_list_delegate.h", + "tab_model_web_state_list_delegate.mm", "tab_parenting_observer.h", "tab_parenting_observer.mm", ] deps = [ ":tabs", "//base", + "//components/favicon/ios", + "//components/history/core/browser", + "//components/history/ios/browser", + "//components/keyed_service/core", + "//components/sessions", + "//components/signin/ios/browser", "//ios/chrome/browser", + "//ios/chrome/browser/bookmarks", "//ios/chrome/browser/browser_state", - "//ios/shared/chrome/browser/tabs", + "//ios/chrome/browser/favicon", + "//ios/chrome/browser/find_in_page", + "//ios/chrome/browser/find_in_page", + "//ios/chrome/browser/history", + "//ios/chrome/browser/infobars", + "//ios/chrome/browser/reading_list", + "//ios/chrome/browser/sessions", + "//ios/chrome/browser/signin", + "//ios/chrome/browser/ssl", + "//ios/chrome/browser/store_kit", + "//ios/chrome/browser/sync", + "//ios/chrome/browser/translate", + "//ios/chrome/browser/web", + "//ios/chrome/browser/web:web_internal", + "//ios/chrome/browser/web_state_list", + "//ios/public/provider/chrome/browser", "//ios/web", + "//url", ] libs = [ "Foundation.framework" ] configs += [ "//build/config/compiler:enable_arc" ] @@ -159,9 +194,11 @@ source_set("unit_tests") { "//ios/chrome/browser/history", "//ios/chrome/browser/infobars", "//ios/chrome/browser/sessions", + "//ios/chrome/browser/sessions:serialisation", "//ios/chrome/browser/sessions:test_support", "//ios/chrome/browser/ui:ui_internal", "//ios/chrome/browser/web:web_internal", + "//ios/chrome/browser/web_state_list", "//ios/chrome/test:test_support", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser:test_support", diff --git a/chromium/ios/chrome/browser/test/BUILD.gn b/chromium/ios/chrome/browser/test/BUILD.gn index 2383e114cbe..4526196543d 100644 --- a/chromium/ios/chrome/browser/test/BUILD.gn +++ b/chromium/ios/chrome/browser/test/BUILD.gn @@ -18,6 +18,7 @@ source_set("perf_test_support") { "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/search_engines", "//ios/chrome/browser/sessions", + "//ios/chrome/browser/sessions:serialisation", "//ios/chrome/browser/tabs", "//ios/chrome/browser/ui:ui_internal", "//ios/chrome/browser/web:web_internal", diff --git a/chromium/ios/chrome/browser/translate/BUILD.gn b/chromium/ios/chrome/browser/translate/BUILD.gn index f72f3fc4526..16beaecaf7e 100644 --- a/chromium/ios/chrome/browser/translate/BUILD.gn +++ b/chromium/ios/chrome/browser/translate/BUILD.gn @@ -17,6 +17,10 @@ source_set("translate") { "translate_infobar_tags.h", "translate_message_infobar_controller.h", "translate_message_infobar_controller.mm", + "translate_ranker_factory.cc", + "translate_ranker_factory.h", + "translate_ranker_metrics_provider.cc", + "translate_ranker_metrics_provider.h", "translate_service_ios.cc", "translate_service_ios.h", ] @@ -25,6 +29,8 @@ source_set("translate") { "//components/infobars/core", "//components/keyed_service/core", "//components/keyed_service/ios", + "//components/metrics", + "//components/metrics/proto", "//components/prefs", "//components/strings", "//components/translate/core/browser", diff --git a/chromium/ios/chrome/browser/ui/BUILD.gn b/chromium/ios/chrome/browser/ui/BUILD.gn index 772bcf3db26..34024c6a245 100644 --- a/chromium/ios/chrome/browser/ui/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/BUILD.gn @@ -12,8 +12,6 @@ source_set("ui") { "animation_util.mm", "background_generator.h", "background_generator.mm", - "favicon_view.h", - "favicon_view.mm", "file_locations.h", "file_locations.mm", "image_util.h", @@ -45,7 +43,7 @@ source_set("ui") { "//base", "//base:i18n", "//ios/chrome/browser", - "//ios/chrome/browser/favicon", + "//ios/chrome/browser/store_kit", "//ios/chrome/browser/ui/commands", "//ios/web", "//ui/base", @@ -99,6 +97,7 @@ source_set("unit_tests") { "//ios/chrome/browser/find_in_page", "//ios/chrome/browser/search_engines", "//ios/chrome/browser/sessions", + "//ios/chrome/browser/store_kit", "//ios/chrome/browser/tabs", "//ios/chrome/browser/ui/activity_services", "//ios/chrome/browser/ui/alert_coordinator", @@ -107,6 +106,8 @@ source_set("unit_tests") { "//ios/chrome/browser/ui/toolbar", "//ios/chrome/browser/ui/toolbar:test_support", "//ios/chrome/browser/web:web_internal", + "//ios/chrome/browser/web_state_list", + "//ios/chrome/browser/web_state_list:test_support", "//ios/chrome/test:test_support", "//ios/testing:ocmock_support", "//ios/web", @@ -201,14 +202,9 @@ bundle_data("resources") { ] } -source_set("ui_internal") { +source_set("ui_internal_arc") { + configs += [ "//build/config/compiler:enable_arc" ] sources = [ - "browser_container_view.h", - "browser_container_view.mm", - "browser_view_controller.h", - "browser_view_controller.mm", - "browser_view_controller_dependency_factory.h", - "browser_view_controller_dependency_factory.mm", "chrome_web_view_factory.h", "chrome_web_view_factory.mm", "external_file_controller.h", @@ -243,7 +239,6 @@ source_set("ui_internal") { "//components/infobars/core", "//components/prefs", "//components/reading_list/core", - "//components/reading_list/ios", "//components/search_engines", "//components/sessions", "//components/strings", @@ -271,6 +266,7 @@ source_set("ui_internal") { "//ios/chrome/browser/sessions", "//ios/chrome/browser/snapshots", "//ios/chrome/browser/snapshots:snapshots_internal", + "//ios/chrome/browser/store_kit", "//ios/chrome/browser/tabs", "//ios/chrome/browser/ui/activity_services", "//ios/chrome/browser/ui/alert_coordinator", @@ -305,6 +301,7 @@ source_set("ui_internal") { "//ios/chrome/browser/upgrade", "//ios/chrome/browser/web", "//ios/chrome/browser/web:web_internal", + "//ios/chrome/browser/web_state_list", "//ios/chrome/common", "//ios/net", "//ios/public/provider/chrome/browser", @@ -312,6 +309,7 @@ source_set("ui_internal") { "//ios/public/provider/chrome/browser/voice", "//ios/third_party/material_components_ios", "//ios/web", + "//ios/web:user_agent", "//net", "//third_party/google_toolbox_for_mac", "//ui/base", @@ -345,7 +343,135 @@ source_set("ui_internal") { ] } +source_set("ui_internal") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "browser_container_view.h", + "browser_container_view.mm", + "browser_view_controller.h", + "browser_view_controller.mm", + "browser_view_controller_dependency_factory.h", + "browser_view_controller_dependency_factory.mm", + ] + deps = [ + ":resources", + ":ui", + "//base", + "//base:i18n", + "//components/bookmarks/browser", + "//components/image_fetcher/ios", + "//components/infobars/core", + "//components/prefs", + "//components/reading_list/core", + "//components/search_engines", + "//components/sessions", + "//components/strings", + "//components/toolbar", + "//components/url_formatter", + "//ios/chrome/app:tests_hook", + "//ios/chrome/app/strings", + "//ios/chrome/browser", + "//ios/chrome/browser/bookmarks", + "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/content_suggestions", + "//ios/chrome/browser/favicon", + "//ios/chrome/browser/find_in_page", + "//ios/chrome/browser/first_run", + "//ios/chrome/browser/geolocation:geolocation_internal", + "//ios/chrome/browser/infobars", + "//ios/chrome/browser/metrics:metrics_internal", + "//ios/chrome/browser/native_app_launcher:native_app_launcher_internal", + "//ios/chrome/browser/net", + "//ios/chrome/browser/passwords", + "//ios/chrome/browser/payments", + "//ios/chrome/browser/prefs", + "//ios/chrome/browser/reading_list", + "//ios/chrome/browser/search_engines", + "//ios/chrome/browser/sessions", + "//ios/chrome/browser/snapshots", + "//ios/chrome/browser/snapshots:snapshots_internal", + "//ios/chrome/browser/store_kit", + "//ios/chrome/browser/tabs", + "//ios/chrome/browser/ui/activity_services", + "//ios/chrome/browser/ui/alert_coordinator", + "//ios/chrome/browser/ui/authentication", + "//ios/chrome/browser/ui/bookmarks", + "//ios/chrome/browser/ui/colors", + "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/context_menu", + "//ios/chrome/browser/ui/contextual_search", + "//ios/chrome/browser/ui/dialogs:dialogs_internal", + "//ios/chrome/browser/ui/elements:elements_internal", + "//ios/chrome/browser/ui/find_bar", + "//ios/chrome/browser/ui/first_run", + "//ios/chrome/browser/ui/history", + "//ios/chrome/browser/ui/keyboard", + "//ios/chrome/browser/ui/ntp", + "//ios/chrome/browser/ui/ntp:ntp_internal", + "//ios/chrome/browser/ui/ntp/recent_tabs", + "//ios/chrome/browser/ui/omnibox:omnibox_internal", + "//ios/chrome/browser/ui/overscroll_actions", + "//ios/chrome/browser/ui/print", + "//ios/chrome/browser/ui/qr_scanner", + "//ios/chrome/browser/ui/reading_list", + "//ios/chrome/browser/ui/stack_view", + "//ios/chrome/browser/ui/static_content", + "//ios/chrome/browser/ui/sync", + "//ios/chrome/browser/ui/tab_switcher", + "//ios/chrome/browser/ui/tabs", + "//ios/chrome/browser/ui/tools_menu", + "//ios/chrome/browser/ui/util", + "//ios/chrome/browser/ui/voice", + "//ios/chrome/browser/upgrade", + "//ios/chrome/browser/web", + "//ios/chrome/browser/web:web_internal", + "//ios/chrome/browser/web_state_list", + "//ios/chrome/common", + "//ios/net", + "//ios/public/provider/chrome/browser", + "//ios/public/provider/chrome/browser/ui", + "//ios/public/provider/chrome/browser/voice", + "//ios/shared/chrome/browser/ui/tools_menu", + "//ios/third_party/material_components_ios", + "//ios/web", + "//ios/web:user_agent", + "//net", + "//third_party/google_toolbox_for_mac", + "//ui/base", + "//ui/gfx", + "//url", + ] + public_deps = [ + ":ui_internal_arc", + "//ios/chrome/browser/ui/side_swipe", + "//ios/chrome/browser/ui/toolbar", + ] + allow_circular_includes_from = [ + "//ios/chrome/browser/ui/tabs", + "//ios/chrome/browser/ui/tab_switcher", + "//ios/chrome/browser/ui/toolbar", + "//ios/chrome/browser/ui/overscroll_actions", + "//ios/chrome/browser/snapshots:snapshots_internal", + "//ios/chrome/browser/web:web_internal", + "//ios/chrome/browser/ui/ntp:ntp_internal", + "//ios/chrome/browser/ui/stack_view", + ":ui_internal_arc", + ] + libs = [ + "AssetsLibrary.framework", + "MessageUI.framework", + "MobileCoreServices.framework", + "PassKit.framework", + "Photos.framework", + "QuartzCore.framework", + "StoreKit.framework", + "UIKit.framework", + "WebKit.framework", + ] +} + source_set("test_support") { + configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ "browser_view_controller_testing.h", @@ -406,6 +532,7 @@ source_set("eg_tests") { } source_set("perf_tests") { + configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ "omnibox_perftest.mm", @@ -417,11 +544,15 @@ source_set("perf_tests") { "//ios/chrome/browser/autocomplete", "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/search_engines", + "//ios/chrome/browser/store_kit", "//ios/chrome/browser/tabs", "//ios/chrome/browser/tabs:tabs_internal", "//ios/chrome/browser/ui/omnibox:omnibox_internal", "//ios/chrome/browser/ui/toolbar", + "//ios/chrome/browser/web_state_list", + "//ios/chrome/browser/web_state_list:test_support", "//ios/chrome/test/base:perf_test_support", + "//ios/web:test_support", "//testing/gtest", "//third_party/ocmock", "//ui/base:test_support", diff --git a/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn b/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn index ed901d23456..e2e750cdb5e 100644 --- a/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/activity_services/BUILD.gn @@ -54,7 +54,6 @@ source_set("activity_services") { ":assets", ":resources", "//base", - "//components/reading_list/core", "//ios/chrome/app/strings", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", @@ -83,7 +82,6 @@ source_set("unit_tests") { ":activity_services", "//base", "//base/test:test_support", - "//components/reading_list/core", "//ios/chrome/app/strings", "//ios/chrome/browser/browser_state:test_support", "//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 c80542e8ecf..f5707b20174 100644 --- a/chromium/ios/chrome/browser/ui/authentication/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/authentication/BUILD.gn @@ -2,12 +2,27 @@ # 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") + bundle_data("resources") { sources = [ "resources/signin_confirmation_more.png", "resources/signin_confirmation_more@2x.png", "resources/signin_confirmation_more@3x.png", ] + if (is_chrome_branded) { + sources += [ + "resources/signin_promo_logo_chrome_color.png", + "resources/signin_promo_logo_chrome_color@2x.png", + "resources/signin_promo_logo_chrome_color@3x.png", + ] + } else { + sources += [ + "resources/signin_promo_logo_chromium_color.png", + "resources/signin_promo_logo_chromium_color@2x.png", + "resources/signin_promo_logo_chromium_color@3x.png", + ] + } outputs = [ "{{bundle_resources_dir}}/{{source_file_part}}", ] @@ -36,6 +51,8 @@ source_set("authentication") { "signin_interaction_controller.mm", ] deps = [ + ":authentication_arc", + ":authentication_ui", ":resources", "//base", "//components/google/core/browser", @@ -61,8 +78,6 @@ source_set("authentication") { "//ios/chrome/browser/ui/collection_view/cells", "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/commands", - "//ios/chrome/browser/ui/settings/cells", - "//ios/chrome/browser/ui/settings/utils", "//ios/chrome/browser/ui/util", "//ios/chrome/common", "//ios/public/provider/chrome/browser", @@ -81,16 +96,70 @@ source_set("authentication") { ] } +source_set("authentication_arc") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "resized_avatar_cache.h", + "resized_avatar_cache.mm", + "signin_promo_view_mediator.h", + "signin_promo_view_mediator.mm", + ] + deps = [ + ":authentication_ui", + "//base", + "//ios/chrome/app/strings", + "//ios/chrome/browser/signin", + "//ios/chrome/browser/ui", + "//ios/public/provider/chrome/browser", + "//ios/public/provider/chrome/browser/signin", + "//ios/third_party/material_components_ios", + "//ui/base", + ] + libs = [ "UIKit.framework" ] +} + +source_set("authentication_ui") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "account_control_item.h", + "account_control_item.mm", + "signin_promo_item.h", + "signin_promo_item.mm", + "signin_promo_view.h", + "signin_promo_view.mm", + "signin_promo_view_configurator.h", + "signin_promo_view_configurator.mm", + "signin_promo_view_consumer.h", + ] + deps = [ + "//base", + "//ios/chrome/app/strings", + "//ios/chrome/browser/ui", + "//ios/chrome/browser/ui/collection_view/cells", + "//ios/chrome/browser/ui/colors", + "//ios/public/provider/chrome/browser", + "//ios/public/provider/chrome/browser/signin", + "//ui/base", + ] + libs = [ "UIKit.framework" ] +} + source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ + "account_control_item_unittest.mm", "authentication_flow_unittest.mm", "re_signin_infobar_delegate_unittest.mm", "signed_in_accounts_view_controller_unittest.mm", + "signin_promo_item_unittest.mm", + "signin_promo_view_mediator_unittest.mm", + "signin_promo_view_unittest.mm", ] deps = [ ":authentication", + ":authentication_arc", + ":authentication_ui", "//base", "//base/test:test_support", "//components/pref_registry", @@ -101,9 +170,11 @@ source_set("unit_tests") { "//ios/chrome/browser/prefs:browser_prefs", "//ios/chrome/browser/signin", "//ios/chrome/browser/signin:test_support", + "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/commands", "//ios/chrome/test:test_support", "//ios/public/provider/chrome/browser/signin:test_support", + "//ios/third_party/material_components_ios", "//ios/web:test_support", "//testing/gtest", "//third_party/ocmock", diff --git a/chromium/ios/chrome/browser/ui/autofill/BUILD.gn b/chromium/ios/chrome/browser/ui/autofill/BUILD.gn index cb27e1b57a3..2bced58fc89 100644 --- a/chromium/ios/chrome/browser/ui/autofill/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/autofill/BUILD.gn @@ -8,12 +8,15 @@ source_set("autofill") { "autofill_client_ios.h", "autofill_client_ios.mm", "autofill_save_card_infobar.mm", + "autofill_ui_type_util.h", + "autofill_ui_type_util.mm", "card_unmask_prompt_view_bridge.h", "card_unmask_prompt_view_bridge.mm", "storage_switch_tooltip.h", "storage_switch_tooltip.mm", ] deps = [ + ":autofill_ui", "//base", "//components/autofill/core/browser", "//components/autofill/core/common", @@ -43,3 +46,19 @@ source_set("autofill") { ] libs = [ "UIKit.framework" ] } + +source_set("autofill_ui") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "autofill_edit_accessory_view.h", + "autofill_edit_accessory_view.mm", + "autofill_ui_type.h", + ] + deps = [ + "//base", + "//components/strings:components_strings_grit", + "//ios/chrome/browser/ui", + "//ui/base:base", + ] + libs = [ "UIKit.framework" ] +} diff --git a/chromium/ios/chrome/browser/ui/autofill/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/autofill/cells/BUILD.gn index 086719673c8..3a019762dea 100644 --- a/chromium/ios/chrome/browser/ui/autofill/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/autofill/cells/BUILD.gn @@ -4,6 +4,8 @@ source_set("cells") { sources = [ + "autofill_edit_item.h", + "autofill_edit_item.mm", "cvc_item.h", "cvc_item.mm", "status_item.h", @@ -18,6 +20,7 @@ source_set("cells") { "//ios/chrome/app/strings", "//ios/chrome/app/theme", "//ios/chrome/browser/ui", + "//ios/chrome/browser/ui/autofill:autofill_ui", "//ios/chrome/browser/ui/collection_view/cells", "//ios/chrome/browser/ui/colors", "//ios/public/provider/chrome/browser", @@ -33,6 +36,7 @@ source_set("cells") { source_set("unit_tests") { testonly = true sources = [ + "autofill_edit_item_unittest.mm", "cvc_item_unittest.mm", "status_item_unittest.mm", "storage_switch_item_unittest.mm", diff --git a/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn index 5887084c003..be9ffb8212a 100644 --- a/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/bookmarks/BUILD.gn @@ -3,6 +3,7 @@ # found in the LICENSE file. source_set("bookmarks") { + configs += [ "//build/config/compiler:enable_arc" ] sources = [ "bookmark_collection_cells.h", "bookmark_collection_cells.mm", @@ -122,9 +123,11 @@ source_set("bookmarks") { } source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ "bookmark_home_view_controller_unittest.mm", + "bookmark_ios_unittest.h", "bookmark_ios_unittest.mm", "bookmark_position_cache_unittest.mm", "bookmark_utils_ios_unittest.mm", diff --git a/chromium/ios/chrome/browser/ui/bookmarks/bars/BUILD.gn b/chromium/ios/chrome/browser/ui/bookmarks/bars/BUILD.gn index 47c8cfe78f9..6174d44a25e 100644 --- a/chromium/ios/chrome/browser/ui/bookmarks/bars/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/bookmarks/bars/BUILD.gn @@ -3,6 +3,7 @@ # found in the LICENSE file. source_set("bars") { + configs += [ "//build/config/compiler:enable_arc" ] sources = [ "bookmark_editing_bar.h", "bookmark_editing_bar.mm", diff --git a/chromium/ios/chrome/browser/ui/collection_view/BUILD.gn b/chromium/ios/chrome/browser/ui/collection_view/BUILD.gn index da91a22d71a..3a9b5d789f1 100644 --- a/chromium/ios/chrome/browser/ui/collection_view/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/collection_view/BUILD.gn @@ -3,6 +3,7 @@ # found in the LICENSE file. source_set("collection_view") { + configs += [ "//build/config/compiler:enable_arc" ] sources = [ "collection_view_controller.h", "collection_view_controller.mm", @@ -20,6 +21,7 @@ source_set("collection_view") { } source_set("test_support") { + configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ "collection_view_controller_test.h", 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 e6e8c32bcce..f1eb535ea34 100644 --- a/chromium/ios/chrome/browser/ui/collection_view/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/collection_view/cells/BUILD.gn @@ -18,6 +18,8 @@ source_set("cells") { "collection_view_item.mm", "collection_view_switch_item.h", "collection_view_switch_item.mm", + "collection_view_text_cell.h", + "collection_view_text_cell.mm", "collection_view_text_item.h", "collection_view_text_item.mm", ] @@ -41,6 +43,7 @@ source_set("cells") { } source_set("test_support") { + configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ "test_utils.h", diff --git a/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn b/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn index 184ac543a19..42381edb149 100644 --- a/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/content_suggestions/BUILD.gn @@ -3,70 +3,61 @@ # found in the LICENSE file. source_set("content_suggestions") { - configs += [ "//build/config/compiler:enable_arc" ] sources = [ "content_suggestion.h", "content_suggestion.mm", - "content_suggestion_identifier.h", - "content_suggestion_identifier.mm", - "content_suggestions_article_item.h", - "content_suggestions_article_item.mm", + "content_suggestion_extra_builder.h", + "content_suggestion_extra_builder.mm", "content_suggestions_collection_updater.h", "content_suggestions_collection_updater.mm", "content_suggestions_commands.h", "content_suggestions_data_sink.h", "content_suggestions_data_source.h", - "content_suggestions_expandable_item.h", - "content_suggestions_expandable_item.mm", - "content_suggestions_favicon_internal_cell.h", - "content_suggestions_favicon_internal_cell.mm", - "content_suggestions_favicon_item.h", - "content_suggestions_favicon_item.mm", "content_suggestions_image_fetcher.h", - "content_suggestions_section_information.h", - "content_suggestions_section_information.mm", - "content_suggestions_stack_item.h", - "content_suggestions_stack_item.mm", - "content_suggestions_stack_item_actions.h", - "content_suggestions_text_item.h", - "content_suggestions_text_item.mm", - "content_suggestions_text_item_actions.h", "content_suggestions_view_controller.h", "content_suggestions_view_controller.mm", - "expandable_item.h", ] deps = [ + ":resources", "//base", - "//ios/chrome/browser/ui", + "//components/strings", "//ios/chrome/browser/ui/collection_view", - "//ios/chrome/browser/ui/colors", - "//ios/chrome/browser/ui/util", - "//ios/third_party/material_roboto_font_loader_ios", + "//ios/chrome/browser/ui/content_suggestions/cells", + "//ios/chrome/browser/ui/content_suggestions/identifier", + "//ios/chrome/browser/ui/favicon:favicon_ui", + "//ios/chrome/browser/ui/reading_list", "//ui/base", "//url", ] public_deps = [ "//ios/third_party/material_components_ios", ] + configs += [ "//build/config/compiler:enable_arc" ] } source_set("unit_tests") { - configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ - "content_suggestion_identifier_unittest.mm", - "content_suggestions_article_item_unittest.mm", - "content_suggestions_expandable_item_unittest.mm", - "content_suggestions_favicon_item_unittest.mm", - "content_suggestions_stack_item_unittest.mm", - "content_suggestions_text_item_unittest.mm", + "content_suggestions_collection_updater_unittest.mm", ] deps = [ ":content_suggestions", "//base", "//ios/chrome/browser/ui/collection_view", + "//ios/chrome/browser/ui/content_suggestions/identifier", "//testing/gtest", "//third_party/ocmock", - "//url", + ] + configs += [ "//build/config/compiler:enable_arc" ] +} + +bundle_data("resources") { + sources = [ + "resources/content_suggestions_no_image.png", + "resources/content_suggestions_no_image@2x.png", + "resources/content_suggestions_no_image@3x.png", + ] + outputs = [ + "{{bundle_resources_dir}}/{{source_file_part}}", ] } diff --git a/chromium/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn new file mode 100644 index 00000000000..42b2a0279c8 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/content_suggestions/cells/BUILD.gn @@ -0,0 +1,57 @@ +# 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("cells") { + sources = [ + "content_suggestions_article_item.h", + "content_suggestions_article_item.mm", + "content_suggestions_footer_item.h", + "content_suggestions_footer_item.mm", + "content_suggestions_most_visited.h", + "content_suggestions_most_visited.mm", + "content_suggestions_most_visited_item.h", + "content_suggestions_most_visited_item.mm", + "content_suggestions_most_visited_tile.h", + "content_suggestions_most_visited_tile.mm", + "content_suggestions_reading_list_item.h", + "content_suggestions_reading_list_item.mm", + "content_suggestions_text_item.h", + "content_suggestions_text_item.mm", + ] + deps = [ + "//base", + "//ios/chrome/browser/ui", + "//ios/chrome/browser/ui/collection_view", + "//ios/chrome/browser/ui/colors", + "//ios/chrome/browser/ui/content_suggestions/identifier", + "//ios/chrome/browser/ui/favicon:favicon_ui", + "//ios/chrome/browser/ui/reading_list", + "//ios/chrome/browser/ui/util", + "//ui/base", + "//url", + ] + configs += [ "//build/config/compiler:enable_arc" ] +} + +source_set("unit_tests") { + testonly = true + sources = [ + "content_suggestions_article_item_unittest.mm", + "content_suggestions_footer_item_unittest.mm", + "content_suggestions_most_visited_item_unittest.mm", + "content_suggestions_most_visited_tile_unittest.mm", + "content_suggestions_most_visited_unittest.mm", + ] + deps = [ + ":cells", + "//base", + "//ios/chrome/browser/ui", + "//ios/chrome/browser/ui/collection_view", + "//ios/chrome/browser/ui/favicon:favicon_ui", + "//testing/gtest", + "//third_party/ocmock", + "//url", + ] + configs += [ "//build/config/compiler:enable_arc" ] +} diff --git a/chromium/ios/chrome/browser/ui/content_suggestions/identifier/BUILD.gn b/chromium/ios/chrome/browser/ui/content_suggestions/identifier/BUILD.gn new file mode 100644 index 00000000000..494e7178bc2 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/content_suggestions/identifier/BUILD.gn @@ -0,0 +1,28 @@ +# 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("identifier") { + sources = [ + "content_suggestion_identifier.h", + "content_suggestion_identifier.mm", + "content_suggestions_section_information.h", + "content_suggestions_section_information.mm", + ] + deps = [ + "//base", + ] + configs += [ "//build/config/compiler:enable_arc" ] +} + +source_set("unit_tests") { + testonly = true + sources = [ + "content_suggestion_identifier_unittest.mm", + ] + deps = [ + ":identifier", + "//testing/gtest", + ] + configs += [ "//build/config/compiler:enable_arc" ] +} diff --git a/chromium/ios/chrome/browser/ui/contextual_search/BUILD.gn b/chromium/ios/chrome/browser/ui/contextual_search/BUILD.gn index e251d1e347e..e0c44276b6f 100644 --- a/chromium/ios/chrome/browser/ui/contextual_search/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/contextual_search/BUILD.gn @@ -88,6 +88,7 @@ source_set("contextual_search") { "//ios/chrome/browser/ui/contextual_search/protos", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/web", + "//ios/chrome/browser/web_state_list", "//ios/chrome/common", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/images", diff --git a/chromium/ios/chrome/browser/ui/downloads/BUILD.gn b/chromium/ios/chrome/browser/ui/downloads/BUILD.gn index 685cea45c9d..92726687df8 100644 --- a/chromium/ios/chrome/browser/ui/downloads/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/downloads/BUILD.gn @@ -47,6 +47,7 @@ source_set("downloads") { "//ios/chrome/browser", "//ios/chrome/browser/native_app_launcher", "//ios/chrome/browser/native_app_launcher:native_app_launcher_internal", + "//ios/chrome/browser/store_kit", "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/colors", @@ -65,6 +66,7 @@ source_set("downloads") { } source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ "download_manager_controller_unittest.mm", @@ -73,8 +75,11 @@ source_set("unit_tests") { ":downloads", "//base", "//ios/chrome/browser", + "//ios/chrome/browser/store_kit", + "//ios/chrome/browser/web:test_support", "//ios/web:test_support", "//net:test_support", "//testing/gtest", + "//third_party/ocmock:ocmock", ] } diff --git a/chromium/ios/chrome/browser/ui/favicon/BUILD.gn b/chromium/ios/chrome/browser/ui/favicon/BUILD.gn new file mode 100644 index 00000000000..792c9486390 --- /dev/null +++ b/chromium/ios/chrome/browser/ui/favicon/BUILD.gn @@ -0,0 +1,32 @@ +# 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("favicon") { + sources = [ + "favicon_attributes_provider.h", + "favicon_attributes_provider.mm", + ] + deps = [ + ":favicon_ui", + "//base", + "//components/favicon/core", + "//components/favicon_base", + "//url", + ] + configs += [ "//build/config/compiler:enable_arc" ] +} + +source_set("favicon_ui") { + sources = [ + "favicon_attributes.h", + "favicon_attributes.mm", + "favicon_view.h", + "favicon_view.mm", + ] + deps = [ + "//base", + "//ios/chrome/browser/ui", + ] + 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 c65ec880ffd..55e4865329c 100644 --- a/chromium/ios/chrome/browser/ui/first_run/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/first_run/BUILD.gn @@ -55,6 +55,7 @@ source_set("first_run") { "//ios/chrome/browser/ui/authentication", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/fancy_ui", + "//ios/chrome/browser/ui/icons", "//ios/chrome/browser/ui/material_components", "//ios/chrome/browser/ui/promos", "//ios/chrome/browser/ui/settings", diff --git a/chromium/ios/chrome/browser/ui/history/BUILD.gn b/chromium/ios/chrome/browser/ui/history/BUILD.gn index d25410a3252..373847d6819 100644 --- a/chromium/ios/chrome/browser/ui/history/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/history/BUILD.gn @@ -213,6 +213,7 @@ source_set("eg_tests") { "//components/browsing_data/core", "//components/prefs", "//components/strings", + "//components/url_formatter:url_formatter", "//ios/chrome/app/strings", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", diff --git a/chromium/ios/chrome/browser/ui/main/BUILD.gn b/chromium/ios/chrome/browser/ui/main/BUILD.gn index 744db03fa5c..4f3bbc84b60 100644 --- a/chromium/ios/chrome/browser/ui/main/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/main/BUILD.gn @@ -22,6 +22,7 @@ source_set("main") { "//ios/chrome/browser/device_sharing", "//ios/chrome/browser/physical_web", "//ios/chrome/browser/sessions", + "//ios/chrome/browser/sessions:serialisation", "//ios/chrome/browser/tabs", "//ios/chrome/browser/tabs:tabs_internal", "//ios/public/provider/chrome/browser", diff --git a/chromium/ios/chrome/browser/ui/ntp/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp/BUILD.gn index 99bb29855ff..64726d7e36f 100644 --- a/chromium/ios/chrome/browser/ui/ntp/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/ntp/BUILD.gn @@ -157,7 +157,6 @@ source_set("ntp_internal") { "//components/ntp_tiles", "//components/prefs", "//components/rappor", - "//components/reading_list/core", "//components/search_engines", "//components/strings", "//components/suggestions", diff --git a/chromium/ios/chrome/browser/ui/ntp/recent_tabs/BUILD.gn b/chromium/ios/chrome/browser/ui/ntp/recent_tabs/BUILD.gn index 2de4e113e28..8035fb2bbf1 100644 --- a/chromium/ios/chrome/browser/ui/ntp/recent_tabs/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/ntp/recent_tabs/BUILD.gn @@ -3,6 +3,7 @@ # found in the LICENSE file. source_set("recent_tabs") { + configs += [ "//build/config/compiler:enable_arc" ] sources = [ "recent_tabs_bridges.h", "recent_tabs_bridges.mm", diff --git a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn index be8cfbb59e1..a12dd7a88c1 100644 --- a/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/omnibox/BUILD.gn @@ -6,8 +6,6 @@ source_set("omnibox") { sources = [ "omnibox_util.cc", "omnibox_util.h", - "web_omnibox_edit_controller.cc", - "web_omnibox_edit_controller.h", ] deps = [ "//base", @@ -32,11 +30,12 @@ bundle_data("resources") { } source_set("omnibox_internal") { + configs += [ "//build/config/compiler:enable_arc" ] sources = [ "chrome_omnibox_client_ios.h", "chrome_omnibox_client_ios.mm", - "location_bar_view_ios.h", - "location_bar_view_ios.mm", + "location_bar_controller_impl.h", + "location_bar_controller_impl.mm", "omnibox_popup_material_row.h", "omnibox_popup_material_row.mm", "omnibox_popup_material_view_controller.h", @@ -88,6 +87,7 @@ source_set("omnibox_internal") { "//ios/chrome/browser/ui/popup_menu", "//ios/chrome/common", "//ios/public/provider/chrome/browser", + "//ios/shared/chrome/browser/ui/omnibox", "//ios/third_party/material_components_ios", "//ios/third_party/material_roboto_font_loader_ios", "//ios/web", diff --git a/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn b/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn index 98b99f7992a..082cc1e540b 100644 --- a/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/overscroll_actions/BUILD.gn @@ -32,6 +32,8 @@ source_set("overscroll_actions") { sources = [ "overscroll_actions_controller.h", "overscroll_actions_controller.mm", + "overscroll_actions_gesture_recognizer.h", + "overscroll_actions_gesture_recognizer.mm", "overscroll_actions_view.h", "overscroll_actions_view.mm", ] diff --git a/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn b/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn index 20213622aca..1eb05b7b2da 100644 --- a/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/qr_scanner/BUILD.gn @@ -20,6 +20,7 @@ bundle_data("assets") { } source_set("qr_scanner") { + configs += [ "//build/config/compiler:enable_arc" ] sources = [ "camera_controller.h", "camera_controller.mm", @@ -71,6 +72,7 @@ source_set("eg_tests") { "//ios/chrome/test/app:test_support", "//ios/chrome/test/base", "//ios/chrome/test/earl_grey:test_support", + "//ios/shared/chrome/browser/ui/omnibox", "//ios/testing/earl_grey:earl_grey_support", "//ios/third_party/earl_grey", "//ios/web:test_support", diff --git a/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn b/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn index 185dbe10a97..44051112fcb 100644 --- a/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/reading_list/BUILD.gn @@ -39,6 +39,7 @@ source_set("reading_list") { "reading_list_collection_view_controller.mm", "reading_list_collection_view_item.h", "reading_list_collection_view_item.mm", + "reading_list_collection_view_item_accessibility_delegate.h", "reading_list_coordinator.h", "reading_list_coordinator.mm", "reading_list_empty_collection_background.h", @@ -50,6 +51,8 @@ source_set("reading_list") { "reading_list_side_swipe_provider.mm", "reading_list_toolbar.h", "reading_list_toolbar.mm", + "reading_list_utils.h", + "reading_list_utils.mm", "reading_list_view_controller.h", "reading_list_view_controller.mm", ] @@ -58,6 +61,7 @@ source_set("reading_list") { "//base", "//components/prefs", "//components/reading_list/core", + "//components/reading_list/ios", "//components/strings", "//components/url_formatter", "//ios/chrome/app/strings", @@ -70,6 +74,8 @@ source_set("reading_list") { "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/collection_view/cells", "//ios/chrome/browser/ui/colors", + "//ios/chrome/browser/ui/favicon", + "//ios/chrome/browser/ui/favicon:favicon_ui", "//ios/chrome/browser/ui/keyboard", "//ios/chrome/browser/ui/material_components", "//ios/chrome/browser/ui/side_swipe", @@ -79,13 +85,13 @@ source_set("reading_list") { "//ios/third_party/material_components_ios", "//ios/third_party/material_roboto_font_loader_ios", "//ios/web", + "//ios/web:reload_type", "//net", "//ui/base", "//ui/strings", "//url", ] public_deps = [ - "//components/reading_list/ios", "//ios/chrome/browser/ui/collection_view", ] allow_circular_includes_from = [ "//ios/chrome/browser/ui/side_swipe" ] @@ -105,7 +111,7 @@ source_set("unit_tests") { "//components/favicon/core", "//components/favicon/core/test:test_support", "//components/prefs", - "//components/reading_list/ios", + "//components/reading_list/core", "//components/url_formatter", "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/favicon", @@ -130,16 +136,23 @@ source_set("eg_tests") { deps = [ ":reading_list", "//base", - "//components/reading_list/ios", + "//base/test:test_support", + "//components/reading_list/core", "//ios/chrome/app/strings", + "//ios/chrome/app/theme:theme_grit", "//ios/chrome/browser/reading_list", + "//ios/chrome/browser/ui:ui", "//ios/chrome/browser/ui/commands", "//ios/chrome/test/app:test_support", "//ios/chrome/test/earl_grey:test_support", "//ios/testing:ios_test_support", + "//ios/testing/earl_grey:earl_grey_support", "//ios/third_party/earl_grey", "//ios/third_party/material_components_ios", + "//ios/web", + "//ios/web:reload_type", "//ios/web:test_support", + "//net", ] libs = [ "UIKit.framework", diff --git a/chromium/ios/chrome/browser/ui/sad_tab/BUILD.gn b/chromium/ios/chrome/browser/ui/sad_tab/BUILD.gn index 7b92411f59e..c5bd5f0e74d 100644 --- a/chromium/ios/chrome/browser/ui/sad_tab/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/sad_tab/BUILD.gn @@ -3,6 +3,7 @@ # found in the LICENSE file. source_set("sad_tab") { + configs += [ "//build/config/compiler:enable_arc" ] sources = [ "sad_tab_view.h", "sad_tab_view.mm", diff --git a/chromium/ios/chrome/browser/ui/settings/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/BUILD.gn index 74e62dd658a..a6d34268b6c 100644 --- a/chromium/ios/chrome/browser/ui/settings/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/BUILD.gn @@ -25,7 +25,8 @@ bundle_data("resources") { ] } -source_set("settings") { +source_set("settings_arc") { + configs += [ "//build/config/compiler:enable_arc" ] sources = [ "about_chrome_collection_view_controller.h", "about_chrome_collection_view_controller.mm", @@ -35,8 +36,7 @@ source_set("settings") { "autofill_collection_view_controller.mm", "autofill_credit_card_edit_collection_view_controller.h", "autofill_credit_card_edit_collection_view_controller.mm", - "autofill_edit_accessory_view.h", - "autofill_edit_accessory_view.mm", + "autofill_edit_collection_view_controller+protected.h", "autofill_edit_collection_view_controller.h", "autofill_edit_collection_view_controller.mm", "autofill_profile_edit_collection_view_controller.h", @@ -70,6 +70,106 @@ source_set("settings") { "password_details_collection_view_controller.mm", "physical_web_collection_view_controller.h", "physical_web_collection_view_controller.mm", + ] + deps = [ + ":resources", + "//base", + "//base:i18n", + "//components/autofill/core/browser", + "//components/autofill/core/common", + "//components/autofill/ios/browser", + "//components/browser_sync", + "//components/browsing_data/core", + "//components/content_settings/core/browser", + "//components/content_settings/core/common", + "//components/google/core/browser", + "//components/handoff", + "//components/history/core/browser", + "//components/image_fetcher/ios", + "//components/keyed_service/core", + "//components/metrics", + "//components/password_manager/core/browser", + "//components/password_manager/core/common", + "//components/physical_web/data_source", + "//components/prefs", + "//components/resources", + "//components/search_engines", + "//components/signin/core/browser", + "//components/signin/core/common", + "//components/signin/ios/browser", + "//components/strings", + "//components/sync", + "//components/translate/core/browser", + "//components/translate/core/common", + "//components/url_formatter", + "//components/version_info", + "//ios/chrome/app/strings", + "//ios/chrome/browser", + "//ios/chrome/browser/autofill", + "//ios/chrome/browser/autofill:autofill_internal", + "//ios/chrome/browser/browser_state", + "//ios/chrome/browser/browser_state:browser_state_impl", + "//ios/chrome/browser/browsing_data", + "//ios/chrome/browser/content_settings", + "//ios/chrome/browser/history", + "//ios/chrome/browser/native_app_launcher:native_app_launcher_internal", + "//ios/chrome/browser/passwords", + "//ios/chrome/browser/payments/cells", + "//ios/chrome/browser/physical_web", + "//ios/chrome/browser/prefs", + "//ios/chrome/browser/search_engines", + "//ios/chrome/browser/signin", + "//ios/chrome/browser/store_kit", + "//ios/chrome/browser/sync", + "//ios/chrome/browser/translate", + "//ios/chrome/browser/ui", + "//ios/chrome/browser/ui/alert_coordinator", + "//ios/chrome/browser/ui/authentication", + "//ios/chrome/browser/ui/authentication:authentication_arc", + "//ios/chrome/browser/ui/authentication:authentication_ui", + "//ios/chrome/browser/ui/autofill", + "//ios/chrome/browser/ui/autofill:autofill_ui", + "//ios/chrome/browser/ui/autofill/cells", + "//ios/chrome/browser/ui/collection_view", + "//ios/chrome/browser/ui/colors", + "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/content_suggestions/cells", + "//ios/chrome/browser/ui/contextual_search", + "//ios/chrome/browser/ui/icons", + "//ios/chrome/browser/ui/keyboard", + "//ios/chrome/browser/ui/material_components", + "//ios/chrome/browser/ui/settings/cells", + "//ios/chrome/browser/ui/settings/utils", + "//ios/chrome/browser/ui/sync", + "//ios/chrome/browser/voice", + "//ios/chrome/common", + "//ios/public/provider/chrome/browser", + "//ios/public/provider/chrome/browser/images", + "//ios/public/provider/chrome/browser/native_app_launcher", + "//ios/public/provider/chrome/browser/signin", + "//ios/public/provider/chrome/browser/user_feedback", + "//ios/public/provider/chrome/browser/voice", + "//ios/third_party/material_components_ios", + "//ios/third_party/material_roboto_font_loader_ios", + "//ios/web", + "//net", + "//ui/base", + "//url", + ] + public_deps = [ + "//ios/chrome/browser/ui/collection_view/cells", + ] + allow_circular_includes_from = [ "//ios/chrome/browser/ui/authentication" ] + libs = [ + "CoreLocation.framework", + "LocalAuthentication.framework", + "StoreKit.framework", + "UIKit.framework", + ] +} + +source_set("settings") { + sources = [ "privacy_collection_view_controller.h", "privacy_collection_view_controller.mm", "reauthentication_module.h", @@ -150,15 +250,21 @@ source_set("settings") { "//ios/chrome/browser/prefs", "//ios/chrome/browser/search_engines", "//ios/chrome/browser/signin", + "//ios/chrome/browser/store_kit", "//ios/chrome/browser/sync", "//ios/chrome/browser/translate", "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/alert_coordinator", "//ios/chrome/browser/ui/authentication", + "//ios/chrome/browser/ui/authentication:authentication_arc", + "//ios/chrome/browser/ui/authentication:authentication_ui", + "//ios/chrome/browser/ui/autofill", + "//ios/chrome/browser/ui/autofill:autofill_ui", "//ios/chrome/browser/ui/autofill/cells", "//ios/chrome/browser/ui/collection_view", "//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/commands", + "//ios/chrome/browser/ui/content_suggestions/cells", "//ios/chrome/browser/ui/contextual_search", "//ios/chrome/browser/ui/icons", "//ios/chrome/browser/ui/keyboard", @@ -182,9 +288,13 @@ source_set("settings") { "//url", ] public_deps = [ + ":settings_arc", "//ios/chrome/browser/ui/collection_view/cells", ] - allow_circular_includes_from = [ "//ios/chrome/browser/ui/authentication" ] + allow_circular_includes_from = [ + "//ios/chrome/browser/ui/authentication", + ":settings_arc", + ] libs = [ "CoreLocation.framework", "LocalAuthentication.framework", @@ -218,6 +328,7 @@ source_set("test_support") { "//ios/chrome/browser/prefs:browser_prefs", "//ios/chrome/browser/signin", "//ios/chrome/browser/signin:test_support", + "//ios/chrome/browser/store_kit", "//ios/chrome/browser/sync", "//ios/chrome/browser/sync:test_support", "//ios/chrome/browser/ui/collection_view:test_support", @@ -228,6 +339,7 @@ source_set("test_support") { } source_set("unit_tests") { + configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ "about_chrome_collection_view_controller_unittest.mm", @@ -325,6 +437,7 @@ source_set("unit_tests") { } source_set("eg_tests") { + configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ "accounts_collection_egtest.mm", diff --git a/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn index 74d8d7c52ff..de546429071 100644 --- a/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/cells/BUILD.gn @@ -4,14 +4,10 @@ source_set("cells") { sources = [ - "account_control_item.h", - "account_control_item.mm", "account_signin_item.h", "account_signin_item.mm", "autofill_data_item.h", "autofill_data_item.mm", - "autofill_edit_item.h", - "autofill_edit_item.mm", "byo_textfield_item.h", "byo_textfield_item.mm", "card_multiline_item.h", @@ -43,7 +39,6 @@ source_set("cells") { "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/collection_view/cells", "//ios/chrome/browser/ui/colors", - "//ios/third_party/material_components_ios", "//ios/third_party/material_roboto_font_loader_ios", "//ui/base", ] @@ -54,10 +49,8 @@ source_set("cells") { source_set("unit_tests") { testonly = true sources = [ - "account_control_item_unittest.mm", "account_signin_item_unittest.mm", "autofill_data_item_unittest.mm", - "autofill_edit_item_unittest.mm", "byo_textfield_item_unittest.mm", "card_multiline_item_unittest.mm", "copied_to_chrome_item_unittest.mm", @@ -77,8 +70,6 @@ source_set("unit_tests") { "//ios/chrome/app/strings", "//ios/chrome/browser/ui/collection_view/cells", "//ios/chrome/browser/ui/collection_view/cells:test_support", - "//ios/chrome/browser/ui/colors", - "//ios/third_party/material_components_ios", "//testing/gtest", "//ui/base", ] diff --git a/chromium/ios/chrome/browser/ui/settings/utils/BUILD.gn b/chromium/ios/chrome/browser/ui/settings/utils/BUILD.gn index 0a732ce9aaa..37003561327 100644 --- a/chromium/ios/chrome/browser/ui/settings/utils/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/settings/utils/BUILD.gn @@ -10,17 +10,12 @@ source_set("utils") { "observable_boolean.h", "pref_backed_boolean.h", "pref_backed_boolean.mm", - "resized_avatar_cache.h", - "resized_avatar_cache.mm", ] deps = [ "//base", "//components/content_settings/core/browser", "//components/content_settings/core/common", "//components/prefs", - "//ios/chrome/browser/ui", - "//ios/public/provider/chrome/browser", - "//ios/public/provider/chrome/browser/signin", ] } diff --git a/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn b/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn index 1291d8fbb5c..ce315af736c 100644 --- a/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/side_swipe/BUILD.gn @@ -33,7 +33,6 @@ source_set("side_swipe") { ":resources", "//base", "//components/reading_list/core", - "//components/reading_list/ios", "//ios/chrome/app/theme", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", diff --git a/chromium/ios/chrome/browser/ui/stack_view/BUILD.gn b/chromium/ios/chrome/browser/ui/stack_view/BUILD.gn index ffbd7b1f3be..dcf3ca52afb 100644 --- a/chromium/ios/chrome/browser/ui/stack_view/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/stack_view/BUILD.gn @@ -92,6 +92,7 @@ source_set("stack_view") { "//ios/chrome/browser/ui/toolbar", "//ios/chrome/browser/ui/tools_menu", "//ios/chrome/common", + "//ios/shared/chrome/browser/ui/tools_menu", "//ios/third_party/material_components_ios", "//ios/web", "//net", diff --git a/chromium/ios/chrome/browser/ui/tabs/BUILD.gn b/chromium/ios/chrome/browser/ui/tabs/BUILD.gn index a0c2709d4a8..42815008573 100644 --- a/chromium/ios/chrome/browser/ui/tabs/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/tabs/BUILD.gn @@ -12,8 +12,6 @@ bundle_data("resources") { "resources/tabstrip_incognito_background_tab~ipad.png", "resources/tabstrip_incognito_foreground_tab@2x~ipad.png", "resources/tabstrip_incognito_foreground_tab~ipad.png", - "resources/tabstrip_incognito_switch@2x~ipad.png", - "resources/tabstrip_incognito_switch~ipad.png", "resources/tabstrip_new_tab@2x~ipad.png", "resources/tabstrip_new_tab_incognito@2x~ipad.png", "resources/tabstrip_new_tab_incognito_pressed@2x~ipad.png", @@ -22,8 +20,6 @@ bundle_data("resources") { "resources/tabstrip_new_tab_pressed@2x~ipad.png", "resources/tabstrip_new_tab_pressed~ipad.png", "resources/tabstrip_new_tab~ipad.png", - "resources/tabstrip_switch@2x~ipad.png", - "resources/tabstrip_switch~ipad.png", "resources/tabstrip_tab_close@2x~ipad.png", "resources/tabstrip_tab_close_incognito@2x~ipad.png", "resources/tabstrip_tab_close_incognito_pressed@2x~ipad.png", diff --git a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn index e38c075b432..65fe92404af 100644 --- a/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/toolbar/BUILD.gn @@ -94,10 +94,13 @@ source_set("toolbar") { "//ios/chrome/browser/ui/tools_menu", "//ios/chrome/browser/ui/util", "//ios/chrome/browser/ui/voice", + "//ios/chrome/browser/web_state_list", "//ios/chrome/common", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/images", "//ios/public/provider/chrome/browser/voice", + "//ios/shared/chrome/browser/ui/omnibox", + "//ios/shared/chrome/browser/ui/tools_menu", "//ios/third_party/material_components_ios", "//ios/third_party/material_roboto_font_loader_ios", "//ios/web", @@ -166,7 +169,10 @@ source_set("unit_tests") { "//ios/chrome/browser/browser_state:test_support", "//ios/chrome/browser/tabs", "//ios/chrome/browser/ui", + "//ios/chrome/browser/web_state_list", + "//ios/chrome/browser/web_state_list:test_support", "//ios/chrome/test:test_support", + "//ios/shared/chrome/browser/ui/toolbar:test_support", "//ios/testing:ocmock_support", "//ios/web:test_support", "//testing/gtest", diff --git a/chromium/ios/chrome/browser/ui/tools_menu/BUILD.gn b/chromium/ios/chrome/browser/ui/tools_menu/BUILD.gn index 9dcda12ee4b..c522ae6d6d9 100644 --- a/chromium/ios/chrome/browser/ui/tools_menu/BUILD.gn +++ b/chromium/ios/chrome/browser/ui/tools_menu/BUILD.gn @@ -6,8 +6,8 @@ source_set("tools_menu") { sources = [ "reading_list_menu_view_item.h", "reading_list_menu_view_item.mm", - "tools_menu_context.h", - "tools_menu_context.mm", + "tools_menu_constants.h", + "tools_menu_constants.mm", "tools_menu_model.h", "tools_menu_model.mm", "tools_menu_view_controller.h", @@ -22,7 +22,6 @@ source_set("tools_menu") { deps = [ "//base", "//base:i18n", - "//components/reading_list/core", "//components/strings", "//ios/chrome/app/strings", "//ios/chrome/browser", @@ -35,8 +34,10 @@ source_set("tools_menu") { "//ios/chrome/common", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/user_feedback", + "//ios/shared/chrome/browser/ui/tools_menu", "//ios/third_party/material_components_ios", "//ios/third_party/material_roboto_font_loader_ios", + "//ios/web:user_agent", "//ui/base", ] libs = [ @@ -49,11 +50,15 @@ source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ + "tools_menu_view_controller_unittest.mm", "tools_menu_view_item_unittest.mm", ] deps = [ ":tools_menu", "//base", + "//ios/chrome/browser/ui/commands:commands", + "//ios/shared/chrome/browser/ui/tools_menu", + "//ios/web:user_agent", "//testing/gtest", ] } diff --git a/chromium/ios/chrome/browser/web/BUILD.gn b/chromium/ios/chrome/browser/web/BUILD.gn index 8514df5b711..8d13fe496b5 100644 --- a/chromium/ios/chrome/browser/web/BUILD.gn +++ b/chromium/ios/chrome/browser/web/BUILD.gn @@ -9,30 +9,47 @@ source_set("web") { sources = [ "dom_altering_lock.h", "dom_altering_lock.mm", + "navigation_manager_util.h", + "navigation_manager_util.mm", "network_activity_indicator_tab_helper.h", "network_activity_indicator_tab_helper.mm", "repost_form_tab_helper.h", "repost_form_tab_helper.mm", + "sad_tab_tab_helper.h", + "sad_tab_tab_helper.mm", ] deps = [ + ":sad_tab_tab_helper_delegate", "//base", "//components/strings", "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/alert_coordinator:alert_coordinator", + "//ios/chrome/browser/ui/sad_tab:sad_tab", "//ios/chrome/browser/ui/util:util", "//ios/web", + "//ios/web:web_arc", "//ui/base", ] } +source_set("sad_tab_tab_helper_delegate") { + configs += [ "//build/config/compiler:enable_arc" ] + sources = [ + "sad_tab_tab_helper_delegate.h", + ] +} + source_set("unit_tests") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ + "navigation_manager_util_unittest.mm", "network_activity_indicator_tab_helper_unittest.mm", "repost_form_tab_helper_unittest.mm", + "sad_tab_tab_helper_unittest.mm", ] deps = [ + ":sad_tab_tab_helper_delegate", ":web", "//base:base", "//base/test:test_support", @@ -40,8 +57,10 @@ source_set("unit_tests") { "//ios/chrome/browser/ui:ui", "//ios/chrome/test:test_support", "//ios/web:test_support", + "//ios/web:web_arc", "//testing/gtest", "//ui/base:base", + "//url:url", ] } @@ -139,8 +158,11 @@ bundle_data("resources") { ] } -js_compile_unchecked("injected_js") { +js_compile_bundle("chrome_bundle") { + closure_entry_point = "__crWeb.chromeBundle" sources = [ + "resources/chrome_bundle.js", + "resources/payment_request.js", "resources/print.js", ] } @@ -166,7 +188,7 @@ source_set("web_internal") { "print_observer.mm", ] deps = [ - ":injected_js", + ":chrome_bundle", ":resources", "//base", "//components/content_settings/core/browser", @@ -185,6 +207,7 @@ source_set("web_internal") { "//ios/chrome/browser/content_settings", "//ios/chrome/browser/infobars", "//ios/chrome/browser/ssl", + "//ios/chrome/browser/tabs", "//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/overscroll_actions", "//ios/chrome/browser/ui/static_content", @@ -270,6 +293,7 @@ source_set("eg_tests") { "//components/content_settings/core/browser", "//components/content_settings/core/common", "//components/strings", + "//components/version_info:version_info", "//ios/chrome/app/strings", "//ios/chrome/browser", "//ios/chrome/browser/browser_state", diff --git a/chromium/ios/chrome/browser/web_state_list/BUILD.gn b/chromium/ios/chrome/browser/web_state_list/BUILD.gn new file mode 100644 index 00000000000..7ddb1ae6959 --- /dev/null +++ b/chromium/ios/chrome/browser/web_state_list/BUILD.gn @@ -0,0 +1,70 @@ +# 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("web_state_list") { + sources = [ + "web_state_list.h", + "web_state_list.mm", + "web_state_list_delegate.h", + "web_state_list_fast_enumeration_helper.h", + "web_state_list_fast_enumeration_helper.mm", + "web_state_list_metrics_observer.h", + "web_state_list_metrics_observer.mm", + "web_state_list_observer.h", + "web_state_list_observer.mm", + "web_state_list_observer_bridge.h", + "web_state_list_observer_bridge.mm", + "web_state_list_order_controller.h", + "web_state_list_order_controller.mm", + "web_state_list_serialization.h", + "web_state_list_serialization.mm", + "web_state_opener.h", + "web_state_opener.mm", + ] + deps = [ + "//base", + "//ios/chrome/browser/sessions:serialisation", + "//ios/web", + "//ui/base", + ] + libs = [ "Foundation.framework" ] + configs += [ "//build/config/compiler:enable_arc" ] +} + +source_set("test_support") { + testonly = true + sources = [ + "fake_web_state_list_delegate.h", + "fake_web_state_list_delegate.mm", + ] + deps = [ + ":web_state_list", + "//base", + ] + configs += [ "//build/config/compiler:enable_arc" ] +} + +source_set("unit_tests") { + testonly = true + sources = [ + "web_state_list_fast_enumeration_helper_unittest.mm", + "web_state_list_order_controller_unittest.mm", + "web_state_list_serialization_unittest.mm", + "web_state_list_unittest.mm", + "web_state_opener_unittest.mm", + ] + deps = [ + ":test_support", + ":web_state_list", + "//base", + "//ios/chrome/browser/sessions:serialisation", + "//ios/web", + "//ios/web:test_support", + "//net", + "//testing/gtest", + "//ui/base", + "//url", + ] + configs += [ "//build/config/compiler:enable_arc" ] +} diff --git a/chromium/ios/chrome/share_extension/strings/BUILD.gn b/chromium/ios/chrome/share_extension/strings/BUILD.gn index 6c66a02246b..2fcdb5d6f6a 100644 --- a/chromium/ios/chrome/share_extension/strings/BUILD.gn +++ b/chromium/ios/chrome/share_extension/strings/BUILD.gn @@ -8,7 +8,6 @@ import("//tools/grit/grit_rule.gni") grit("strings") { source = "ios_share_extension_strings.grd" output_dir = "$root_gen_dir/ios/share_extension" - use_qualified_include = true outputs = [ "grit/ios_share_extension_strings.h", ] diff --git a/chromium/ios/chrome/test/BUILD.gn b/chromium/ios/chrome/test/BUILD.gn index cadef7b796e..2f986dd22f8 100644 --- a/chromium/ios/chrome/test/BUILD.gn +++ b/chromium/ios/chrome/test/BUILD.gn @@ -136,7 +136,7 @@ test("ios_chrome_unittests") { "//ios/chrome/browser/signin:unit_tests", "//ios/chrome/browser/snapshots:unit_tests", "//ios/chrome/browser/ssl:unit_tests", - "//ios/chrome/browser/suggestions:unit_tests", + "//ios/chrome/browser/store_kit:unit_tests", "//ios/chrome/browser/sync:unit_tests", "//ios/chrome/browser/tabs:unit_tests", "//ios/chrome/browser/translate:unit_tests", @@ -152,6 +152,8 @@ test("ios_chrome_unittests") { "//ios/chrome/browser/ui/collection_view/cells:unit_tests", "//ios/chrome/browser/ui/commands:unit_tests", "//ios/chrome/browser/ui/content_suggestions:unit_tests", + "//ios/chrome/browser/ui/content_suggestions/cells:unit_tests", + "//ios/chrome/browser/ui/content_suggestions/identifier:unit_tests", "//ios/chrome/browser/ui/context_menu:unit_tests", "//ios/chrome/browser/ui/contextual_search:unit_tests", "//ios/chrome/browser/ui/dialogs:unit_tests", @@ -185,9 +187,12 @@ test("ios_chrome_unittests") { "//ios/chrome/browser/web:unit_tests", "//ios/chrome/browser/web:unit_tests_internal", "//ios/chrome/browser/web_resource:unit_tests", + "//ios/chrome/browser/web_state_list:unit_tests", "//ios/chrome/common:unit_tests", "//ios/chrome/test/base:unit_tests", - "//ios/shared/chrome/browser/tabs:unit_tests", + "//ios/shared/chrome/browser/ui/browser_list:unit_tests", + "//ios/shared/chrome/browser/ui/commands:unit_tests", + "//ios/shared/chrome/browser/ui/coordinators:unit_tests", ] assert_no_deps = ios_assert_no_deps diff --git a/chromium/ios/chrome/test/app/BUILD.gn b/chromium/ios/chrome/test/app/BUILD.gn index c3a011be39f..b1c07a69804 100644 --- a/chromium/ios/chrome/test/app/BUILD.gn +++ b/chromium/ios/chrome/test/app/BUILD.gn @@ -21,6 +21,8 @@ source_set("test_support") { "signin_test_util.mm", "stack_view_test_util.h", "stack_view_test_util.mm", + "static_html_view_test_util.h", + "static_html_view_test_util.mm", "sync_test_util.h", "sync_test_util.mm", "tab_test_util.h", @@ -67,6 +69,7 @@ source_set("test_support") { "//ios/chrome/browser/ui/main", "//ios/chrome/browser/ui/ntp:ntp_internal", "//ios/chrome/browser/ui/stack_view", + "//ios/chrome/browser/ui/static_content", "//ios/chrome/browser/ui/tabs", "//ios/public/provider/chrome/browser", "//ios/public/provider/chrome/browser/signin:test_support", diff --git a/chromium/ios/chrome/test/earl_grey/BUILD.gn b/chromium/ios/chrome/test/earl_grey/BUILD.gn index 3f1c658a1f5..6e186a98cac 100644 --- a/chromium/ios/chrome/test/earl_grey/BUILD.gn +++ b/chromium/ios/chrome/test/earl_grey/BUILD.gn @@ -8,6 +8,7 @@ group("all_tests") { testonly = true deps = [ ":ios_chrome_device_check_egtests", + ":ios_chrome_external_url_egtests", ":ios_chrome_flaky_egtests", ":ios_chrome_integration_egtests", ":ios_chrome_multitasking_egtests", @@ -135,6 +136,12 @@ chrome_ios_eg_test("ios_chrome_smoke_egtests") { libs = [ "XCTest.framework" ] } +chrome_ios_eg_test("ios_chrome_external_url_egtests") { + deps = [ + "//ios/chrome/browser/metrics:external_url_eg_tests", + ] +} + source_set("test_support") { configs += [ "//build/config/compiler:enable_arc" ] testonly = true @@ -153,8 +160,6 @@ source_set("test_support") { "chrome_matchers.mm", "chrome_test_case.h", "chrome_test_case.mm", - "chrome_util.h", - "chrome_util.mm", ] deps = [ @@ -164,17 +169,20 @@ source_set("test_support") { "//ios/chrome/app/strings", "//ios/chrome/browser/ui", "//ios/chrome/browser/ui/collection_view/cells", + "//ios/chrome/browser/ui/commands:commands", "//ios/chrome/browser/ui/omnibox:omnibox_internal", "//ios/chrome/browser/ui/static_content", "//ios/chrome/browser/ui/toolbar", "//ios/chrome/browser/ui/tools_menu", "//ios/chrome/test/app:test_support", "//ios/testing:ios_test_support", + "//ios/testing/earl_grey:earl_grey_support", "//ios/third_party/material_components_ios", "//ios/web", "//ios/web:earl_grey_test_support", "//ios/web:test_support", "//ui/base", + "//ui/base:test_support", "//url", ] diff --git a/chromium/ios/chrome/today_extension/strings/BUILD.gn b/chromium/ios/chrome/today_extension/strings/BUILD.gn index 99fa95471ed..4269cc6f730 100644 --- a/chromium/ios/chrome/today_extension/strings/BUILD.gn +++ b/chromium/ios/chrome/today_extension/strings/BUILD.gn @@ -8,7 +8,6 @@ import("//tools/grit/grit_rule.gni") grit("strings") { source = "ios_today_extension_strings.grd" output_dir = "$root_gen_dir/ios/today_extension" - use_qualified_include = true outputs = [ "grit/ios_today_extension_strings.h", ] diff --git a/chromium/ios/chrome/widget_extension/BUILD.gn b/chromium/ios/chrome/widget_extension/BUILD.gn index 7fbc32a6fc8..31fed23e3cb 100644 --- a/chromium/ios/chrome/widget_extension/BUILD.gn +++ b/chromium/ios/chrome/widget_extension/BUILD.gn @@ -29,7 +29,7 @@ ios_appex_bundle("widget_extension") { deps = [ "//base", - "//base:i18n", + "//components/open_from_clipboard:open_from_clipboard_impl", "//components/prefs", "//components/variations", "//components/version_info", @@ -41,7 +41,6 @@ ios_appex_bundle("widget_extension") { "//ios/third_party/material_components_ios", "//net", "//ui/base", - "//url", ] libs = [ |