CrOS Settings: Update comments with new CrOS Settings directory

Updates the remaining comments/documentation to the new CrOS Settings
SWA frontend code directory.

Bug: b/283986054
Change-Id: I48cdecac11f88b530c00a06e3ade67239f9d2cee
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4616750
Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Reviewed-by: Toni Barzic <tbarzic@chromium.org>
Commit-Queue: Toni Barzic <tbarzic@chromium.org>
Auto-Submit: Wes Okuhara <wesokuhara@google.com>
Cr-Commit-Position: refs/heads/main@{#1162546}

WATCHLISTS

@@ -118,7 +118,7 @@
       'filepath': 'android_webview/browser/network_service/',
     },
     'app_management': {
-      'filepath': 'chrome/browser/resources/settings/chromeos/os_apps_page'\
+      'filepath': 'chrome/browser/resources/ash/settings/os_apps_page'\
                   '|chrome/browser/ui/webui/app_management',
     },
     'app_preload_service': {
@@ -200,7 +200,7 @@
                   '|chromeos/services/assistant/'\
                   '|chrome/browser/ash/wallpaper_handlers/'\
                   '|chrome/browser/ash/web_applications/personalization_app/'\
-                  '|chrome/browser/resources/settings/chromeos/ambient_mode_page/'\
+                  '|chrome/browser/resources/ash/settings/ambient_mode_page/'\
                   '|chrome/browser/ui/ash/.*wallpaper.*/'\
                   '|chrome/browser/ui/ash/ambient/'\
                   '|chrome/browser/ui/ash/assistant/'\
@@ -760,7 +760,7 @@
                   '|chromeos/ash/components/hid_detection/'\
                   '|chromeos/ash/services/bluetooth_config/'\
                   '|chrome/browser/ui/webui/ash/bluetooth'\
-                  '|chrome/browser/resources/settings/chromeos/os_bluetooth_page/'\
+                  '|chrome/browser/resources/ash/settings/os_bluetooth_page/'\
                   '|chrome/browser/resources/chromeos/bluetooth_pairing_dialog/'\
                   '|chrome/test/data/webui/cr_components/chromeos/bluetooth/'\
                   '|device/bluetooth/bluez/'\
@@ -799,7 +799,7 @@
                   'chrome/browser/resources/chromeos/internet_config_dialog/|'\
                   'chrome/browser/resources/chromeos/internet_detail_dialog/|'\
                   'chrome/browser/resources/chromeos/network_ui/|'\
-                  'chrome/browser/resources/settings/chromeos/internet_page/|'\
+                  'chrome/browser/resources/ash/settings/internet_page/|'\
                   'chrome/browser/ui/ash/network/|'\
                   'chrome/browser/ui/webui/ash/network|'\
                   'chrome/test/data/webui/cr_components/chromeos/network/|'\
@@ -936,7 +936,7 @@
                   '|plugin_vm',
     },
     'cups_printing' : {
-      'filepath': 'chrome/browser/resources/settings/chromeos/os_printing_page/'\
+      'filepath': 'chrome/browser/resources/ash/settings/os_printing_page/'\
                   '|chrome/test/data/webui/settings/cups_printer_page_tests.js'\
                   '|chrome/browser/ui/webui/settings/ash/cups_printers_handler'\
                   '|chrome/browser/ash/printing/'\
@@ -1255,7 +1255,7 @@
     },
     'input_device_settings': {
       'filepath': 'ash/system/input_device_settings/|'\
-                  'chrome/browser/resources/settings/chromeos/device_page/|'\
+                  'chrome/browser/resources/ash/settings/device_page/|'\
                   'chrome/browser/ui/webui/settings/ash/device_section.(cc|h)$|'\
                   'chrome/browser/ui/webui/settings/ash/input_device_settings/',
     },
@@ -1473,7 +1473,7 @@
                   '|chrome/browser/ash/multidevice_setup/'\
                   '|chrome/browser/ash/secure_channel/'\
                   '|chrome/browser/resources/chromeos/multidevice_setup/'\
-                  '|chrome/browser/resources/settings/chromeos/multidevice_page/'\
+                  '|chrome/browser/resources/ash/settings/multidevice_page/'\
                   '|chrome/browser/ui/webui/ash/multidevice_setup/'\
                   '|chrome/browser/ui/webui/settings/ash/multidevice'\
                   '|chrome/test/data/webui/multidevice_setup/'\
