From 7bb67f072c7f5b30c8171bf2059fd4f6fef19735 Mon Sep 17 00:00:00 2001
From: Gauthier Ambard <gambard@chromium.org>
Date: Fri, 28 Mar 2025 01:31:22 -0700
Subject: [PATCH] [iOS] Remove all references to ios/c/b/ui
The folder has been cleaned up. This CL removes the last elements in it
and all references to it.
Fixed: 40223315, 40259387
Change-Id: I2fd16e6b032ddb5043e2afe5300eb4f3dc92c06c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6400853
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: Rohit Rao <rohitrao@chromium.org>
Reviewed-by: Camille Lamy <clamy@chromium.org>
Reviewed-by: Robbie Gibson <rkgibson@google.com>
Reviewed-by: Dirk Pranke <dpranke@google.com>
Commit-Queue: Gauthier Ambard <gambard@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1439265}
---
WATCHLISTS | 11 +-
.../family_link_settings_state_management.h | 2 +-
content/browser/ukm_internals_ui.cc | 2 +-
ios/PRESUBMIT_test.py | 3 +-
ios/chrome/browser/DEPS | 10 -
ios/chrome/browser/autofill/ui_bundled/DEPS | 1 -
ios/chrome/browser/bookmarks/ui_bundled/DEPS | 1 -
ios/chrome/browser/browser_state/model/DEPS | 1 -
.../browser/browser_view/ui_bundled/DEPS | 1 -
.../content_suggestions/ui_bundled/DEPS | 1 -
.../browser/context_menu/ui_bundled/DEPS | 1 -
ios/chrome/browser/flags/DEPS | 3 -
ios/chrome/browser/main/model/DEPS | 4 -
ios/chrome/browser/main/ui_bundled/DEPS | 1 -
.../model/public/web_content_area/DEPS | 7 -
ios/chrome/browser/passwords/model/DEPS | 3 -
ios/chrome/browser/popup_menu/ui_bundled/DEPS | 2 -
.../browser/promos_manager/ui_bundled/DEPS | 1 -
ios/chrome/browser/safe_mode/ui_bundled/DEPS | 1 -
.../search_engine_choice/ui_bundled/DEPS | 1 -
.../ui_bundled/downloads/save_to_photos/DEPS | 3 -
ios/chrome/browser/shared/model/prefs/DEPS | 1 -
ios/chrome/browser/shared/public/DEPS | 3 -
ios/chrome/browser/shared/ui/DEPS | 3 -
.../shared/ui/util/terms_util_unittest.mm | 3 +-
.../browser/tab_switcher/ui_bundled/DEPS | 2 -
ios/chrome/browser/ui/DEPS | 18 -
ios/chrome/browser/ui/OWNERS | 6 -
ios/chrome/browser/ui/omnibox/BUILD.gn | 383 ------------------
ios/chrome/browser/ui/omnibox/DEPS | 13 -
ios/chrome/browser/ui/toolbar/DEPS | 16 -
ios/chrome/browser/url_loading/model/DEPS | 1 -
ios/chrome/browser/web/model/DEPS | 3 -
ios/chrome/content_widget_extension/DEPS | 1 -
ios/chrome/search_widget_extension/DEPS | 1 -
.../metrics/histograms/metadata/ios/enums.xml | 2 +-
tools/whats_new/OWNERS | 2 +-
tools/whats_new/whats_new_util.py | 31 +-
38 files changed, 28 insertions(+), 521 deletions(-)
delete mode 100644 ios/chrome/browser/settings/ui_bundled/downloads/save_to_photos/DEPS
delete mode 100644 ios/chrome/browser/ui/DEPS
delete mode 100644 ios/chrome/browser/ui/OWNERS
delete mode 100644 ios/chrome/browser/ui/omnibox/BUILD.gn
delete mode 100644 ios/chrome/browser/ui/omnibox/DEPS
delete mode 100644 ios/chrome/browser/ui/toolbar/DEPS
diff --git a/WATCHLISTS b/WATCHLISTS
index 655ce49a72851..a1feae6f95105 100644
--- a/WATCHLISTS
+++ b/WATCHLISTS
@@ -1396,7 +1396,7 @@
'ios/chrome/browser/resources/Settings.bundle/Experimental\.plist',
},
'ios_ntp': {
- 'filepath': 'ios/chrome/browser/ui/ntp/',
+ 'filepath': 'ios/chrome/browser/ntp/',
},
'ios_payments_autofill': {
'filepath': 'ios/chrome/browser/autofill/ui_bundled/ios_chrome_payments'\
@@ -1415,9 +1415,8 @@
'components/password_manager/ios|'\
'ios/chrome/browser/autofill|'\
'ios/chrome/browser/passwords|'\
- 'ios/chrome/browser/ui/passwords|'\
- 'ios/chrome/browser/ui/settings/autofill|'\
- 'ios/chrome/browser/ui/settings/password',
+ 'ios/chrome/browser/settings/ui_bundled/autofill|'\
+ 'ios/chrome/browser/settings/ui_bundled/password',
},
'ios_web': {
'filepath': 'ios/web(_view)?/',
@@ -1804,7 +1803,7 @@
'|chrome/browser/ui/.*/page_info/'\
'|chrome/android/java/src/org/chromium/chrome/browser/page_info/'\
'|components/page_info_strings.grdp'\
- '|ios/chrome/browser/ui/page_info/'
+ '|ios/chrome/browser/page_info/'
},
'page_load_metrics' : {
'filepath': '/page_load_metrics/'
@@ -1847,7 +1846,6 @@
'|content/browser/payments'\
'|content/test/data/payments'\
'|ios/chrome/browser/payments'\
- '|ios/chrome/browser/ui/payments'\
'|ios/web/payments'\
'|ios/web/public/payments'\
'|third_party/blink/web_tests/external/wpt/payment-request'\
@@ -2284,7 +2282,6 @@
'components/translate|'\
'components/translate_strings_grdp|'\
'ios/chrome/browser/translate|'\
- 'ios/chrome/browser/ui/translate|'\
'ios/web_view/internal/translate'
},
'turtledove': {
diff --git a/components/supervised_user/test_support/family_link_settings_state_management.h b/components/supervised_user/test_support/family_link_settings_state_management.h
index baa14d72c21fd..2f4e0e2f65a6d 100644
--- a/components/supervised_user/test_support/family_link_settings_state_management.h
+++ b/components/supervised_user/test_support/family_link_settings_state_management.h
@@ -155,7 +155,7 @@ class FamilyLinkSettingsState {
// Sets the Advanced Setting toggles (Permissions, Extensions, Cookies) to
// their default values.
static FamilyLinkSettingsState SetAdvancedSettingsDefault();
- // LINT.ThenChange(/ios/chrome/browser/ui/settings/supervised_user_family_link_app_interface.mm:TestFamilyLinkFamilyLinkSettingsStateHelper)
+ // LINT.ThenChange(/ios/chrome/browser/settings/ui_bundled/supervised_user_family_link_app_interface.mm)
// After issuing, Permissions, Extensions and Cookies toggles are set to the
// given values, if such a value is provided on the input list.
static FamilyLinkSettingsState AdvancedSettingsToggles(
diff --git a/content/browser/ukm_internals_ui.cc b/content/browser/ukm_internals_ui.cc
index c481ae5d5a6df..e8cae429cb796 100644
--- a/content/browser/ukm_internals_ui.cc
+++ b/content/browser/ukm_internals_ui.cc
@@ -92,7 +92,7 @@ void UkmMessageHandler::RegisterMessages() {
} // namespace
// Changes to this class should be in sync with its iOS equivalent
-// ios/chrome/browser/ui/webui/ukm_internals_ui.mm
+// ios/chrome/browser/webui/ui_bundled/ukm_internals_ui.mm
UkmInternalsUI::UkmInternalsUI(WebUI* web_ui) : WebUIController(web_ui) {
ukm::UkmService* ukm_service = GetContentClient()->browser()->GetUkmService();
web_ui->AddMessageHandler(std::make_unique<UkmMessageHandler>(ukm_service));
diff --git a/ios/PRESUBMIT_test.py b/ios/PRESUBMIT_test.py
index 6d0e20845b71d..ce5c443917686 100755
--- a/ios/PRESUBMIT_test.py
+++ b/ios/PRESUBMIT_test.py
@@ -316,7 +316,8 @@ class CheckNewColorIntroductionTest(unittest.TestCase):
'test_file.json', [],
action='A'),
PRESUBMIT_test_mocks.MockFile(
- 'ios/chrome/browser/ui/colors/test_file.mm', [], action='M')
+ 'ios/chrome/browser/colors/ui_bundled/test_file.mm', [],
+ action='M')
]
results = PRESUBMIT._CheckNewColorIntroduction(self.mock_input,
self.mock_output)
diff --git a/ios/chrome/browser/DEPS b/ios/chrome/browser/DEPS
index 80383b6ae4d1d..093d252ef7569 100644
--- a/ios/chrome/browser/DEPS
+++ b/ios/chrome/browser/DEPS
@@ -182,11 +182,6 @@ include_rules = [
"+ios/chrome/browser/shared/ui",
"+ios/chrome/browser/shared/public",
- # ios/chrome/browser should not depend on ios/chrome/browser/ui except
- # on commands.
- "-ios/chrome/browser/ui",
- "-ios/common/ui",
- "+ios/chrome/browser/ui/commands",
"+ios/chrome/browser/keyboard/ui_bundled/UIKeyCommand+Chrome.h",
# For tests.
@@ -202,17 +197,12 @@ include_rules = [
# Temporary, remove when upstream updated
"+ios/chrome/browser/popup_menu/ui_bundled/popup_menu_constants.h",
- "+ios/chrome/browser/ui/page_info/features.h",
- "+ios/chrome/browser/ui/page_info/page_info_app_interface.h",
]
specific_include_rules = {
".*test\.mm": [
"+components/signin/internal/identity_manager/account_capabilities_constants.h",
"+components/previous_session_info/previous_session_info_private.h",
- # TODO(crbug.com/40820398): browser should not depend on UI, this is a
- # blanket exception for tests.
- "+ios/chrome/browser/ui",
# Use ios/chrome/browser/authentication/ui_bundled/signin_earl_grey.h instead
"-ios/chrome/browser/authentication/ui_bundled/signin_earl_grey_app_interface.h",
# use ios/chrome/browser/bookmarks/ui_bundled/bookmark_earl_grey.h instead
diff --git a/ios/chrome/browser/autofill/ui_bundled/DEPS b/ios/chrome/browser/autofill/ui_bundled/DEPS
index 95ff147e1f449..4ac94e50133b5 100644
--- a/ios/chrome/browser/autofill/ui_bundled/DEPS
+++ b/ios/chrome/browser/autofill/ui_bundled/DEPS
@@ -13,7 +13,6 @@ include_rules = [
"+ios/chrome/browser/settings/ui_bundled/autofill/autofill_constants.h",
"+ios/chrome/browser/settings/ui_bundled/autofill/autofill_settings_profile_edit_table_view_controller_delegate.h",
"+ios/chrome/browser/settings/ui_bundled/password",
- "+ios/chrome/browser/ui/alert_view",
"+ios/chrome/browser/webdata_services/model/web_data_service_factory.h",
]
diff --git a/ios/chrome/browser/bookmarks/ui_bundled/DEPS b/ios/chrome/browser/bookmarks/ui_bundled/DEPS
index e123a27452180..fb32dec282af7 100644
--- a/ios/chrome/browser/bookmarks/ui_bundled/DEPS
+++ b/ios/chrome/browser/bookmarks/ui_bundled/DEPS
@@ -2,7 +2,6 @@ include_rules = [
"+ios/chrome/browser/signin/model",
"+ios/chrome/browser/sync/model",
"+ios/chrome/browser/authentication/ui_bundled",
- "+ios/chrome/browser/ui/legacy_bookmarks",
"+ios/chrome/browser/popup_menu/ui_bundled/popup_menu_constants.h",
"+ios/chrome/browser/keyboard/ui_bundled",
"+ios/chrome/browser/incognito_reauth/ui_bundled",
diff --git a/ios/chrome/browser/browser_state/model/DEPS b/ios/chrome/browser/browser_state/model/DEPS
index e4d643ba61cee..7e7414c0f4989 100644
--- a/ios/chrome/browser/browser_state/model/DEPS
+++ b/ios/chrome/browser/browser_state/model/DEPS
@@ -22,7 +22,6 @@ specific_include_rules = {
# TODO(crbug.com/40820398): Remove this dependency.
"^browser_state_keyed_service_factories.mm": [
"+ios/chrome/browser",
- "-ios/chrome/browser/ui",
"+ios/chrome/browser/voice/ui_bundled/text_to_speech_playback_controller_factory.h",
],
}
diff --git a/ios/chrome/browser/browser_view/ui_bundled/DEPS b/ios/chrome/browser/browser_view/ui_bundled/DEPS
index d4ffd2f66f62d..48ec96c9030a3 100644
--- a/ios/chrome/browser/browser_view/ui_bundled/DEPS
+++ b/ios/chrome/browser/browser_view/ui_bundled/DEPS
@@ -102,7 +102,6 @@ include_rules = [
"+ios/chrome/browser/tips_notifications/coordinator",
"+ios/chrome/browser/toolbar/ui_bundled",
"+ios/chrome/browser/translate/model/chrome_ios_translate_client.h",
- "+ios/chrome/browser/ui",
"+ios/chrome/browser/page_info/ui_bundled",
"+ios/chrome/browser/unit_conversion/ui_bundled/unit_conversion_coordinator.h",
"+ios/chrome/browser/url_loading/model",
diff --git a/ios/chrome/browser/content_suggestions/ui_bundled/DEPS b/ios/chrome/browser/content_suggestions/ui_bundled/DEPS
index dceda6fb027c2..0669d4f200bf7 100644
--- a/ios/chrome/browser/content_suggestions/ui_bundled/DEPS
+++ b/ios/chrome/browser/content_suggestions/ui_bundled/DEPS
@@ -14,7 +14,6 @@ include_rules = [
"+ios/chrome/browser/lens/ui_bundled",
"+ios/chrome/browser/location_bar/ui_bundled/location_bar_constants.h",
"+ios/chrome/browser/start_surface/ui_bundled",
- "+ios/chrome/browser/ui/whats_new/whats_new_util.h",
"+ios/chrome/browser/toolbar/ui_bundled/public",
"+ios/chrome/browser/push_notification/ui_bundled",
"+ios/chrome/browser/ntp/model/set_up_list_item_type.h",
diff --git a/ios/chrome/browser/context_menu/ui_bundled/DEPS b/ios/chrome/browser/context_menu/ui_bundled/DEPS
index ce0431701f4f4..4430112a7c30a 100644
--- a/ios/chrome/browser/context_menu/ui_bundled/DEPS
+++ b/ios/chrome/browser/context_menu/ui_bundled/DEPS
@@ -6,7 +6,6 @@ include_rules = [
"+ios/chrome/browser/policy/model/policy_util.h",
"+ios/chrome/browser/reading_list/model/reading_list_browser_agent.h",
"+ios/chrome/browser/search_engines/model",
- "+ios/chrome/browser/ui/image_util",
"+ios/chrome/browser/incognito_reauth/ui_bundled",
"+ios/chrome/browser/lens/ui_bundled/lens_availability.h",
"+ios/chrome/browser/lens/ui_bundled/lens_entrypoint.h",
diff --git a/ios/chrome/browser/flags/DEPS b/ios/chrome/browser/flags/DEPS
index f525aabecf0c9..b953d03971be3 100644
--- a/ios/chrome/browser/flags/DEPS
+++ b/ios/chrome/browser/flags/DEPS
@@ -14,8 +14,5 @@ specific_include_rules = {
"+ios/chrome/browser/first_run/ui_bundled",
"+ios/chrome/browser/ntp/ui_bundled",
],
- "^system_flags.mm": [
- "+ios/chrome/browser/ui/ui_feature_flags.h",
- ]
}
diff --git a/ios/chrome/browser/main/model/DEPS b/ios/chrome/browser/main/model/DEPS
index 8bdcb4e10f5fc..53e6b2103a0be 100644
--- a/ios/chrome/browser/main/model/DEPS
+++ b/ios/chrome/browser/main/model/DEPS
@@ -42,12 +42,8 @@ specific_include_rules = {
"+ios/chrome/browser/web_state_list/model/web_usage_enabler/web_usage_enabler_browser_agent.h",
],
"^browser_impl.mm": [
- "+ios/chrome/browser/ui/commands/command_dispatcher.h",
"+ios/chrome/browser/shared/coordinator/scene/scene_state.h",
"+ios/chrome/browser/saved_tab_groups/model/tab_group_service.h",
"+ios/chrome/browser/saved_tab_groups/model/tab_group_service_factory.h",
],
- "^test_browser.mm": [
- "+ios/chrome/browser/ui/commands/command_dispatcher.h",
- ]
}
diff --git a/ios/chrome/browser/main/ui_bundled/DEPS b/ios/chrome/browser/main/ui_bundled/DEPS
index ab2fe31d383ea..b0f4d4c8ff4d4 100644
--- a/ios/chrome/browser/main/ui_bundled/DEPS
+++ b/ios/chrome/browser/main/ui_bundled/DEPS
@@ -1,5 +1,4 @@
include_rules = [
- "+ios/chrome/browser/ui",
# Use ios/chrome/browser/authentication/ui_bundled/signin_earl_grey.h instead
"-ios/chrome/browser/authentication/ui_bundled/signin_earl_grey_app_interface.h",
# use ios/chrome/browser/bookmarks/ui_bundled/bookmark_earl_grey.h instead
diff --git a/ios/chrome/browser/overlays/model/public/web_content_area/DEPS b/ios/chrome/browser/overlays/model/public/web_content_area/DEPS
index 1221943b70418..3364af9773335 100644
--- a/ios/chrome/browser/overlays/model/public/web_content_area/DEPS
+++ b/ios/chrome/browser/overlays/model/public/web_content_area/DEPS
@@ -1,17 +1,10 @@
specific_include_rules = {
# TODO(crbug.com/40820398): Remove these dependencies.
- "^http_auth_overlay.mm": [
- "+ios/chrome/browser/ui/elements/text_field_configuration.h",
- ],
"^java_script_dialog_overlay.mm": [
"+ios/chrome/browser/dialogs/ui_bundled/java_script_dialog_blocking_state.h",
- "+ios/chrome/browser/ui/elements/text_field_configuration.h",
],
"^java_script_dialog_overlay_utils.mm": [
"+ios/chrome/browser/dialogs/ui_bundled/java_script_dialog_blocking_state.h",
],
- "^java_script_prompt_dialog_overlay.mm": [
- "+ios/chrome/browser/ui/elements/text_field_configuration.h",
- ],
}
diff --git a/ios/chrome/browser/passwords/model/DEPS b/ios/chrome/browser/passwords/model/DEPS
index bfa91861b98a5..78077298fd910 100644
--- a/ios/chrome/browser/passwords/model/DEPS
+++ b/ios/chrome/browser/passwords/model/DEPS
@@ -16,8 +16,5 @@ specific_include_rules = {
"+ios/chrome/browser/shared/ui/util/rtl_geometry.h",
"+ios/chrome/browser/shared/ui/util/uikit_ui_util.h",
],
- "^password_controller.mm": [
- "+ios/chrome/browser/ui/alert_coordinator/action_sheet_coordinator.h",
- ],
}
diff --git a/ios/chrome/browser/popup_menu/ui_bundled/DEPS b/ios/chrome/browser/popup_menu/ui_bundled/DEPS
index 6537070819883..584fa8a031b9d 100644
--- a/ios/chrome/browser/popup_menu/ui_bundled/DEPS
+++ b/ios/chrome/browser/popup_menu/ui_bundled/DEPS
@@ -4,10 +4,8 @@ include_rules = [
"+ios/chrome/browser/bubble/ui_bundled",
"+ios/chrome/browser/lens/ui_bundled/lens_entrypoint.h",
"+ios/chrome/browser/ntp/shared/metrics/feed_metrics_recorder.h",
- "+ios/chrome/browser/ui/content_suggestions/cells/content_suggestions_tile_constants.h",
"+ios/chrome/browser/reading_list/ui_bundled",
"+ios/chrome/browser/tab_switcher/ui_bundled/tab_grid/pinned_tabs/features.h",
- "+ios/chrome/browser/ui/whats_new/whats_new_util.h",
"+ios/chrome/browser/presenters/ui_bundled",
"+ios/chrome/browser/keyboard/ui_bundled/UIKeyCommand+Chrome.h",
"+ios/chrome/browser/settings/ui_bundled",
diff --git a/ios/chrome/browser/promos_manager/ui_bundled/DEPS b/ios/chrome/browser/promos_manager/ui_bundled/DEPS
index 234d9200f0a12..ce615361662c2 100644
--- a/ios/chrome/browser/promos_manager/ui_bundled/DEPS
+++ b/ios/chrome/browser/promos_manager/ui_bundled/DEPS
@@ -8,7 +8,6 @@ include_rules = [
"+ios/chrome/browser/post_restore_signin/ui_bundled",
"+ios/chrome/browser/signin/model",
"+ios/chrome/browser/sync/model/sync_service_factory.h",
- "+ios/chrome/browser/ui/app_store_rating",
"+ios/chrome/browser/whats_new/coordinator",
"+ios/chrome/browser/authentication/ui_bundled/signin/promo",
]
diff --git a/ios/chrome/browser/safe_mode/ui_bundled/DEPS b/ios/chrome/browser/safe_mode/ui_bundled/DEPS
index 61424414e54b9..638b6dbb72c40 100644
--- a/ios/chrome/browser/safe_mode/ui_bundled/DEPS
+++ b/ios/chrome/browser/safe_mode/ui_bundled/DEPS
@@ -1,5 +1,4 @@
include_rules = [
"+ios/chrome/browser/crash_report/model/crash_helper.h",
"+ios/chrome/browser/crash_report/model/crash_loop_detection_util.h",
- "+ios/chrome/browser/ui/fancy_ui/primary_action_button.h",
]
diff --git a/ios/chrome/browser/search_engine_choice/ui_bundled/DEPS b/ios/chrome/browser/search_engine_choice/ui_bundled/DEPS
index 5de7da70391d9..dc581d20d5c88 100644
--- a/ios/chrome/browser/search_engine_choice/ui_bundled/DEPS
+++ b/ios/chrome/browser/search_engine_choice/ui_bundled/DEPS
@@ -2,7 +2,6 @@ include_rules = [
"+ios/chrome/browser/favicon/model/favicon_loader.h",
"+ios/chrome/browser/first_run/ui_bundled/first_run_screen_delegate.h",
"+ios/chrome/browser/first_run/model/first_run_metrics.h",
- "+ios/chrome/browser/ui/scoped_iphone_portrait_only",
"+ios/chrome/browser/search_engine_choice/ui_bundled",
"+ios/chrome/browser/settings/ui_bundled/settings_table_view_controller_constants.h",
"+ios/chrome/browser/settings/ui_bundled/cells/settings_cells_constants.h",
diff --git a/ios/chrome/browser/settings/ui_bundled/downloads/save_to_photos/DEPS b/ios/chrome/browser/settings/ui_bundled/downloads/save_to_photos/DEPS
deleted file mode 100644
index d2c4378e41304..0000000000000
--- a/ios/chrome/browser/settings/ui_bundled/downloads/save_to_photos/DEPS
+++ /dev/null
@@ -1,3 +0,0 @@
-include_rules = [
- "+ios/chrome/browser/ui/account_picker/account_picker_selection/account_picker_selection_screen_identity_item_configurator.h",
-]
\ No newline at end of file
diff --git a/ios/chrome/browser/shared/model/prefs/DEPS b/ios/chrome/browser/shared/model/prefs/DEPS
index 76fd346555a3d..c9532b52453b5 100644
--- a/ios/chrome/browser/shared/model/prefs/DEPS
+++ b/ios/chrome/browser/shared/model/prefs/DEPS
@@ -37,7 +37,6 @@ specific_include_rules = {
# TODO(crbug.com/40820398): Remove this dependency.
"^browser_prefs.mm": [
"+ios/chrome/browser/bookmarks/ui_bundled",
- "+ios/chrome/browser/ui",
"-ios/chrome/browser/authentication/ui_bundled/signin_earl_grey_app_interface.h",
"+ios/chrome/browser/metrics/model/constants.h",
"+ios/chrome/browser/upgrade/model/upgrade_constants.h",
diff --git a/ios/chrome/browser/shared/public/DEPS b/ios/chrome/browser/shared/public/DEPS
index 685688ca273e3..1c3e27cb49f01 100644
--- a/ios/chrome/browser/shared/public/DEPS
+++ b/ios/chrome/browser/shared/public/DEPS
@@ -1,7 +1,4 @@
include_rules = [
- # TODO(crbug.com/40259387): Remove this include once the folders have been
- # moved.
- "+ios/chrome/browser/ui",
# Use ios/chrome/browser/authentication/ui_bundled/signin_earl_grey.h instead
"-ios/chrome/browser/authentication/ui_bundled/signin_earl_grey_app_interface.h",
"+ios/chrome/browser",
diff --git a/ios/chrome/browser/shared/ui/DEPS b/ios/chrome/browser/shared/ui/DEPS
index 77cfaf65ec1ca..55b86be7a3dd8 100644
--- a/ios/chrome/browser/shared/ui/DEPS
+++ b/ios/chrome/browser/shared/ui/DEPS
@@ -1,7 +1,4 @@
include_rules = [
- # TODO(crbug.com/40259387): Remove this include once the folders have been
- # moved.
- "+ios/chrome/browser/ui",
# Use ios/chrome/browser/authentication/ui_bundled/signin_earl_grey.h instead
"-ios/chrome/browser/authentication/ui_bundled/signin_earl_grey_app_interface.h",
# use ios/chrome/browser/bookmarks/ui_bundled/bookmark_earl_grey.h instead
diff --git a/ios/chrome/browser/shared/ui/util/terms_util_unittest.mm b/ios/chrome/browser/shared/ui/util/terms_util_unittest.mm
index 652e15b3b1d3e..ff41c0f6b732b 100644
--- a/ios/chrome/browser/shared/ui/util/terms_util_unittest.mm
+++ b/ios/chrome/browser/shared/ui/util/terms_util_unittest.mm
@@ -104,7 +104,8 @@ TEST_F(FileLocationsTest, TestTermsOfServiceForSupportedLanguages) {
NSUInteger numberOfMissingFiles = [incorrectFallback count];
EXPECT_EQ(numberOfMissingFiles, 0U);
if (numberOfMissingFiles) {
- NSLog(@"Add the following file%@ to ios/chrome/browser/ui/BUILD.gn",
+ NSLog(@"Add the following file%@ to "
+ @"components/resources/terms_resources.filelist",
numberOfMissingFiles > 1 ? @"s" : @"");
for (NSString* language in incorrectFallback) {
NSLog(@" terms_%@.html", language);
diff --git a/ios/chrome/browser/tab_switcher/ui_bundled/DEPS b/ios/chrome/browser/tab_switcher/ui_bundled/DEPS
index 35ba3ff780ffc..b4586e41ec99a 100644
--- a/ios/chrome/browser/tab_switcher/ui_bundled/DEPS
+++ b/ios/chrome/browser/tab_switcher/ui_bundled/DEPS
@@ -1,6 +1,4 @@
include_rules = [
- "+ios/chrome/browser/ui",
-
"+ios/chrome/browser/bookmarks/model",
"+ios/chrome/browser/bookmarks/ui_bundled/home",
"+ios/chrome/browser/bring_android_tabs/model",
diff --git a/ios/chrome/browser/ui/DEPS b/ios/chrome/browser/ui/DEPS
deleted file mode 100644
index fa65a1dcea71a..0000000000000
--- a/ios/chrome/browser/ui/DEPS
+++ /dev/null
@@ -1,18 +0,0 @@
-include_rules = [
- "+ios/chrome/browser",
-
- # Use ios/chrome/browser/authentication/ui_bundled/signin_earl_grey.h instead
- "-ios/chrome/browser/authentication/ui_bundled/signin_earl_grey_app_interface.h",
-
- # Subfolders have to explicitly declare their dependences.
- # Avoid adding top-level deps, prefer to use ios/c/b/shared if needed.
- "-ios/chrome/browser/ui",
-]
-
-specific_include_rules = {
- # web::HttpServer is deprecated in favor of net::EmbeddedTestServer.
- # TODO:(crbug.com/891834) Remove this exception.
- "browser_view_controller_egtest\.mm": [
- "+ios/web/public/test/http_server",
- ],
-}
diff --git a/ios/chrome/browser/ui/OWNERS b/ios/chrome/browser/ui/OWNERS
deleted file mode 100644
index e1552a066ad9e..0000000000000
--- a/ios/chrome/browser/ui/OWNERS
+++ /dev/null
@@ -1,6 +0,0 @@
-# Please prefer to use more specific OWNERS where possible. Don't
-# be reluctant to re-delegate to another OWNER, when a change seems
-# like it needs extra review, or is related to the Omnibox.
-marq@chromium.org
-rohitrao@chromium.org
-gambard@chromium.org
diff --git a/ios/chrome/browser/ui/omnibox/BUILD.gn b/ios/chrome/browser/ui/omnibox/BUILD.gn
deleted file mode 100644
index e0084277c88ec..0000000000000
--- a/ios/chrome/browser/ui/omnibox/BUILD.gn
+++ /dev/null
@@ -1,383 +0,0 @@
-# Copyright 2017 The Chromium Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-source_set("omnibox") {
- sources = [
- "omnibox_controller_delegate.h",
- "omnibox_focus_delegate.h",
- "web_location_bar.cc",
- "web_location_bar.h",
- ]
- deps = [
- "//base",
- "//components/omnibox/browser",
- "//components/search_engines",
- "//ui/base",
- ]
-}
-
-source_set("omnibox_popup_shared") {
- sources = [
- "omnibox_constants.h",
- "omnibox_constants.mm",
- "omnibox_keyboard_delegate.h",
- ]
-}
-
-# This util file must be separate from the below
-# omnibox_util file because it is used in showcase. This
-# means that its dependencies should be limited, avoiding
-# components code.
-source_set("omnibox_suggestion_icon_util") {
- sources = [
- "omnibox_suggestion_icon_util.h",
- "omnibox_suggestion_icon_util.mm",
- ]
- deps = [
- "//base",
- "//ios/chrome/browser/shared/ui/symbols",
- "//ios/chrome/browser/shared/ui/symbols:buildflags",
- ]
-}
-
-# See the comment above on omnibox_suggestion_icon_util
-# for why these two targets are separated.
-source_set("omnibox_util") {
- sources = [
- "omnibox_metrics_helper.h",
- "omnibox_metrics_helper.mm",
- "omnibox_text_change_delegate.h",
- "omnibox_text_field_delegate.h",
- "omnibox_util.h",
- "omnibox_util.mm",
- ]
- deps = [
- ":features",
- ":omnibox_suggestion_icon_util",
- "//base",
- "//components/omnibox/browser",
- "//components/safe_browsing/core/common:common",
- "//components/security_state/core",
- "//ios/chrome/browser/shared/public/features",
- "//ios/chrome/browser/shared/ui/symbols",
- "//third_party/omnibox_proto",
- ]
- public_deps = [
- ":omnibox_icon_type_constants",
- "//ios/chrome/app/theme",
- ]
-}
-
-# This target can also be used on EG2 tests, so it should only contain constants
-source_set("omnibox_icon_type_constants") {
- sources = [
- "omnibox_icon_type.h",
- "omnibox_icon_type.mm",
- ]
- deps = [
- "//base",
- "//ios/chrome/browser/shared/ui/symbols",
- ]
-}
-
-source_set("omnibox_internal") {
- sources = [
- "chrome_omnibox_client_ios.h",
- "chrome_omnibox_client_ios.mm",
- "fake_suggestions_database.cc",
- "fake_suggestions_database.h",
- "omnibox_consumer.h",
- "omnibox_container_view.h",
- "omnibox_container_view.mm",
- "omnibox_coordinator.h",
- "omnibox_coordinator.mm",
- "omnibox_mediator.h",
- "omnibox_mediator.mm",
- "omnibox_return_key_forwarding_delegate.h",
- "omnibox_return_key_forwarding_delegate.mm",
- "omnibox_text_field_ios.h",
- "omnibox_text_field_ios.mm",
- "omnibox_text_field_paste_delegate.h",
- "omnibox_text_field_paste_delegate.mm",
- "omnibox_thumbnail_button.h",
- "omnibox_thumbnail_button.mm",
- "omnibox_view_consumer.h",
- "omnibox_view_controller.h",
- "omnibox_view_controller.mm",
- "omnibox_view_ios.h",
- "omnibox_view_ios.mm",
- "text_field_view_containing.h",
- "web_location_bar_impl.h",
- "web_location_bar_impl.mm",
- "zero_suggest_prefetch_helper.h",
- "zero_suggest_prefetch_helper.mm",
- ]
- deps = [
- ":features",
- ":omnibox",
- ":omnibox_popup_shared",
- ":omnibox_suggestion_icon_util",
- ":omnibox_util",
- "//base",
- "//components/favicon/ios",
- "//components/feature_engagement/public",
- "//components/open_from_clipboard:",
- "//components/open_from_clipboard:open_from_clipboard_impl",
- "//components/resources",
- "//components/search_engines",
- "//components/security_state/core",
- "//components/strings",
- "//ios/chrome/app/strings",
- "//ios/chrome/browser/autocomplete/model",
- "//ios/chrome/browser/bookmarks/model",
- "//ios/chrome/browser/bookmarks/model:model_utils",
- "//ios/chrome/browser/default_browser/model:default_browser_interest_signals",
- "//ios/chrome/browser/default_promo/ui_bundled:coordinator",
- "//ios/chrome/browser/favicon/model",
- "//ios/chrome/browser/feature_engagement/model",
- "//ios/chrome/browser/fullscreen/ui_bundled",
- "//ios/chrome/browser/https_upgrades/model",
- "//ios/chrome/browser/intents/model:model_donation_helper",
- "//ios/chrome/browser/lens/ui_bundled:lens_entrypoint",
- "//ios/chrome/browser/location_bar/ui_bundled:constants",
- "//ios/chrome/browser/main/ui_bundled:default_browser_scene_agent",
- "//ios/chrome/browser/net/model",
- "//ios/chrome/browser/ntp/model",
- "//ios/chrome/browser/ntp/shared/metrics:home_metrics",
- "//ios/chrome/browser/orchestrator/ui_bundled:ui_bundled",
- "//ios/chrome/browser/prerender/model",
- "//ios/chrome/browser/search_engines/model",
- "//ios/chrome/browser/search_engines/model:search_engines_util",
- "//ios/chrome/browser/sessions/model",
- "//ios/chrome/browser/shared/coordinator/chrome_coordinator",
- "//ios/chrome/browser/shared/coordinator/layout_guide",
- "//ios/chrome/browser/shared/coordinator/scene:scene_state_header",
- "//ios/chrome/browser/shared/model/browser",
- "//ios/chrome/browser/shared/model/profile",
- "//ios/chrome/browser/shared/model/url:constants",
- "//ios/chrome/browser/shared/public/commands",
- "//ios/chrome/browser/shared/public/features",
- "//ios/chrome/browser/shared/public/features:system_flags",
- "//ios/chrome/browser/shared/ui/elements",
- "//ios/chrome/browser/shared/ui/symbols",
- "//ios/chrome/browser/shared/ui/util",
- "//ios/chrome/browser/shared/ui/util:omnibox_util",
- "//ios/chrome/browser/shared/ui/util:util_swift",
- "//ios/chrome/browser/toolbar/ui_bundled/public:constants",
- "//ios/chrome/browser/ui/omnibox/popup",
- "//ios/chrome/browser/ui/omnibox/popup:popup_ui_protocols",
- "//ios/chrome/browser/url_loading/model",
- "//ios/chrome/common",
- "//ios/chrome/common/ui/colors",
- "//ios/chrome/common/ui/favicon:favicon",
- "//ios/chrome/common/ui/favicon:favicon_constants",
- "//ios/chrome/common/ui/util",
- "//ios/chrome/common/ui/util:dynamic_type_util",
- "//ios/chrome/common/ui/util:image_util",
- "//ios/components/security_interstitials/https_only_mode",
- "//ios/public/provider/chrome/browser/branded_images:branded_images_api",
- "//ios/public/provider/chrome/browser/lens:lens_api",
- "//ios/web/common:uikit",
- "//ios/web/public",
- "//net",
- "//skia",
- "//ui/base",
- "//ui/gfx",
- "//ui/gfx/geometry",
- "//url",
- ]
- public_deps = [
- ":omnibox_icon_type_constants",
- "//components/omnibox/browser",
- ]
- frameworks = [
- "CoreText.framework",
- "MobileCoreServices.framework",
- "QuartzCore.framework",
- "UIKit.framework",
- "UniformTypeIdentifiers.framework",
- ]
-}
-
-source_set("eg_app_support+eg2") {
- configs += [ "//build/config/ios:xctest_config" ]
- testonly = true
- sources = [
- "omnibox_app_interface.h",
- "omnibox_app_interface.mm",
- "test_fake_suggestions_service.cc",
- "test_fake_suggestions_service.h",
- ]
- deps = [
- ":omnibox_internal",
- ":resources_fake_suggestions_tests",
- "//base",
- "//components/google/core/common",
- "//components/history/core/browser",
- "//components/omnibox/browser",
- "//components/search_engines",
- "//components/variations:variations",
- "//ios/chrome/browser/autocomplete/model",
- "//ios/chrome/browser/history/model",
- "//ios/chrome/browser/search_engines/model",
- "//ios/chrome/browser/search_engines/model:template_url_service_factory",
- "//ios/chrome/browser/shared/model/profile",
- "//ios/chrome/browser/ui/omnibox/popup:popup_ui",
- "//ios/chrome/test/app:test_support",
- "//ios/testing:nserror_support",
- "//ios/testing/earl_grey:eg_app_support+eg2",
- "//ios/third_party/earl_grey2:app_framework+link",
- "//ios/web/public",
- "//ios/web/public/navigation",
- "//net:test_support",
- "//services/network:test_support",
- "//ui/base",
- "//ui/base:test_support",
- ]
-}
-source_set("eg_test_support+eg2") {
- configs += [ "//build/config/ios:xctest_config" ]
- testonly = true
- sources = [
- "omnibox_app_interface.h",
- "omnibox_app_interface_stub.mm",
- "omnibox_earl_grey.h",
- "omnibox_earl_grey.mm",
- "omnibox_matchers.h",
- "omnibox_matchers.mm",
- "omnibox_test_util.h",
- "omnibox_test_util.mm",
- ]
- deps = [
- "//base/test:test_support",
- "//ios/chrome/app/strings",
- "//ios/chrome/browser/ui/omnibox/popup:popup_accessibility_identifier_constants",
- "//ios/chrome/test/earl_grey:eg_test_support+eg2",
- "//ios/testing/earl_grey:eg_test_support+eg2",
- "//ios/testing/earl_grey:launch_configuration",
- "//net:test_support",
- "//ui/base",
- ]
-}
-
-source_set("eg2_tests") {
- configs += [ "//build/config/ios:xctest_config" ]
- testonly = true
- sources = [
- "omnibox_edit_egtest.mm",
- "omnibox_egtest.mm",
- ]
- deps = [
- ":eg_test_support+eg2",
- ":features",
- "//components/feature_engagement/public",
- "//components/omnibox/common",
- "//components/strings:components_strings_grit",
- "//ios/chrome/app/strings",
- "//ios/chrome/browser/content_suggestions/ui_bundled:content_suggestions_constant",
- "//ios/chrome/browser/iph_for_new_chrome_user/model:features",
- "//ios/chrome/browser/shared/model/prefs:pref_names",
- "//ios/chrome/browser/shared/public/features",
- "//ios/chrome/browser/toolbar/ui_bundled/public:constants",
- "//ios/chrome/browser/ui/omnibox/popup:popup_accessibility_identifier_constants",
- "//ios/chrome/test/earl_grey:eg_test_support+eg2",
- "//ios/chrome/test/earl_grey:switches",
- "//ios/testing/earl_grey:eg_test_support+eg2",
- "//ios/web/public/test:element_selector",
- "//net:test_support",
- "//ui/base",
- ]
- frameworks = [ "UIKit.framework" ]
-}
-
-source_set("test_support") {
- testonly = true
- sources = [
- "test_web_location_bar.cc",
- "test_web_location_bar.h",
- ]
- deps = [
- ":omnibox",
- "//base",
- "//components/omnibox/browser:location_bar",
- "//ios/web/public",
- "//url",
- ]
- frameworks = [ "UIKit.framework" ]
-}
-
-source_set("unit_tests") {
- testonly = true
- sources = [
- "chrome_omnibox_client_ios_unittest.mm",
- "fake_suggestions_database_unittest.cc",
- "omnibox_text_field_ios_unittest.mm",
- "zero_suggest_prefetch_helper_unittest.mm",
- ]
- deps = [
- ":features",
- ":omnibox",
- ":omnibox_internal",
- ":resources_unit_tests",
- ":test_support",
- "//base",
- "//base/test:test_support",
- "//components/bookmarks/browser",
- "//components/feature_engagement/public",
- "//components/feature_engagement/test:test_support",
- "//components/omnibox/browser:test_support",
- "//components/search_engines",
- "//components/search_engines:test_support",
- "//ios/chrome/app/strings",
- "//ios/chrome/browser/autocomplete/model",
- "//ios/chrome/browser/main/model",
- "//ios/chrome/browser/shared/model/browser/test:test_support",
- "//ios/chrome/browser/shared/model/paths",
- "//ios/chrome/browser/shared/model/profile/test",
- "//ios/chrome/browser/shared/model/url:constants",
- "//ios/chrome/browser/shared/model/web_state_list",
- "//ios/chrome/browser/shared/model/web_state_list/test:test_support",
- "//ios/chrome/browser/shared/ui/util",
- "//ios/chrome/test:block_cleanup_test",
- "//ios/testing:nserror_support",
- "//ios/web/common:uikit",
- "//ios/web/public/test/fakes",
- "//testing/gtest",
- "//third_party/ocmock",
- "//ui/base",
- ]
-}
-
-bundle_data("resources_unit_tests") {
- visibility = [ ":unit_tests" ]
- testonly = true
- sources = [ "//ios/chrome/test/data/omnibox/selected_ranges.txt" ]
- outputs = [ "{{bundle_resources_dir}}/" +
- "ios/chrome/test/data/omnibox/{{source_file_part}}" ]
-}
-
-bundle_data("resources_fake_suggestions_tests") {
- visibility = [ ":eg_app_support+eg2" ]
- testonly = true
- sources = [
- "//ios/chrome/test/data/omnibox/fake_suggestion_actions.json",
- "//ios/chrome/test/data/omnibox/fake_suggestions_pedal.json",
- "//ios/chrome/test/data/omnibox/fake_suggestions_sample.json",
- ]
- outputs = [ "{{bundle_resources_dir}}/" +
- "{{source_root_relative_dir}}/{{source_file_part}}" ]
-}
-
-source_set("features") {
- sources = [
- "omnibox_ui_features.cc",
- "omnibox_ui_features.h",
- ]
- public_deps = [ "//base" ]
- deps = [
- "//components/omnibox/common",
- "//ios/chrome/browser/shared/public/features",
- "//ui/base",
- ]
-}
diff --git a/ios/chrome/browser/ui/omnibox/DEPS b/ios/chrome/browser/ui/omnibox/DEPS
deleted file mode 100644
index 61526571689e0..0000000000000
--- a/ios/chrome/browser/ui/omnibox/DEPS
+++ /dev/null
@@ -1,13 +0,0 @@
-include_rules = [
- "+ios/chrome/browser/location_bar/ui_bundled",
- "+ios/chrome/browser/lens/ui_bundled/lens_entrypoint.h",
- "+ios/chrome/browser/orchestrator/ui_bundled",
- "+ios/chrome/browser/ntp/shared/metrics/home_metrics.h",
- "+ios/chrome/browser/toolbar/ui_bundled/public",
-]
-
-specific_include_rules = {
- "^omnibox_coordinator.mm": [
- "+ios/chrome/browser/bubble/ui_bundled/bubble_presenter.h",
- ],
-}
diff --git a/ios/chrome/browser/ui/toolbar/DEPS b/ios/chrome/browser/ui/toolbar/DEPS
deleted file mode 100644
index 9b05968fc0bdf..0000000000000
--- a/ios/chrome/browser/ui/toolbar/DEPS
+++ /dev/null
@@ -1,16 +0,0 @@
-include_rules = [
- "+ios/chrome/browser/infobars/ui_bundled/test_infobar_delegate.h",
- "+ios/chrome/browser/menu/ui_bundled",
- "+ios/chrome/browser/popup_menu/ui_bundled/public",
- "+ios/chrome/browser/fullscreen/ui_bundled",
- "+ios/chrome/browser/location_bar/ui_bundled",
- "+ios/chrome/browser/omnibox/ui_bundled",
- "+ios/chrome/browser/orchestrator/ui_bundled",
- "+ios/chrome/browser/keyboard/ui_bundled/key_command_actions.h",
- "+ios/chrome/browser/keyboard/ui_bundled/UIKeyCommand+Chrome.h",
- "+ios/chrome/browser/lens/ui_bundled",
- "+ios/chrome/browser/ntp/ui_bundled/new_tab_page_controller_delegate.h",
- "+ios/chrome/browser/sharing/ui_bundled",
- "+ios/chrome/browser/ntp/ui_bundled/new_tab_page_util.h",
- "+ios/chrome/browser/content_suggestions/ui_bundled/content_suggestions_collection_utils.h",
-]
diff --git a/ios/chrome/browser/url_loading/model/DEPS b/ios/chrome/browser/url_loading/model/DEPS
index 3bb60486a5e14..b36425d86cc83 100644
--- a/ios/chrome/browser/url_loading/model/DEPS
+++ b/ios/chrome/browser/url_loading/model/DEPS
@@ -14,7 +14,6 @@ specific_include_rules = {
"^url_loading_browser_agent.mm": [
"+ios/chrome/browser/incognito_reauth/ui_bundled/incognito_reauth_scene_agent.h",
"+ios/chrome/browser/ntp/ui_bundled/new_tab_page_util.h",
- "+ios/chrome/browser/ui/ui_feature_flags.h",
],
}
diff --git a/ios/chrome/browser/web/model/DEPS b/ios/chrome/browser/web/model/DEPS
index 9c8aee0b7d954..7c1e52b779835 100644
--- a/ios/chrome/browser/web/model/DEPS
+++ b/ios/chrome/browser/web/model/DEPS
@@ -53,9 +53,6 @@ specific_include_rules = {
"page_placeholder_tab_helper.h": [
"+ios/chrome/browser/shared/ui/elements/top_aligned_image_view.h",
],
- "browser_about_rewriter.cc": [
- "+ios/chrome/browser/ui/ui_feature_flags.h",
- ],
# web::HttpServer is deprecated in favor of net::EmbeddedTestServer.
# TODO:(crbug.com/891834) Remove this exception.
"browsing_egtest\.mm": [
diff --git a/ios/chrome/content_widget_extension/DEPS b/ios/chrome/content_widget_extension/DEPS
index 63350d201c9f1..af8e828fb25c0 100644
--- a/ios/chrome/content_widget_extension/DEPS
+++ b/ios/chrome/content_widget_extension/DEPS
@@ -1,6 +1,5 @@
include_rules = [
"-url",
- "+ios/chrome/browser/ui/util",
"+ios/chrome/browser/favicon/ui_bundled",
"+ios/chrome/browser/ntp/ui_bundled",
]
diff --git a/ios/chrome/search_widget_extension/DEPS b/ios/chrome/search_widget_extension/DEPS
index 2547b11a9401e..5349816e7a3ea 100644
--- a/ios/chrome/search_widget_extension/DEPS
+++ b/ios/chrome/search_widget_extension/DEPS
@@ -1,5 +1,4 @@
include_rules = [
"+components/open_from_clipboard",
- "+ios/chrome/browser/ui/util",
"-url",
]
diff --git a/tools/metrics/histograms/metadata/ios/enums.xml b/tools/metrics/histograms/metadata/ios/enums.xml
index 925f751a6659a..048d19cc242d2 100644
--- a/tools/metrics/histograms/metadata/ios/enums.xml
+++ b/tools/metrics/histograms/metadata/ios/enums.xml
@@ -1005,7 +1005,7 @@ chromium-metrics-reviews@google.com.
<int value="5" label="Animated Promo Dismissed"/>
</enum>
-<!-- LINT.ThenChange(//ios/chrome/browser/ui/content_suggestions/set_up_list/constants.h:SegmentedDefaultBrowserPromoAction) -->
+<!-- LINT.ThenChange(//ios/chrome/browser/content_suggestions/ui_bundled/set_up_list/constants.h:SegmentedDefaultBrowserPromoAction) -->
<enum name="IOSSessionMigration">
<int value="0" label="No Migration"/>
diff --git a/tools/whats_new/OWNERS b/tools/whats_new/OWNERS
index eceac4cd4a354..34b9ce920091d 100644
--- a/tools/whats_new/OWNERS
+++ b/tools/whats_new/OWNERS
@@ -1 +1 @@
-file://ios/chrome/browser/ui/whats_new/OWNERS
+file://ios/chrome/browser/whats_new/OWNERS
diff --git a/tools/whats_new/whats_new_util.py b/tools/whats_new/whats_new_util.py
index e0a0f15f8c962..b471359ed2fc9 100644
--- a/tools/whats_new/whats_new_util.py
+++ b/tools/whats_new/whats_new_util.py
@@ -47,7 +47,7 @@ def UpdateWhatsNewItemAndGetNewTypeValue(feature_dict: dict[str, str]) -> int:
feature_name = feature_dict['Feature name']
whats_new_item_file = os.path.join(
BASE_DIR,
- '../ios/chrome/browser/ui/whats_new/data_source/whats_new_item.h')
+ '../ios/chrome/browser/whats_new/ui/data_source/whats_new_item.h')
with open(whats_new_item_file, 'r+', encoding='utf-8', newline='') as file:
file_content = file.read()
read_whats_new_types_regex = r'enum class WhatsNewType\s*\{\s(.*?)\s\}'
@@ -103,7 +103,7 @@ def CleanUpFeaturesPlist() -> None:
"""
whats_new_plist_file = os.path.join(
- BASE_DIR, '../ios/chrome/browser/ui/whats_new/data_source/'
+ BASE_DIR, '../ios/chrome/browser/whats_new/ui/data_source/'
'resources/whats_new_entries.plist')
with open(whats_new_plist_file, 'rb') as file:
plist_data = plistlib.load(file)
@@ -143,7 +143,7 @@ def UpdateWhatsNewPlist(feature_dict: dict[str, str], feature_type: int,
'LearnMoreUrlString': feature_dict['Help url']
}
whats_new_plist_file = os.path.join(
- BASE_DIR, '../ios/chrome/browser/ui/whats_new/data_source/'
+ BASE_DIR, '../ios/chrome/browser/whats_new/ui/data_source/'
'resources/whats_new_entries.plist')
with open(whats_new_plist_file, 'rb') as file:
plist_data = plistlib.load(file)
@@ -160,7 +160,8 @@ def UpdateWhatsNewUtils(feature_dict: dict[str, str]) -> None:
"""
feature_name = feature_dict['Feature name']
whats_new_util_file = os.path.join(
- BASE_DIR, '..', 'ios/chrome/browser/ui/whats_new/whats_new_util.mm')
+ BASE_DIR, '..',
+ 'ios/chrome/browser/whats_new/coordinator/whats_new_util.mm')
with open(whats_new_util_file, 'r+', encoding='utf-8', newline='') as file:
read_data = file.read()
whats_new_type_error_regex = r'case WhatsNewType::kError:'
@@ -190,7 +191,7 @@ def CopyAnimationFilesToResources(feature_dict: dict[str, str],
animation_name = feature_dict['Animation']
milestone = feature_dict['Milestone'].lower()
DEST_DIR = os.path.join(
- BASE_DIR, '../ios/chrome/browser/ui/whats_new/data_source/resources',
+ BASE_DIR, '../ios/chrome/browser/whats_new/ui/data_source/resources',
milestone)
os.makedirs(DEST_DIR, exist_ok=True)
darkmode_src_file = os.path.join(path_to_milestone_folder, feature_name,
@@ -215,7 +216,7 @@ def UpdateResourcesBuildFile(feature_dict: dict[str, str]) -> None:
milestone = feature_dict['Milestone'].lower()
whats_new_resources_build_file = os.path.join(
BASE_DIR,
- '../ios/chrome/browser/ui/whats_new/data_source/resources/BUILD.gn')
+ '../ios/chrome/browser/whats_new/ui/data_source/resources/BUILD.gn')
with open(whats_new_resources_build_file,
'r+',
encoding='utf-8',
@@ -254,7 +255,7 @@ def AddStrings(feature_dict: dict[str, str],
if paragraph.text:
paragraphs_string_builder.append(paragraph.text)
milestone_string_grd_file = os.path.join(
- BASE_DIR, '../ios/chrome/browser/ui/whats_new/strings/',
+ BASE_DIR, '../ios/chrome/browser/whats_new/ui/strings/',
milestone + '_strings.grdp')
if not os.path.exists(milestone_string_grd_file):
#Create new file and add to grd main
@@ -269,7 +270,7 @@ def AddStrings(feature_dict: dict[str, str],
grd_file_handler.write('\n'.join(grd_content_builder))
#open and add to main grd
whats_new_strings_grd_file = os.path.join(
- BASE_DIR, '../ios/chrome/browser/ui/whats_new',
+ BASE_DIR, '../ios/chrome/browser/whats_new/ui',
'strings/ios_whats_new_strings.grd')
with open(whats_new_strings_grd_file,
'r+',
@@ -286,7 +287,7 @@ def AddStrings(feature_dict: dict[str, str],
else:
#search for '</grit-part>' and add above
feature_strings_grd_file = os.path.join(
- BASE_DIR, '../ios/chrome/browser/ui/whats_new/strings/',
+ BASE_DIR, '../ios/chrome/browser/whats_new/ui/strings/',
milestone + '_strings.grdp')
with open(feature_strings_grd_file, 'r+', encoding='utf-8',
newline='') as file:
@@ -316,7 +317,7 @@ def UploadScreenshots(feature_dict: dict[str, str],
animation_texts_string = feature_dict['Animation texts'].splitlines()
titles.extend("".join(StripWhitespacesAndEmptyLines(json.loads(a)['value'])) for a in animation_texts_string)
screenshot_dir = os.path.join(
- BASE_DIR, '../ios/chrome/browser/ui/whats_new/strings',
+ BASE_DIR, '../ios/chrome/browser/whats_new/ui/strings',
milestone + '_strings_grdp')
os.makedirs(screenshot_dir, exist_ok=True)
for title in titles:
@@ -364,7 +365,7 @@ def RemoveStringsForMilestone(milestone: str) -> None:
milestone: milestone for which the strings will be removed.
"""
whats_new_strings_grd_file = os.path.join(
- BASE_DIR, '../ios/chrome/browser/ui/whats_new',
+ BASE_DIR, '../ios/chrome/browser/whats_new/ui',
'strings/ios_whats_new_strings.grd')
with open(whats_new_strings_grd_file, 'r+', encoding='utf-8',
newline='') as file:
@@ -381,7 +382,7 @@ def RemoveStringsForMilestone(milestone: str) -> None:
'for more information.')
try:
screenshot_milestone_dir = os.path.join(
- BASE_DIR, '../ios/chrome/browser/ui/whats_new/strings',
+ BASE_DIR, '../ios/chrome/browser/whats_new/ui/strings',
milestone + '_strings_grdp')
shutil.rmtree(screenshot_milestone_dir)
except:
@@ -389,7 +390,7 @@ def RemoveStringsForMilestone(milestone: str) -> None:
'been removed.')
try:
strings_file = os.path.join(
- BASE_DIR, '../ios/chrome/browser/ui/whats_new/strings',
+ BASE_DIR, '../ios/chrome/browser/whats_new/ui/strings',
milestone + '_strings.grdp')
os.remove(strings_file)
except:
@@ -407,7 +408,7 @@ def RemoveAnimationAssetsForMilestone(milestone: str) -> None:
try:
whats_new_milestone_resource_dir = os.path.join(
BASE_DIR,
- '../ios/chrome/browser/ui/whats_new/data_source/resources',
+ '../ios/chrome/browser/whats_new/ui/data_source/resources',
milestone)
shutil.rmtree(whats_new_milestone_resource_dir)
except:
@@ -416,7 +417,7 @@ def RemoveAnimationAssetsForMilestone(milestone: str) -> None:
screenshots_lists_regex = r'screenshots_lists\s*=\s*(\[.*?\])'
whats_new_resources_build_file = os.path.join(
BASE_DIR,
- '../ios/chrome/browser/ui/whats_new/data_source/resources/BUILD.gn')
+ '../ios/chrome/browser/whats_new/ui/data_source/resources/BUILD.gn')
with open(whats_new_resources_build_file,
'r+',
encoding='utf-8',