BASELINE: Update Chromium to 114.0.5735.248

Change-Id: Ie7ddd5d87175d4bde196f774c742cdbb9d5d311a
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/495463
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

3 files changed, 131 insertions, 170 deletions

diff --git a/chromium/chrome/browser/resources/settings/BUILD.gn b/chromium/chrome/browser/resources/settings/BUILD.gn
index ec72da2b743..8c34f24ad81 100644
--- a/chromium/chrome/browser/resources/settings/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/BUILD.gn
@@ -20,6 +20,7 @@ build_webui("build") {
     "images/cookies_banner_dark.svg",
     "images/cookies_banner.svg",
     "images/googleg_standard_clr_32px.svg",
+    "images/iban.svg",
     "images/password_check_neutral_dark.svg",
     "images/password_check_neutral.svg",
     "images/password_check_positive_dark.svg",
@@ -83,12 +84,12 @@ build_webui("build") {
     "autofill_page/credit_card_list_entry.ts",
     "autofill_page/iban_edit_dialog.ts",
     "autofill_page/iban_list_entry.ts",
-    "autofill_page/local_credit_card_remove_confirmation_dialog.ts",
     "autofill_page/password_check_edit_disclaimer_dialog.ts",
     "autofill_page/password_check_list_item.ts",
     "autofill_page/password_check.ts",
     "autofill_page/password_edit_dialog.ts",
     "autofill_page/password_list_item.ts",
+    "autofill_page/password_preview_item.ts",
     "autofill_page/password_move_multiple_passwords_to_account_dialog.ts",
     "autofill_page/password_move_to_account_dialog.ts",
     "autofill_page/password_remove_confirmation_dialog.ts",
@@ -109,9 +110,7 @@ build_webui("build") {
     "clear_browsing_data_dialog/passwords_deletion_dialog.ts",
     "controls/controlled_button.ts",
     "controls/controlled_radio_button.ts",
-    "controls/extension_controlled_indicator.ts",
     "controls/settings_checkbox.ts",
-    "controls/settings_dropdown_menu.ts",
     "controls/settings_radio_group.ts",
     "controls/settings_slider.ts",
     "controls/settings_toggle_button.ts",
@@ -134,11 +133,9 @@ build_webui("build") {
     "privacy_page/anti_abuse_page.ts",
     "privacy_page/collapse_radio_button.ts",
     "privacy_page/cookies_page.ts",
-    "privacy_page/disable_safebrowsing_dialog.ts",
     "privacy_page/do_not_track_toggle.ts",
     "privacy_page/personalization_options.ts",
     "privacy_page/preloading_page.ts",
-    "privacy_page/privacy_guide_promo.ts",
     "privacy_page/privacy_guide/privacy_guide_completion_fragment.ts",
     "privacy_page/privacy_guide/privacy_guide_completion_link_row.ts",
     "privacy_page/privacy_guide/privacy_guide_cookies_fragment.ts",
@@ -147,6 +144,7 @@ build_webui("build") {
     "privacy_page/privacy_guide/privacy_guide_history_sync_fragment.ts",
     "privacy_page/privacy_guide/privacy_guide_msbb_fragment.ts",
     "privacy_page/privacy_guide/privacy_guide_page.ts",
+    "privacy_page/privacy_guide/privacy_guide_promo.ts",
     "privacy_page/privacy_guide/privacy_guide_safe_browsing_fragment.ts",
     "privacy_page/privacy_guide/privacy_guide_welcome_fragment.ts",
     "privacy_page/privacy_guide/step_indicator.ts",
@@ -182,7 +180,6 @@ build_webui("build") {
     "safety_check_page/safety_check_unused_site_permissions.ts",
     "safety_check_page/safety_check_updates_child.ts",
     "search_engines_page/omnibox_extension_entry.ts",
-    "search_engines_page/search_engine_delete_confirmation_dialog.ts",
     "search_engines_page/search_engine_edit_dialog.ts",
     "search_engines_page/search_engine_entry.ts",
     "search_engines_page/search_engines_list.ts",
@@ -194,6 +191,7 @@ build_webui("build") {
     "settings_page/settings_section.ts",
     "settings_page/settings_subpage.ts",
     "settings_ui/settings_ui.ts",
+    "simple_confirmation_dialog.ts",
     "site_favicon.ts",
     "site_settings/add_site_dialog.ts",
     "site_settings/all_sites.ts",
@@ -203,6 +201,9 @@ build_webui("build") {
     "site_settings/chooser_exception_list.ts",
     "site_settings/site_details_permission_device_entry.ts",
     "site_settings/edit_exception_dialog.ts",
+    "site_settings/file_system_site_entry.ts",
+    "site_settings/file_system_site_entry_item.ts",
+    "site_settings/file_system_site_list.ts",
     "site_settings/media_picker.ts",
     "site_settings/review_notification_permissions.ts",
     "site_settings_page/recent_site_permissions.ts",
@@ -223,6 +224,7 @@ build_webui("build") {
 
   if (!is_chromeos_ash) {
     web_component_files += [
+      "a11y_page/live_translate_section.ts",
       "people_page/manage_profile.ts",
       "relaunch_confirmation_dialog.ts",
       "languages_page/add_languages_dialog.ts",
@@ -257,24 +259,22 @@ build_webui("build") {
     ]
   }
   if (is_win || is_mac) {
-    web_component_files += [
-      "autofill_page/passkeys_subpage.ts",
-      "autofill_page/passkeys_delete_confirmation_dialog.ts",
-    ]
+    web_component_files += [ "autofill_page/passkeys_subpage.ts" ]
   }
   if (is_chromeos) {
     web_component_files += [ "controls/password_prompt_dialog.ts" ]
   }
+  if (is_chrome_branded) {
+    web_component_files += [ "get_most_chrome_page/get_most_chrome_page.ts" ]
+  }
 
   # -----------------web_component_files end ----------------------------------
 
   # -----------------non_web_component_files start ----------------------------
 
   non_web_component_files = [
-    "a11y_page/captions_browser_proxy.ts",
     "about_page/about_page_browser_proxy.ts",
     "appearance_page/appearance_browser_proxy.ts",
-    "appearance_page/fonts_browser_proxy.ts",
     "autofill_page/address_edit_dialog_components.ts",
     "autofill_page/autofill_manager_proxy.ts",
     "autofill_page/merge_passwords_store_copies_mixin.ts",
@@ -287,34 +287,23 @@ build_webui("build") {
     "autofill_page/show_password_mixin.ts",
     "base_mixin.ts",
     "clear_browsing_data_dialog/clear_browsing_data_browser_proxy.ts",
-    "controls/cr_policy_pref_mixin.ts",
-    "controls/pref_control_mixin.ts",
-    "controls/settings_boolean_control_mixin.ts",
     "controls/settings_idle_load.ts",
     "downloads_page/downloads_browser_proxy.ts",
     "ensure_lazy_loaded.ts",
-    "extension_control_browser_proxy.ts",
     "focus_config.ts",
     "global_scroll_target_mixin.ts",
     "hats_browser_proxy.ts",
     "i18n_setup.ts",
     "lazy_load.ts",
-    "lifetime_browser_proxy.ts",
     "metrics_browser_proxy.ts",
     "on_startup_page/on_startup_browser_proxy.ts",
     "on_startup_page/startup_urls_page_browser_proxy.ts",
     "page_visibility.ts",
-    "people_page/sync_browser_proxy.ts",
-    "people_page/profile_info_browser_proxy.ts",
     "performance_page/performance_browser_proxy.ts",
     "performance_page/performance_metrics_proxy.ts",
-    "prefs/prefs_mixin.ts",
-    "prefs/prefs.ts",
-    "prefs/prefs_types.ts",
-    "prefs/pref_util.ts",
     "privacy_page/privacy_guide/constants.ts",
+    "privacy_page/privacy_guide/privacy_guide_availability_mixin.ts",
     "privacy_page/privacy_guide/privacy_guide_browser_proxy.ts",
-    "privacy_page/privacy_page_browser_proxy.ts",
     "privacy_page/privacy_sandbox/privacy_sandbox_browser_proxy.ts",
     "privacy_page/security_keys_browser_proxy.ts",
     "privacy_sandbox/icons.html.ts",
@@ -322,6 +311,7 @@ build_webui("build") {
     "reset_page/reset_browser_proxy.ts",
     "route.ts",
     "router.ts",
+    "safety_check_page/extensions_safety_check_browser_proxy.ts",
     "safety_check_page/safety_check_browser_proxy.ts",
     "search_engines_page/search_engines_browser_proxy.ts",
     "search_settings.ts",
@@ -408,11 +398,13 @@ build_webui("build") {
   }
 
   ts_deps = [
+    "//chrome/browser/resources/settings_shared:build_ts",
     "//third_party/polymer/v3_0:library",
     "//ui/webui/resources/cr_components/help_bubble:build_ts",
     "//ui/webui/resources/cr_components/localized_link:build_ts",
     "//ui/webui/resources/cr_components/managed_dialog:build_ts",
     "//ui/webui/resources/cr_components/managed_footnote:build_ts",
+    "//ui/webui/resources/cr_components/settings_prefs:build_ts",
     "//ui/webui/resources/cr_elements:build_ts",
     "//ui/webui/resources/js:build_ts",
   ]
@@ -420,6 +412,8 @@ build_webui("build") {
   if (!is_chromeos_ash) {
     ts_deps +=
         [ "//ui/webui/resources/cr_components/customize_themes:build_ts" ]
+  } else {
+    ts_deps += [ "//ash/webui/common/resources:build_ts" ]
   }
 
   if (use_nss_certs) {
@@ -427,6 +421,11 @@ build_webui("build") {
         [ "//ui/webui/resources/cr_components/certificate_manager:build_ts" ]
   }
 
+  ts_path_mappings =
+      [ "/shared/settings/*|" + rebase_path(
+            "$root_gen_dir/chrome/browser/resources/settings_shared/tsc/*",
+            target_gen_dir) ]
+
   if (is_chromeos_ash) {
     # TODO(crbug.com/1013466): Browser Settings should not depend on ash/webui/
     # code. The codepath needing this (in people_page.ts) should be removed when
@@ -449,5 +448,11 @@ build_webui("build") {
     ]
     optimize_webui_excludes =
         [ "chrome://resources/mojo/skia/public/mojom/skcolor.mojom-webui.js" ]
+    optimize_webui_external_paths =
+        [ "/shared/settings|" + rebase_path(
+              "$root_gen_dir/chrome/browser/resources/settings_shared/tsc",
+              root_build_dir) ]
   }
+
+  enable_source_maps = enable_webui_inline_sourcemaps
 }
diff --git a/chromium/chrome/browser/resources/settings/chromeos/BUILD.gn b/chromium/chrome/browser/resources/settings/chromeos/BUILD.gn
index e19f8422db3..c39df3f42fc 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/BUILD.gn
+++ b/chromium/chrome/browser/resources/settings/chromeos/BUILD.gn
@@ -23,6 +23,9 @@ tsc_input_dir = "$target_gen_dir/$tsc_input_folder"
 tsc_output_folder = "tsc"
 tsc_output_dir = "$target_gen_dir/$tsc_output_folder"
 
+nearby_share_tsc_dir =
+    "$root_gen_dir/chrome/browser/resources/nearby_share/shared/tsc"
+
 if (optimize_webui) {
   build_manifest_v3 = "build_v3_manifest.json"
 
@@ -41,12 +44,12 @@ if (optimize_webui) {
       "chrome://resources/ash/common/bluetooth/cros_bluetooth_config.js",
       "chrome://resources/ash/common/cellular_setup/mojo_interface_provider.js",
       "chrome://resources/ash/common/hotspot/cros_hotspot_config.js",
+      "chrome://resources/ash/common/hotspot/cros_hotspot_config.mojom-webui.js",
       "chrome://resources/ash/common/network/mojo_interface_provider.js",
       "chrome://resources/mojo/chromeos/ash/services/cellular_setup/public/mojom/cellular_setup.mojom-webui.js",
       "chrome://resources/mojo/chromeos/ash/services/cellular_setup/public/mojom/esim_manager.mojom-webui.js",
       "chrome://resources/mojo/chromeos/ash/services/auth_factor_config/public/mojom/auth_factor_config.mojom-webui.js",
       "chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js",
-      "chrome://resources/mojo/chromeos/ash/services/hotspot_config/public/mojom/cros_hotspot_config.mojom-webui.js",
       "chrome://resources/mojo/chromeos/ash/services/nearby/public/mojom/nearby_share_settings.mojom-webui.js",
       "chrome://resources/mojo/chromeos/ash/services/nearby/public/mojom/nearby_share_target_types.mojom-webui.js",
       "chrome://resources/mojo/chromeos/services/network_config/public/mojom/cros_network_config.mojom-webui.js",
@@ -55,26 +58,32 @@ if (optimize_webui) {
       "chrome://resources/mojo/mojo/public/mojom/base/time.mojom-webui.js",
       "chrome://resources/mojo/services/network/public/mojom/ip_address.mojom-webui.js",
       "chrome://resources/mojo/skia/public/mojom/skcolor.mojom-webui.js",
-      "mojo/nearby_share.mojom-webui.js",
+    ]
+    external_paths = [
+      "/shared/settings|" + rebase_path(
+              "$root_gen_dir/chrome/browser/resources/settings_shared/tsc",
+              root_build_dir),
+      "/shared/|" + rebase_path(nearby_share_tsc_dir, root_build_dir),
     ]
   }
 }
 
 # TypeScript Build Configuration
 ts_library("build_ts") {
-  allow_js = true
-  tsconfig_base = "tsconfig_base.json"
+  tsconfig_base = "//tools/typescript/tsconfig_base_polymer.json"
   deps = [
-    "//ash/webui/common/resources/hotspot:build_ts",
+    "//ash/webui/common/resources:build_ts",
     "//chrome/browser/resources/nearby_share/shared:build_ts",
+    "//chrome/browser/resources/settings_shared:build_ts",
     "//third_party/polymer/v3_0:library",
     "//ui/webui/resources/cr_components/app_management:build_ts",
     "//ui/webui/resources/cr_components/color_change_listener:build_ts",
     "//ui/webui/resources/cr_components/localized_link:build_ts",
     "//ui/webui/resources/cr_components/managed_footnote:build_ts",
+    "//ui/webui/resources/cr_components/settings_prefs:build_ts",
     "//ui/webui/resources/cr_elements:build_ts",
     "//ui/webui/resources/js:build_ts",
-    "//ui/webui/resources/mojo:library",
+    "//ui/webui/resources/mojo:build_ts",
   ]
   extra_deps = [
     ":generate_css_wrapper_files",
@@ -82,20 +91,23 @@ ts_library("build_ts") {
     ":generate_mojom_webui",
     ":preprocess",
     "//ash/webui/common/resources:generate_definitions",
-    "//chrome/browser/resources/nearby_share:generate_definitions",
   ]
   path_mappings = [
-    # Additional path mappings for Nearby share Mojo files
-    "/mojo/nearby_share*|" + rebase_path(
-            "$root_gen_dir/chrome/browser/resources/nearby_share/preprocessed/mojom-webui/chrome/browser/ui/webui/nearby_share/nearby_share*",
+    "/shared/settings/*|" + rebase_path(
+            "$root_gen_dir/chrome/browser/resources/settings_shared/tsc/*",
             target_gen_dir),
+
+    # Additional path mappings for Nearby share code
+    "/shared/*|" + rebase_path("$nearby_share_tsc_dir/*", target_gen_dir),
   ]
   definitions = ts_definition_files
   root_dir = tsc_input_dir
-  in_files = src_ts_files + html_wrapper_files + css_wrapper_files +
-             mojom_webui_files + shared_nearby_share_files
+  in_files =
+      src_ts_files + html_wrapper_files + css_wrapper_files + mojom_webui_files
   out_dir = tsc_output_dir
 
+  # Allows .d.ts files to be generated for output JS files, so this build target
+  # can be referenced by other ts_library() targets (e.g. browser tests)
   composite = true
 }
 
@@ -127,48 +139,35 @@ css_to_wrapper("generate_css_wrapper_files") {
 group("generate_mojom_webui") {
   public_deps = [
     ":copy_mojom_ts",
-    ":generate_ash_search_mojo_webui",
-    ":generate_input_device_settings_mojom",
     ":generate_personalization_search_mojom",
-    ":generate_settings_mojo_webui",
+    ":generate_search_mojom",
   ]
 }
 
 # Copy generated Mojo TS bindings to $tsc_input_dir/mojom-webui/ dir
 copy("copy_mojom_ts") {
   deps = [
+    "//ash/public/mojom:input_device_settings_ts__generator",
+    "//chrome/browser/ui/webui/settings/ash/files_page/mojom:mojom_ts__generator",
+    "//chrome/browser/ui/webui/settings/ash/input_device_settings:mojom_ts__generator",
     "//chrome/browser/ui/webui/settings/ash/os_apps_page/mojom:mojom_ts__generator",
+    "//chrome/browser/ui/webui/settings/chromeos/constants:mojom_ts__generator",
     "//chromeos/ash/components/audio/public/mojom:mojom_ts__generator",
+    "//chromeos/ash/components/drivefs/mojom:pin_manager_types_ts__generator",
+    "//ui/events/ash/mojom:mojom_ts__generator",
   ]
   sources = [
+    "$root_gen_dir/ash/public/mojom/input_device_settings.mojom-webui.ts",
+    "$root_gen_dir/chrome/browser/ui/webui/settings/ash/files_page/mojom/google_drive_handler.mojom-webui.ts",
+    "$root_gen_dir/chrome/browser/ui/webui/settings/ash/input_device_settings/input_device_settings_provider.mojom-webui.ts",
     "$root_gen_dir/chrome/browser/ui/webui/settings/ash/os_apps_page/mojom/app_notification_handler.mojom-webui.ts",
+    "$root_gen_dir/chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom-webui.ts",
+    "$root_gen_dir/chrome/browser/ui/webui/settings/chromeos/constants/setting.mojom-webui.ts",
     "$root_gen_dir/chromeos/ash/components/audio/public/mojom/cros_audio_config.mojom-webui.ts",
+    "$root_gen_dir/chromeos/ash/components/drivefs/mojom/pin_manager_types.mojom-webui.ts",
+    "$root_gen_dir/ui/events/ash/mojom/modifier_key.mojom-webui.ts",
   ]
-  outputs = [ "$tsc_input_dir/mojom-webui/{{source_file_part}}" ]
-}
-
-copy("generate_input_device_settings_mojom") {
-  deps = [
-    "//ash/public/mojom:input_device_settings_webui_js",
-    "//chrome/browser/ui/webui/settings/ash/input_device_settings:mojom_ts__generator",
-    "//ui//chromeos/events/mojom:mojom_webui_js",
-  ]
-  sources = [
-    "$root_gen_dir/chrome/browser/ui/webui/settings/ash/input_device_settings/input_device_settings_provider.mojom-webui.ts",
-    "$root_gen_dir/mojom-webui/ash/public/mojom/input_device_settings.mojom-webui.js",
-    "$root_gen_dir/mojom-webui/ui/chromeos/events/mojom/modifier_key.mojom-webui.js",
-  ]
-  outputs = [ "$tsc_input_dir/mojom-webui/{{source_file_part}}" ]
-}
-
-copy("generate_settings_mojo_webui") {
-  deps =
-      [ "//chrome/browser/ui/webui/settings/chromeos/constants:mojom_webui_js" ]
-  sources = [
-    "$root_gen_dir/mojom-webui/chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom-webui.js",
-    "$root_gen_dir/mojom-webui/chrome/browser/ui/webui/settings/chromeos/constants/setting.mojom-webui.js",
-  ]
-  outputs = [ "$tsc_input_dir/mojom-webui/{{source_file_part}}" ]
+  outputs = [ "$tsc_input_dir/chromeos/mojom-webui/{{source_file_part}}" ]
 }
 
 copy("generate_personalization_search_mojom") {
@@ -177,20 +176,20 @@ copy("generate_personalization_search_mojom") {
   sources = [
     "$root_gen_dir/ash/webui/personalization_app/search/search.mojom-webui.ts",
   ]
-  outputs = [
-    "$tsc_input_dir/mojom-webui/search/personalization_search.mojom-webui.ts",
-  ]
+  outputs = [ "$tsc_input_dir/chromeos/mojom-webui/search/personalization_search.mojom-webui.ts" ]
 }
 
-copy("generate_ash_search_mojo_webui") {
-  deps =
-      [ "//chrome/browser/ui/webui/settings/ash/search:mojo_bindings_webui_js" ]
+copy("generate_search_mojom") {
+  deps = [
+    "//chrome/browser/ui/webui/settings/ash/search:mojo_bindings_ts__generator",
+  ]
   sources = [
-    "$root_gen_dir/mojom-webui/chrome/browser/ui/webui/settings/ash/search/search.mojom-webui.js",
-    "$root_gen_dir/mojom-webui/chrome/browser/ui/webui/settings/ash/search/search_result_icon.mojom-webui.js",
-    "$root_gen_dir/mojom-webui/chrome/browser/ui/webui/settings/ash/search/user_action_recorder.mojom-webui.js",
+    "$root_gen_dir/chrome/browser/ui/webui/settings/ash/search/search.mojom-webui.ts",
+    "$root_gen_dir/chrome/browser/ui/webui/settings/ash/search/search_result_icon.mojom-webui.ts",
+    "$root_gen_dir/chrome/browser/ui/webui/settings/ash/search/user_action_recorder.mojom-webui.ts",
   ]
-  outputs = [ "$tsc_input_dir/mojom-webui/search/{{source_file_part}}" ]
+  outputs =
+      [ "$tsc_input_dir/chromeos/mojom-webui/search/{{source_file_part}}" ]
 }
 
 grit("resources") {
@@ -255,14 +254,8 @@ generate_grd("build_grd") {
     "os_settings_v3.html",
   ]
   input_files_base_dir = rebase_path(".", "//")
-  deps = [
-    "../../nearby_share:build_mojo_grdp",
-    "../../nearby_share/shared:build_json_grdp",
-  ]
-  grdp_files = [
-    "$root_gen_dir/chrome/browser/resources/nearby_share/nearby_share_mojo_resources.grdp",
-    "$root_gen_dir/chrome/browser/resources/nearby_share/shared/nearby_share_json_resources.grdp",
-  ]
+  deps = [ "//chrome/browser/resources/nearby_share/shared:build_json_grdp" ]
+  grdp_files = [ "$root_gen_dir/chrome/browser/resources/nearby_share/shared/nearby_share_json_resources.grdp" ]
   manifest_files = []
   resource_path_rewrites =
       [ "os_settings_v3.html|chromeos/os_settings_v3.html" ]
@@ -278,11 +271,11 @@ generate_grd("build_grd") {
   } else {
     deps += [
       ":build_ts",
-      "//chrome/browser/resources/nearby_share/shared:build_v3_grdp",
+      "//chrome/browser/resources/nearby_share/shared:build_grdp",
     ]
-    grdp_files += [ "$root_gen_dir/chrome/browser/resources/nearby_share/shared/nearby_share_resources_v3.grdp" ]
-    manifest_files += [ "$target_gen_dir/build_ts.manifest" ]
-    resource_path_rewrites += [ "chromeos/os_settings.html|os_settings.html" ]
+    grdp_files += [ "$root_gen_dir/chrome/browser/resources/nearby_share/shared/resources.grdp" ]
+    manifest_files +=
+        filter_include(get_target_outputs(":build_ts"), [ "*.manifest" ])
   }
 }
 
diff --git a/chromium/chrome/browser/resources/settings/chromeos/os_settings.gni b/chromium/chrome/browser/resources/settings/chromeos/os_settings.gni
index 1e622a9bb6c..8319a21dd0b 100644
--- a/chromium/chrome/browser/resources/settings/chromeos/os_settings.gni
+++ b/chromium/chrome/browser/resources/settings/chromeos/os_settings.gni
@@ -2,8 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("../settings.gni")
-
 ts_definition_files = [
   "//tools/typescript/definitions/bluetooth.d.ts",
   "//tools/typescript/definitions/bluetooth_private.d.ts",
@@ -37,6 +35,7 @@ web_component_files = [
   "chromeos/crostini_page/crostini_port_forwarding_add_port_dialog.ts",
   "chromeos/crostini_page/crostini_subpage.ts",
   "chromeos/date_time_page/date_time_page.ts",
+  "chromeos/date_time_page/system_geolocation_dialog.ts",
   "chromeos/date_time_page/timezone_selector.ts",
   "chromeos/date_time_page/timezone_subpage.ts",
   "chromeos/device_page/audio.ts",
@@ -56,11 +55,11 @@ web_component_files = [
   "chromeos/device_page/per_device_touchpad_subsection.ts",
   "chromeos/device_page/pointers.ts",
   "chromeos/device_page/power.ts",
+  "chromeos/device_page/keyboard_remap_modifier_key_row.ts",
   "chromeos/device_page/storage.ts",
   "chromeos/device_page/storage_external.ts",
   "chromeos/device_page/storage_external_entry.ts",
   "chromeos/device_page/stylus.ts",
-  "chromeos/google_assistant_page/google_assistant_page.ts",
   "chromeos/guest_os/guest_os_container_select.ts",
   "chromeos/guest_os/guest_os_shared_paths.ts",
   "chromeos/guest_os/guest_os_shared_usb_devices.ts",
@@ -77,11 +76,13 @@ web_component_files = [
   "chromeos/internet_page/hotspot_summary_item.ts",
   "chromeos/internet_page/internet_config.ts",
   "chromeos/internet_page/internet_detail_menu.ts",
-  "chromeos/internet_page/internet_detail_page.ts",
-  "chromeos/internet_page/internet_known_networks_page.ts",
+  "chromeos/internet_page/internet_detail_subpage.ts",
+  "chromeos/internet_page/internet_known_networks_subpage.ts",
   "chromeos/internet_page/internet_page.ts",
   "chromeos/internet_page/internet_subpage.ts",
+  "chromeos/internet_page/internet_subpage_menu.ts",
   "chromeos/internet_page/network_always_on_vpn.ts",
+  "chromeos/internet_page/network_device_info_dialog.ts",
   "chromeos/internet_page/network_proxy_section.ts",
   "chromeos/internet_page/network_summary_item.ts",
   "chromeos/internet_page/network_summary.ts",
@@ -103,6 +104,7 @@ web_component_files = [
   "chromeos/multidevice_page/multidevice_subpage.ts",
   "chromeos/multidevice_page/multidevice_task_continuation_disabled_link.ts",
   "chromeos/multidevice_page/multidevice_task_continuation_item.ts",
+  "chromeos/multidevice_page/multidevice_task_continuation_item_lacros.ts",
   "chromeos/multidevice_page/multidevice_tether_item.ts",
   "chromeos/multidevice_page/multidevice_wifi_sync_disabled_link.ts",
   "chromeos/multidevice_page/multidevice_wifi_sync_item.ts",
@@ -115,10 +117,12 @@ web_component_files = [
   "chromeos/nearby_share_page/nearby_share_subpage.ts",
   "chromeos/os_a11y_page/audio_and_captions_page.ts",
   "chromeos/os_a11y_page/change_dictation_locale_dialog.ts",
+  "chromeos/os_a11y_page/chromevox_subpage.ts",
+  "chromeos/os_a11y_page/bluetooth_braille_display_ui.ts",
   "chromeos/os_a11y_page/cursor_and_touchpad_page.ts",
   "chromeos/os_a11y_page/display_and_magnification_page.ts",
   "chromeos/os_a11y_page/keyboard_and_text_input_page.ts",
-  "chromeos/os_a11y_page/manage_a11y_page.ts",
+  "chromeos/os_a11y_page/manage_a11y_subpage.ts",
   "chromeos/os_a11y_page/os_a11y_page.ts",
   "chromeos/os_a11y_page/select_to_speak_subpage.ts",
   "chromeos/os_a11y_page/switch_access_action_assignment_dialog.ts",
@@ -130,7 +134,8 @@ web_component_files = [
   "chromeos/os_a11y_page/tts_subpage.ts",
   "chromeos/os_about_page/channel_switcher_dialog.ts",
   "chromeos/os_about_page/consumer_auto_update_toggle_dialog.ts",
-  "chromeos/os_about_page/detailed_build_info.ts",
+  "chromeos/os_about_page/detailed_build_info_subpage.ts",
+  "chromeos/os_about_page/eol_offer_section.ts",
   "chromeos/os_about_page/edit_hostname_dialog.ts",
   "chromeos/os_about_page/os_about_page.ts",
   "chromeos/os_about_page/update_warning_dialog.ts",
@@ -172,6 +177,8 @@ web_component_files = [
   "chromeos/os_files_page/office_page.ts",
   "chromeos/os_files_page/os_files_page.ts",
   "chromeos/os_files_page/smb_shares_page.ts",
+  "chromeos/os_files_page/google_drive_subpage.ts",
+  "chromeos/os_files_page/google_drive_confirmation_dialog.ts",
   "chromeos/os_languages_page/add_input_methods_dialog.ts",
   "chromeos/os_languages_page/add_items_dialog.ts",
   "chromeos/os_languages_page/add_spellcheck_languages_dialog.ts",
@@ -186,21 +193,20 @@ web_component_files = [
   "chromeos/os_languages_page/os_languages_page_v2.ts",
   "chromeos/os_languages_page/os_languages_section.ts",
   "chromeos/os_languages_page/smart_inputs_page.ts",
-  "chromeos/os_people_page/account_manager.ts",
-  "chromeos/os_people_page/fingerprint_list.ts",
+  "chromeos/os_people_page/account_manager_subpage.ts",
+  "chromeos/os_people_page/add_user_dialog.ts",
+  "chromeos/os_people_page/fingerprint_list_subpage.ts",
   "chromeos/os_people_page/local_data_recovery_dialog.ts",
-  "chromeos/os_people_page/lock_screen.ts",
+  "chromeos/os_people_page/lock_screen_subpage.ts",
   "chromeos/os_people_page/lock_screen_password_prompt_dialog.ts",
   "chromeos/os_people_page/os_people_page.ts",
   "chromeos/os_people_page/os_personalization_options.ts",
-  "chromeos/os_people_page/os_signout_dialog.ts",
-  "chromeos/os_people_page/os_sync_controls.ts",
+  "chromeos/os_people_page/os_sync_controls_subpage.ts",
   "chromeos/os_people_page/os_sync_encryption_options.ts",
-  "chromeos/os_people_page/os_sync_page.ts",
+  "chromeos/os_people_page/os_sync_subpage.ts",
   "chromeos/os_people_page/pin_autosubmit_dialog.ts",
   "chromeos/os_people_page/setup_fingerprint_dialog.ts",
   "chromeos/os_people_page/setup_pin_dialog.ts",
-  "chromeos/os_people_page/users_add_user_dialog.ts",
   "chromeos/os_people_page/user_list.ts",
   "chromeos/os_printing_page/cups_add_print_server_dialog.ts",
   "chromeos/os_printing_page/cups_add_printer_dialog.ts",
@@ -215,15 +221,16 @@ web_component_files = [
   "chromeos/os_printing_page/cups_saved_printers.ts",
   "chromeos/os_printing_page/cups_settings_add_printer_dialog.ts",
   "chromeos/os_printing_page/os_printing_page.ts",
-  "chromeos/os_privacy_page/manage_users_page.ts",
+  "chromeos/os_privacy_page/manage_users_subpage.ts",
   "chromeos/os_privacy_page/metrics_consent_toggle_button.ts",
   "chromeos/os_privacy_page/os_privacy_page.ts",
   "chromeos/os_privacy_page/peripheral_data_access_protection_dialog.ts",
-  "chromeos/os_privacy_page/privacy_hub_page.ts",
-  "chromeos/os_privacy_page/smart_privacy_page.ts",
+  "chromeos/os_privacy_page/privacy_hub_subpage.ts",
+  "chromeos/os_privacy_page/smart_privacy_subpage.ts",
   "chromeos/os_reset_page/os_powerwash_dialog.ts",
   "chromeos/os_reset_page/os_powerwash_dialog_esim_item.ts",
   "chromeos/os_reset_page/os_reset_page.ts",
+  "chromeos/os_search_page/google_assistant_subpage.ts",
   "chromeos/os_search_page/os_search_page.ts",
   "chromeos/os_search_page/os_search_selection_dialog.ts",
   "chromeos/os_search_page/search_engine.ts",
@@ -248,15 +255,12 @@ web_component_files = [
   "a11y_page/live_caption_section.ts",
   "controls/controlled_button.ts",
   "controls/controlled_radio_button.ts",
-  "controls/extension_controlled_indicator.ts",
   "controls/password_prompt_dialog.ts",
-  "controls/settings_dropdown_menu.ts",
   "controls/settings_radio_group.ts",
   "controls/settings_slider.ts",
   "controls/settings_toggle_button.ts",
   "privacy_page/secure_dns.ts",
   "privacy_page/secure_dns_input.ts",
-  "site_favicon.ts",
 ]
 
 # HTML files that are passed as input to html_to_wrapper().
@@ -280,6 +284,7 @@ foreach(f, html_files) {
 
 # CSS files that are passed as input to css_to_wrapper().
 css_files = [
+  "chromeos/device_page/input_device_settings_shared.css",
   "chromeos/internet_page/internet_shared.css",
   "chromeos/os_apps_page/app_management_page/app_management_cros_shared_style.css",
   "chromeos/os_apps_page/app_management_page/app_management_cros_shared_vars.css",
@@ -304,6 +309,7 @@ non_web_component_files = [
   "chromeos/assert_extras.ts",
   "chromeos/common/global_scroll_target_mixin.ts",
   "chromeos/common/types.ts",
+  "chromeos/os_files_page/google_drive_browser_proxy.ts",
   "chromeos/crostini_page/crostini_browser_proxy.ts",
   "chromeos/crostini_page/crostini_shared_usb_devices.ts",
   "chromeos/date_time_page/date_time_types.ts",
@@ -318,8 +324,9 @@ non_web_component_files = [
   "chromeos/device_page/fake_input_device_settings_provider.ts",
   "chromeos/device_page/input_device_mojo_interface_provider.ts",
   "chromeos/device_page/input_device_settings_types.ts",
+  "chromeos/device_page/input_device_settings_utils.ts",
   "chromeos/ensure_lazy_loaded.ts",
-  "chromeos/google_assistant_page/google_assistant_browser_proxy.ts",
+  "chromeos/focus_config.ts",
   "chromeos/guest_os/guest_os_browser_proxy.ts",
   "chromeos/internet_page/cellular_setup_settings_delegate.ts",
   "chromeos/internet_page/internet_page_browser_proxy.ts",
@@ -339,13 +346,15 @@ non_web_component_files = [
   "chromeos/os_a11y_page/audio_and_captions_page_browser_proxy.ts",
   "chromeos/os_a11y_page/cursor_and_touchpad_page_browser_proxy.ts",
   "chromeos/os_a11y_page/keyboard_and_text_input_page_browser_proxy.ts",
-  "chromeos/os_a11y_page/manage_a11y_page_browser_proxy.ts",
+  "chromeos/os_a11y_page/manage_a11y_subpage_browser_proxy.ts",
   "chromeos/os_a11y_page/os_a11y_page_browser_proxy.ts",
   "chromeos/os_a11y_page/switch_access_constants.ts",
   "chromeos/os_a11y_page/switch_access_subpage_browser_proxy.ts",
   "chromeos/os_a11y_page/switch_access_types.ts",
   "chromeos/os_a11y_page/text_to_speech_page_browser_proxy.ts",
   "chromeos/os_a11y_page/tts_subpage_browser_proxy.ts",
+  "chromeos/os_a11y_page/chromevox_subpage_browser_proxy.ts",
+  "chromeos/os_a11y_page/bluetooth_braille_display_manager.ts",
   "chromeos/os_a11y_page/select_to_speak_subpage_browser_proxy.ts",
   "chromeos/os_about_page/about_page_browser_proxy.ts",
   "chromeos/os_about_page/device_name_browser_proxy.ts",
@@ -354,7 +363,6 @@ non_web_component_files = [
   "chromeos/os_apps_page/app_management_page/actions.ts",
   "chromeos/os_apps_page/app_management_page/api_listener.ts",
   "chromeos/os_apps_page/app_management_page/browser_proxy.ts",
-  "chromeos/os_apps_page/app_management_page/fake_page_handler.ts",
   "chromeos/os_apps_page/app_management_page/plugin_vm_page/plugin_vm_browser_proxy.ts",
   "chromeos/os_apps_page/app_management_page/reducers.ts",
   "chromeos/os_apps_page/app_management_page/store.ts",
@@ -379,15 +387,18 @@ non_web_component_files = [
   "chromeos/os_printing_page/cups_printers_browser_proxy.ts",
   "chromeos/os_printing_page/cups_printers_entry_list_mixin.ts",
   "chromeos/os_printing_page/cups_printers_entry_manager.ts",
+  "chromeos/os_printing_page/printer_status.ts",
   "chromeos/os_privacy_page/media_devices_proxy.ts",
   "chromeos/os_privacy_page/metrics_consent_browser_proxy.ts",
   "chromeos/os_privacy_page/peripheral_data_access_browser_proxy.ts",
   "chromeos/os_privacy_page/privacy_hub_browser_proxy.ts",
   "chromeos/os_reset_page/os_reset_browser_proxy.ts",
+  "chromeos/os_search_page/google_assistant_browser_proxy.ts",
   "chromeos/os_search_page/search_engines_browser_proxy.ts",
   "chromeos/os_settings_routes.ts",
   "chromeos/os_settings_search_box/os_settings_search_box_browser_proxy.ts",
   "chromeos/os_settings.ts",
+  "chromeos/os_settings_ui/os_settings_hats_browser_proxy.ts",
   "chromeos/parental_controls_page/parental_controls_browser_proxy.ts",
   "chromeos/personalization_page/personalization_hub_browser_proxy.ts",
   "chromeos/route_observer_mixin.ts",
@@ -397,71 +408,23 @@ non_web_component_files = [
   "chromeos/search/personalization_search_handler.ts",
   "chromeos/search/settings_search_handler.ts",
   "chromeos/setting_id_param_util.ts",
-
-  # Files below are from Browser Settings and shared with ChromeOS Settings
-  "appearance_page/fonts_browser_proxy.ts",
-  "controls/cr_policy_pref_mixin.ts",
-  "controls/pref_control_mixin.ts",
-  "controls/settings_boolean_control_mixin.ts",
-  "extension_control_browser_proxy.ts",
-  "focus_config.ts",
-  "i18n_setup.ts",
-  "lifetime_browser_proxy.ts",
-  "page_visibility.ts",
-  "people_page/profile_info_browser_proxy.ts",
-  "people_page/sync_browser_proxy.ts",
-  "prefs/pref_util.ts",
-  "prefs/prefs.ts",
-  "prefs/prefs_mixin.ts",
-  "prefs/prefs_types.ts",
-  "privacy_page/privacy_page_browser_proxy.ts",
-  "relaunch_mixin.ts",
 ]
 
 mojom_webui_files = [
-  "mojom-webui/cros_audio_config.mojom-webui.ts",
-  "mojom-webui/app_notification_handler.mojom-webui.ts",
-  "mojom-webui/input_device_settings_provider.mojom-webui.ts",
-  "mojom-webui/input_device_settings.mojom-webui.js",
-  "mojom-webui/modifier_key.mojom-webui.js",
-  "mojom-webui/routes.mojom-webui.js",
-  "mojom-webui/search/personalization_search.mojom-webui.ts",
-  "mojom-webui/search/search.mojom-webui.js",
-  "mojom-webui/search/search_result_icon.mojom-webui.js",
-  "mojom-webui/search/user_action_recorder.mojom-webui.js",
-  "mojom-webui/setting.mojom-webui.js",
-]
-
-# TODO(b/207087930) Consider moving these shared files to chrome://resources
-# Files below are from Nearby Share and shared with ChromeOS Settings
-shared_nearby_share_files = [
-  "shared/nearby_contact_visibility.js",
-  "shared/nearby_contact_visibility.html.js",
-  "shared/nearby_device_icon.js",
-  "shared/nearby_device_icon.html.js",
-  "shared/nearby_device.js",
-  "shared/nearby_device.html.js",
-  "shared/nearby_onboarding_one_page.js",
-  "shared/nearby_onboarding_one_page.html.js",
-  "shared/nearby_onboarding_page.js",
-  "shared/nearby_onboarding_page.html.js",
-  "shared/nearby_page_template.js",
-  "shared/nearby_page_template.html.js",
-  "shared/nearby_preview.js",
-  "shared/nearby_preview.html.js",
-  "shared/nearby_progress.js",
-  "shared/nearby_progress.html.js",
-  "shared/nearby_visibility_page.js",
-  "shared/nearby_visibility_page.html.js",
-
-  "shared/nearby_contact_manager.js",
-  "shared/nearby_metrics_logger.js",
-  "shared/nearby_share_settings_mixin.js",
-  "shared/nearby_share_settings.js",
-  "shared/types.js",
+  "chromeos/mojom-webui/app_notification_handler.mojom-webui.ts",
+  "chromeos/mojom-webui/cros_audio_config.mojom-webui.ts",
+  "chromeos/mojom-webui/google_drive_handler.mojom-webui.ts",
+  "chromeos/mojom-webui/input_device_settings_provider.mojom-webui.ts",
+  "chromeos/mojom-webui/input_device_settings.mojom-webui.ts",
+  "chromeos/mojom-webui/modifier_key.mojom-webui.ts",
+  "chromeos/mojom-webui/pin_manager_types.mojom-webui.ts",
+  "chromeos/mojom-webui/routes.mojom-webui.ts",
+  "chromeos/mojom-webui/setting.mojom-webui.ts",
 
-  "shared/nearby_shared_icons.html.js",
-  "shared/nearby_shared_share_type_icons.html.js",
+  "chromeos/mojom-webui/search/personalization_search.mojom-webui.ts",
+  "chromeos/mojom-webui/search/search.mojom-webui.ts",
+  "chromeos/mojom-webui/search/search_result_icon.mojom-webui.ts",
+  "chromeos/mojom-webui/search/user_action_recorder.mojom-webui.ts",
 ]
 
 # Files sourced from their checked-in version under src