@@ -1508,7 +1508,7 @@
       'filepath': 'chrome/browser/nearby_sharing/|'\
                   'chrome/browser/resources/nearby_internals/|'\
                   'chrome/browser/resources/nearby_share/|'\
-                  'chrome/browser/resources/settings/chromeos/nearby_share_page/|'\
+                  'chrome/browser/resources/ash/settings/nearby_share_page/|'\
                   'chrome/browser/ui/webui/nearby_internals/|'\
                   'chrome/browser/ui/webui/nearby_share/|'\
                   'chrome/services/sharing/'
@@ -1854,7 +1854,7 @@
                   '|chrome/test/data/webui/settings/',
     },
     'settings_os_settings': {
-      'filepath': 'chrome/browser/resources/settings/chromeos/'\
+      'filepath': 'chrome/browser/resources/ash/settings/'\
                   '|chrome/browser/ui/webui/settings/ash/'\
                   '|chrome/browser/ui/webui/settings/chromeos/'\
                   '|chrome/test/data/webui/settings/chromeos/'\
@@ -1892,7 +1892,7 @@
                   '|ash/public/cpp/smartlock'\
                   '|chrome/browser/ash/login/easy_unlock/'\
                   '|chrome/browser/resources/chromeos/quick_unlock/'\
-                  '|chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_smartlock'\
+                  '|chrome/browser/resources/ash/settings/multidevice_page/multidevice_smartlock'\
                   '|chrome/test/data/webui/settings/chromeos/multidevice_smartlock'\
                   '|chromeos/ash/components/dbus/easy_unlock/'\
                   '|chromeos/ash/components/proximity_auth/',

ash/system/privacy_hub/privacy_hub_metrics.h

@@ -14,7 +14,7 @@ using Sensor = SensorDisabledNotificationDelegate::Sensor;
 // These values are persisted to logs and should not be renumbered or re-used.
 // Keep in sync with PrivacyHubNavigationOrigin in
 // tools/metrics/histograms/enums.xml and
-// c/b/resources/settings/chromeos/os_privacy_page/privacy_hub_subpage.js.
+// c/b/resources/ash/settings/os_privacy_page/privacy_hub_subpage.js.
 enum class PrivacyHubNavigationOrigin {
   kSystemSettings = 0,
   kNotification = 1,

ash/webui/personalization_app/tools/gen_tsconfig.py

@@ -105,7 +105,7 @@ def main(args):
     }
 
     #TODO(xiaohuic): remove special case for ChromeOS Settings below.
-    if '/settings/chromeos' in arguments.gn_target:
+    if '/ash/settings' in arguments.gn_target:
         # ChromeOS Settings app setup is special, the ts input dir root is not
         # matching the source code root. It uses the browser Settings app
         # source code root instead because of sharing some browser Settings

ash/webui/shimless_rma/backend/version_updater.cc

@@ -87,7 +87,7 @@ void VersionUpdater::SetOsUpdateStatusCallback(
 // so that the update messages are the same as normal Chrome updates.
 // See
 // chrome/browser/ui/webui/help/version_updater_chromeos.cc:271
-// chrome/browser/resources/settings/chromeos/os_about_page/os_about_page.js:418
+// chrome/browser/resources/ash/settings/os_about_page/os_about_page.js:418
 // chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc:261
 // chrome/app/shared_settings_strings.grdp:378
 // chrome/app/os_settings_strings.grdp:66

chrome/browser/ash/input_method/input_method_settings.cc

@@ -29,7 +29,7 @@ constexpr char kJapaneseEngineId[] = "nacl_mozc_jp";
 
 // This should be kept in sync with the values on the settings page's
 // InputMethodOptions. This should match
-// https://source.chromium.org/chromium/chromium/src/+/main:chrome/browser/resources/settings/chromeos/os_languages_page/input_method_util.js;l=71-88;drc=6c88edbfe6096489ccac66b3ef5c84d479892181.
+// https://source.chromium.org/chromium/chromium/src/+/main:chrome/browser/resources/ash/settings/os_languages_page/input_method_util.js;l=71-88;drc=6c88edbfe6096489ccac66b3ef5c84d479892181.
 constexpr char kJapaneseAutomaticallySwitchToHalfwidth[] =
     "AutomaticallySwitchToHalfwidth";
 constexpr char kJapaneseShiftKeyModeStyle[] = "ShiftKeyModeStyle";
@@ -48,7 +48,7 @@ constexpr char kJapaneseAutomaticallySendStatisticsToGoogle[] =
     "AutomaticallySendStatisticsToGoogle";
 
 // This should match the strings listed here:
-// https://crsrc.org/c/chrome/browser/resources/settings/chromeos/os_languages_page/input_method_types.js;l=8-71;drc=7df206933530e6ac65a7e17a88757cbb780c829e
+// https://crsrc.org/c/chrome/browser/resources/ash/settings/os_languages_page/input_method_types.js;l=8-71;drc=7df206933530e6ac65a7e17a88757cbb780c829e
 // These are possible values for their corresponding enum type.
 constexpr char kJapaneseInputModeKana[] = "Kana";
 constexpr char kJapaneseInputModeRomaji[] = "Romaji";
@@ -79,7 +79,7 @@ constexpr char kJapaneseShiftKeyModeStyleAlphanumeric[] = "Alphanumeric";
 constexpr char kJapaneseShiftKeyModeStyleKatakana[] = "Katakana";
 
 // The values here should be kept in sync with
-// chrome/browser/resources/settings/chromeos/os_languages_page/input_method_util.js
+// chrome/browser/resources/ash/settings/os_languages_page/input_method_util.js
 // Although these strings look like UI strings, they are the actual internal
 // values stored inside prefs. Therefore, it is important to make sure these
 // strings match the settings page exactly.
@@ -95,19 +95,19 @@ constexpr char kKoreanPrefsLayoutSebeolsikOldHangeul[] =
     "3 Set (Old Hangul) / 세벌식 (옛글)";
 
 // The values here should be kept in sync with
-// chrome/browser/resources/settings/chromeos/os_languages_page/input_method_util.js
+// chrome/browser/resources/ash/settings/os_languages_page/input_method_util.js
 constexpr char kPinyinPrefsLayoutUsQwerty[] = "US";
 constexpr char kPinyinPrefsLayoutDvorak[] = "Dvorak";
 constexpr char kPinyinPrefsLayoutColemak[] = "Colemak";
 
 // The values here should be kept in sync with
-// chrome/browser/resources/settings/chromeos/os_languages_page/input_method_util.js
+// chrome/browser/resources/ash/settings/os_languages_page/input_method_util.js
 constexpr char kZhuyinPrefsLayoutStandard[] = "Default";
 constexpr char kZhuyinPrefsLayoutIbm[] = "IBM";
 constexpr char kZhuyinPrefsLayoutEten[] = "Eten";
 
 // The values here should be kept in sync with
-// chrome/browser/resources/settings/chromeos/os_languages_page/input_method_util.js
+// chrome/browser/resources/ash/settings/os_languages_page/input_method_util.js
 constexpr char kZhuyinPrefsSelectionKeys1234567890[] = "1234567890";
 constexpr char kZhuyinPrefsSelectionKeysAsdfghjkl[] = "asdfghjkl;";
 constexpr char kZhuyinPrefsSelectionKeysAsdfzxcv89[] = "asdfzxcv89";
@@ -115,7 +115,7 @@ constexpr char kZhuyinPrefsSelectionKeysAsdfjkl789[] = "asdfjkl789";
 constexpr char kZhuyinPrefsSelectionKeys1234Qweras[] = "1234qweras";
 
 // The values here should be kept in sync with
-// chrome/browser/resources/settings/chromeos/os_languages_page/input_method_util.js
+// chrome/browser/resources/ash/settings/os_languages_page/input_method_util.js
 constexpr char kZhuyinPrefsPageSize10[] = "10";
 constexpr char kZhuyinPrefsPageSize9[] = "9";
 constexpr char kZhuyinPrefsPageSize8[] = "8";
@@ -375,7 +375,7 @@ const base::Value::Dict& GetPrefsDictionaryForEngineId(
 
 // Port the Prefs settings onto a Dict object for setting the user Prefs.
 // This converts the code in the corresponding pages:
-// https://crsrc.org/c/chrome/browser/resources/settings/chromeos/os_languages_page/input_method_util.js;drc=6c88edbfe6096489ccac66b3ef5c84d479892181;l=72
+// https://crsrc.org/c/chrome/browser/resources/ash/settings/os_languages_page/input_method_util.js;drc=6c88edbfe6096489ccac66b3ef5c84d479892181;l=72
 // https://crsrc.org/c/chromeos/ash/services/ime/public/mojom/japanese_settings.mojom;drc=e250164fc5bdefca32cb94157e9835ff8c2c9ee6;l=73
 base::Value::Dict ConvertConfigToJapaneseSettings(
     const ime::mojom::JapaneseConfig config) {

chrome/browser/ash/input_method/input_method_settings_unittest.cc

@@ -36,7 +36,7 @@ constexpr char kVietnameseTelexEngineId[] = "vkd_vi_telex";
 
 // This should be kept in sync with the values on the settings page's
 // InputMethodOptions. This should match
-// https://source.chromium.org/chromium/chromium/src/+/main:chrome/browser/resources/settings/chromeos/os_languages_page/input_method_util.js;l=71-88;drc=6c88edbfe6096489ccac66b3ef5c84d479892181.
+// https://source.chromium.org/chromium/chromium/src/+/main:chrome/browser/resources/ash/settings/os_languages_page/input_method_util.js;l=71-88;drc=6c88edbfe6096489ccac66b3ef5c84d479892181.
 constexpr char kJapaneseInputMode[] = "JapaneseInputMode";
 constexpr char kJapanesePunctuationStyle[] = "JapanesePunctuationStyle";
 constexpr char kJapaneseSymbolStyle[] = "JapaneseSymbolStyle";
@@ -56,7 +56,7 @@ constexpr char kJapaneseAutomaticallySendStatisticsToGoogle[] =
 
 // This should match the strings listed here:
 //
-// https://crsrc.org/c/chrome/browser/resources/settings/chromeos/os_languages_page/input_method_types.js;l=8-71;drc=7df206933530e6ac65a7e17a88757cbb780c829e
+// https://crsrc.org/c/chrome/browser/resources/ash/settings/os_languages_page/input_method_types.js;l=8-71;drc=7df206933530e6ac65a7e17a88757cbb780c829e
 // These are possible values for their corresponding enum type.
 constexpr char kJapaneseInputModeKana[] = "Kana";
 constexpr char kJapaneseInputModeRomaji[] = "Romaji";

chrome/browser/resources/ash/settings/os_languages_page/tools/editor_tsconfig.py

@@ -36,17 +36,17 @@ is provided to remove lazy_load.ts from the resulting tsconfig.json.
 
 
 Example invocations:
-$ ./chrome/browser/resources/settings/chromeos/os_languages_page/tools/\
+$ ./chrome/browser/resources/ash/settings/os_languages_page/tools/\
 editor_tsconfig.py \
 --remove_lazy_load \
 ./out/Debug/gen/chrome/browser/resources/settings/tsconfig_build_ts.json
-$ ./chrome/browser/resources/settings/chromeos/os_languages_page/tools/\
+$ ./chrome/browser/resources/ash/settings/os_languages_page/tools/\
 editor_tsconfig.py \
 --root_dir=".." \
 --remove_lazy_load \
-./out/Debug/gen/chrome/browser/resources/settings/chromeos/\
+./out/Debug/gen/chrome/browser/resources/ash/settings/\
 tsconfig_build_ts.json
-$ ./chrome/browser/resources/settings/chromeos/os_languages_page/tools/\
+$ ./chrome/browser/resources/ash/settings/os_languages_page/tools/\
 editor_tsconfig.py \
 ./out/Debug/gen/ui/webui/resources/cr_components/most_visited/\
 tsconfig_build_ts.json
@@ -79,20 +79,20 @@ def _relative_to_with_parents(path: pathlib.Path, other: pathlib.Path) -> str:
 
 
 def _rebase_relative_path(
-        path: str,
+    path: str,
-        originally_relative_to: pathlib.Path,
+    originally_relative_to: pathlib.Path,
-        newly_relative_to: pathlib.Path,
+    newly_relative_to: pathlib.Path,
 ) -> str:
     original_path = originally_relative_to.joinpath(path).resolve()
     return _relative_to_with_parents(original_path, newly_relative_to)
 
 
 def _convert_tsconfig_for_editor(
-        tsconfig: dict,
+    tsconfig: dict,
-        original_dir: pathlib.Path,
+    original_dir: pathlib.Path,
-        editor_dir: pathlib.Path,
+    editor_dir: pathlib.Path,
-        editor_root_dir: str,
+    editor_root_dir: str,
-        remove_lazy_load: bool,
+    remove_lazy_load: bool,
 ) -> dict:
     original_dir = original_dir.resolve()
     editor_dir = editor_dir.resolve()

chrome/browser/resources/settings/people_page/account_manager_browser_proxy.ts

@@ -4,7 +4,7 @@
 
 /**
  * @fileoverview Stripped down fork of
- * c/b/r/settings/chromeos/os_people_page/account_manager_browser_proxy.js.
+ * c/b/r/ash/settings/os_people_page/account_manager_browser_proxy.js.
  * Re-uses the same WebUI message handler class.
  */
 

chrome/test/data/webui/settings/chromeos/test_os_languages_browser_proxy.js

@@ -7,7 +7,7 @@ import {FakeLanguageSettingsPrivate} from './fake_language_settings_private.js';
 import {TestBrowserProxy} from 'chrome://webui-test/test_browser_proxy.js';
 
 // This class implements LanguagesBrowserProxy from
-// c/b/r/settings/chromeos/os_languages_page/languages_browser_proxy.ts.
+// c/b/r/ash/settings/os_languages_page/languages_browser_proxy.ts.
 export class TestLanguagesBrowserProxy extends TestBrowserProxy {
   constructor() {
     const methodNames = [];

chrome/test/data/webui/settings/chromeos/test_os_languages_metrics_proxy.js

@@ -8,7 +8,7 @@ import {TestBrowserProxy} from 'chrome://webui-test/test_browser_proxy.js';
  * A test version of LanguagesMetricsProxy.
  */
 // This class implements LanguagesMetricsProxy from
-// c/b/r/settings/chromeos/os_languages_page/languages_metrics_proxy.ts.
+// c/b/r/ash/settings/os_languages_page/languages_metrics_proxy.ts.
 export class TestLanguagesMetricsProxy extends TestBrowserProxy {
   constructor() {
     super([

chromeos/ash/components/phonehub/util/histogram_util.h

@@ -84,7 +84,7 @@ enum class PhoneHubMessageResult {
 // numeric values should never be reused.
 // Keep in sync with corresponding enum in tools/metrics/histograms/enums.xml.
 // Keep in sync with PhoneHubPermissionsSetupFlowScreens in
-// chrome/browser/resources/settings/chromeos/multidevice_page/
+// chrome/browser/resources/ash/settings/multidevice_page/
 // multidevice_constants.js
 enum class PermissionsOnboardingSetUpMode {
   kNone = 0,
@@ -99,7 +99,7 @@ enum class PermissionsOnboardingSetUpMode {
 };
 
 // Keep in sync with PhoneHubPermissionsSetupFlowScreens in
-// chrome/browser/resources/settings/chromeos/multidevice_page/
+// chrome/browser/resources/ash/settings/multidevice_page/
 // multidevice_constants.js
 enum class PermissionsOnboardingStep {
   kUnknown = 0,
@@ -116,7 +116,7 @@ enum class PermissionsOnboardingStep {
 // numeric values should never be reused.
 // Keep in sync with corresponding enum in tools/metrics/histograms/enums.xml.
 // Keep in sync with PhoneHubPermissionsSetupAction in
-// chrome/browser/resources/settings/chromeos/multidevice_page/
+// chrome/browser/resources/ash/settings/multidevice_page/
 // multidevice_constants.js
 enum class PermissionsOnboardingScreenEvent {
   kUnknown = 0,

docs/accessibility/os/switch_access.md

@@ -79,7 +79,7 @@ Switch Access code lives mainly in four places:
 - The Switch Access menu and back button code, in `ash/system/accessibility/`
 
 - The Switch Access settings page,
-`chrome/browser/resources/settings/chromeos/os_a11y_page/switch_access_subpage.*`
+`chrome/browser/resources/ash/settings/os_a11y_page/switch_access_subpage.*`
 
 
 ### Tests