BASELINE: Update Chromium to 90.0.4430.221

Change-Id: Iff4d9d18d2fcf1a576f3b1f453010f744a232920
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

18 files changed, 566 insertions, 255 deletions

diff --git a/chromium/ash/BUILD.gn b/chromium/ash/BUILD.gn
index ca5d00dca44..bf0b085268a 100644
--- a/chromium/ash/BUILD.gn
+++ b/chromium/ash/BUILD.gn
@@ -6,6 +6,7 @@ import("//build/config/features.gni")
 import("//build/config/python.gni")
 import("//build/config/ui.gni")
 import("//chromeos/assistant/ambient.gni")
+import("//chromeos/components/sensors/buildflags.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//testing/test.gni")
 import("//tools/grit/repack.gni")
@@ -55,7 +56,6 @@ component("ash") {
     "public/cpp/debug_utils.h",
     "public/cpp/docked_magnifier_controller.h",
     "public/cpp/event_rewriter_controller.h",
-    "public/cpp/first_run_helper.h",
     "public/cpp/multi_user_window_manager.h",
     "public/cpp/multi_user_window_manager_delegate.h",
     "public/cpp/multi_user_window_manager_observer.h",
@@ -78,6 +78,7 @@ component("ash") {
     "shell_init_params.h",
     "shell_observer.h",
     "sticky_keys/sticky_keys_controller.h",
+    "system/pcie_peripheral/pcie_peripheral_notification_controller.h",
     "system/status_area_widget.h",
     "system/tray/system_tray_notifier.h",
     "system/unified/unified_system_tray.h",
@@ -87,6 +88,7 @@ component("ash") {
     "wm/drag_window_resizer.h",
     "wm/mru_window_tracker.h",
     "wm/overview/overview_controller.h",
+    "wm/overview/overview_observer.h",
     "wm/pip/pip_positioner.h",
     "wm/splitview/split_view_controller.h",
     "wm/tablet_mode/tablet_mode_browser_window_drag_delegate.h",
@@ -129,6 +131,7 @@ component("ash") {
     "accelerators/pre_target_accelerator_handler.h",
     "accelerators/spoken_feedback_toggler.cc",
     "accelerators/spoken_feedback_toggler.h",
+    "accelerometer/accelerometer_constants.h",
     "accelerometer/accelerometer_file_reader.cc",
     "accelerometer/accelerometer_file_reader.h",
     "accelerometer/accelerometer_reader.cc",
@@ -168,6 +171,8 @@ component("ash") {
     "accessibility/point_scan_controller.h",
     "accessibility/point_scan_layer.cc",
     "accessibility/point_scan_layer.h",
+    "accessibility/point_scan_layer_animation_info.cc",
+    "accessibility/point_scan_layer_animation_info.h",
     "accessibility/spoken_feedback_enabler.cc",
     "accessibility/spoken_feedback_enabler.h",
     "accessibility/touch_accessibility_enabler.cc",
@@ -181,6 +186,8 @@ component("ash") {
     "ambient/ambient_constants.h",
     "ambient/ambient_controller.cc",
     "ambient/ambient_controller.h",
+    "ambient/ambient_photo_cache.cc",
+    "ambient/ambient_photo_cache.h",
     "ambient/ambient_photo_controller.cc",
     "ambient/ambient_photo_controller.h",
     "ambient/ambient_view_delegate_impl.cc",
@@ -189,18 +196,16 @@ component("ash") {
     "ambient/model/ambient_backend_model.cc",
     "ambient/model/ambient_backend_model.h",
     "ambient/model/ambient_backend_model_observer.h",
-    "ambient/ui/ambient_assistant_container_view.cc",
-    "ambient/ui/ambient_assistant_container_view.h",
-    "ambient/ui/ambient_assistant_dialog_plate.cc",
-    "ambient/ui/ambient_assistant_dialog_plate.h",
     "ambient/ui/ambient_background_image_view.cc",
     "ambient/ui/ambient_background_image_view.h",
     "ambient/ui/ambient_container_view.cc",
     "ambient/ui/ambient_container_view.h",
+    "ambient/ui/ambient_info_view.cc",
+    "ambient/ui/ambient_info_view.h",
+    "ambient/ui/ambient_shield_view.cc",
+    "ambient/ui/ambient_shield_view.h",
     "ambient/ui/ambient_view_delegate.h",
     "ambient/ui/ambient_view_ids.h",
-    "ambient/ui/assistant_response_container_view.cc",
-    "ambient/ui/assistant_response_container_view.h",
     "ambient/ui/glanceable_info_view.cc",
     "ambient/ui/glanceable_info_view.h",
     "ambient/ui/media_string_view.cc",
@@ -254,10 +259,6 @@ component("ash") {
     "autoclick/autoclick_scroll_position_handler.cc",
     "autoclick/autoclick_scroll_position_handler.h",
     "autotest_private_api_utils.cc",
-    "bloom/bloom_ui_controller_impl.cc",
-    "bloom/bloom_ui_controller_impl.h",
-    "bloom/bloom_ui_delegate_impl.cc",
-    "bloom/bloom_ui_delegate_impl.h",
     "bluetooth_devices_observer.cc",
     "bluetooth_devices_observer.h",
     "cancel_mode.cc",
@@ -275,8 +276,16 @@ component("ash") {
     "capture_mode/capture_mode_feature_pod_controller.h",
     "capture_mode/capture_mode_metrics.cc",
     "capture_mode/capture_mode_metrics.h",
+    "capture_mode/capture_mode_notification_view.cc",
+    "capture_mode/capture_mode_notification_view.h",
     "capture_mode/capture_mode_session.cc",
     "capture_mode/capture_mode_session.h",
+    "capture_mode/capture_mode_session_focus_cycler.cc",
+    "capture_mode/capture_mode_session_focus_cycler.h",
+    "capture_mode/capture_mode_settings_entry_view.cc",
+    "capture_mode/capture_mode_settings_entry_view.h",
+    "capture_mode/capture_mode_settings_view.cc",
+    "capture_mode/capture_mode_settings_view.h",
     "capture_mode/capture_mode_source_view.cc",
     "capture_mode/capture_mode_source_view.h",
     "capture_mode/capture_mode_test_api.cc",
@@ -315,14 +324,25 @@ component("ash") {
     "clipboard/clipboard_nudge_constants.h",
     "clipboard/clipboard_nudge_controller.cc",
     "clipboard/clipboard_nudge_controller.h",
+    "clipboard/control_v_histogram_recorder.cc",
+    "clipboard/control_v_histogram_recorder.h",
     "clipboard/scoped_clipboard_history_pause_impl.cc",
     "clipboard/scoped_clipboard_history_pause_impl.h",
     "clipboard/views/clipboard_history_bitmap_item_view.cc",
     "clipboard/views/clipboard_history_bitmap_item_view.h",
+    "clipboard/views/clipboard_history_delete_button.cc",
+    "clipboard/views/clipboard_history_delete_button.h",
+    "clipboard/views/clipboard_history_file_item_view.cc",
+    "clipboard/views/clipboard_history_file_item_view.h",
     "clipboard/views/clipboard_history_item_view.cc",
     "clipboard/views/clipboard_history_item_view.h",
+    "clipboard/views/clipboard_history_label.cc",
+    "clipboard/views/clipboard_history_label.h",
+    "clipboard/views/clipboard_history_main_button.cc",
+    "clipboard/views/clipboard_history_main_button.h",
     "clipboard/views/clipboard_history_text_item_view.cc",
     "clipboard/views/clipboard_history_text_item_view.h",
+    "clipboard/views/clipboard_history_view_constants.h",
     "dbus/ash_dbus_services.cc",
     "dbus/ash_dbus_services.h",
     "dbus/display_service_provider.cc",
@@ -451,10 +471,6 @@ component("ash") {
     "fast_ink/view_tree_host_root_view.h",
     "fast_ink/view_tree_host_widget.cc",
     "fast_ink/view_tree_host_widget.h",
-    "first_run/desktop_cleaner.cc",
-    "first_run/desktop_cleaner.h",
-    "first_run/first_run_helper_impl.cc",
-    "first_run/first_run_helper_impl.h",
     "focus_cycler.cc",
     "focus_cycler.h",
     "frame/header_view.cc",
@@ -477,8 +493,6 @@ component("ash") {
     "highlighter/highlighter_view.h",
     "home_screen/drag_window_from_shelf_controller.cc",
     "home_screen/drag_window_from_shelf_controller.h",
-    "home_screen/home_launcher_gesture_handler.cc",
-    "home_screen/home_launcher_gesture_handler.h",
     "home_screen/home_screen_controller.cc",
     "home_screen/home_screen_controller.h",
     "home_screen/home_screen_delegate.h",
@@ -501,8 +515,6 @@ component("ash") {
     "host/root_window_transformer.h",
     "host/transformer_helper.cc",
     "host/transformer_helper.h",
-    "hud_display/compositor_stats.cc",
-    "hud_display/compositor_stats.h",
     "hud_display/cpu_graph_page_view.cc",
     "hud_display/cpu_graph_page_view.h",
     "hud_display/cpu_status.cc",
@@ -687,6 +699,8 @@ component("ash") {
     "metrics/histogram_macros.h",
     "metrics/login_metrics_recorder.cc",
     "metrics/login_metrics_recorder.h",
+    "metrics/login_unlock_throughput_recorder.cc",
+    "metrics/login_unlock_throughput_recorder.h",
     "metrics/pip_uma.h",
     "metrics/pointer_metrics_recorder.cc",
     "metrics/pointer_metrics_recorder.h",
@@ -707,14 +721,28 @@ component("ash") {
     "multi_user/user_switch_animator.h",
     "policy/policy_recommendation_restorer.cc",
     "policy/policy_recommendation_restorer.h",
-    "power/hfp_battery_listener.cc",
-    "power/hfp_battery_listener.h",
-    "power/hid_battery_listener.cc",
-    "power/hid_battery_listener.h",
     "power/hid_battery_util.cc",
     "power/hid_battery_util.h",
-    "power/peripheral_battery_tracker.cc",
-    "power/peripheral_battery_tracker.h",
+    "projector/model/projector_ui_model.cc",
+    "projector/model/projector_ui_model.h",
+    "projector/projector_controller_impl.cc",
+    "projector/projector_controller_impl.h",
+    "projector/projector_feature_pod_controller.cc",
+    "projector/projector_feature_pod_controller.h",
+    "projector/projector_metadata_controller.cc",
+    "projector/projector_metadata_controller.h",
+    "projector/projector_metadata_model.cc",
+    "projector/projector_metadata_model.h",
+    "projector/projector_ui_controller.cc",
+    "projector/projector_ui_controller.h",
+    "projector/ui/projector_bar_view.cc",
+    "projector/ui/projector_bar_view.h",
+    "projector/ui/projector_button.cc",
+    "projector/ui/projector_button.h",
+    "projector/ui/projector_color_button.cc",
+    "projector/ui/projector_color_button.h",
+    "projector/ui/projector_image_button.cc",
+    "projector/ui/projector_image_button.h",
     "quick_answers/quick_answers_controller_impl.cc",
     "quick_answers/quick_answers_controller_impl.h",
     "quick_answers/quick_answers_ui_controller.cc",
@@ -768,6 +796,8 @@ component("ash") {
     "shelf/contextual_tooltip.h",
     "shelf/drag_handle.cc",
     "shelf/drag_handle.h",
+    "shelf/gradient_layer_delegate.cc",
+    "shelf/gradient_layer_delegate.h",
     "shelf/home_button.cc",
     "shelf/home_button.h",
     "shelf/home_button_controller.cc",
@@ -890,10 +920,16 @@ component("ash") {
     "system/accessibility/floating_menu_button.h",
     "system/accessibility/floating_menu_utils.cc",
     "system/accessibility/floating_menu_utils.h",
+    "system/accessibility/select_to_speak_constants.h",
     "system/accessibility/select_to_speak_menu_bubble_controller.cc",
     "system/accessibility/select_to_speak_menu_bubble_controller.h",
     "system/accessibility/select_to_speak_menu_view.cc",
     "system/accessibility/select_to_speak_menu_view.h",
+    "system/accessibility/select_to_speak_metrics_utils.h",
+    "system/accessibility/select_to_speak_speed_bubble_controller.cc",
+    "system/accessibility/select_to_speak_speed_bubble_controller.h",
+    "system/accessibility/select_to_speak_speed_view.cc",
+    "system/accessibility/select_to_speak_speed_view.h",
     "system/accessibility/select_to_speak_tray.cc",
     "system/accessibility/select_to_speak_tray.h",
     "system/accessibility/switch_access_back_button_bubble_controller.cc",
@@ -924,8 +960,6 @@ component("ash") {
     "system/audio/unified_volume_slider_controller.h",
     "system/audio/unified_volume_view.cc",
     "system/audio/unified_volume_view.h",
-    "system/bloom/bloom_tray.cc",
-    "system/bloom/bloom_tray.h",
     "system/bluetooth/bluetooth_detailed_view.cc",
     "system/bluetooth/bluetooth_detailed_view.h",
     "system/bluetooth/bluetooth_feature_pod_controller.cc",
@@ -959,7 +993,6 @@ component("ash") {
     "system/cast/tray_cast.h",
     "system/cast/unified_cast_detailed_view_controller.cc",
     "system/cast/unified_cast_detailed_view_controller.h",
-    "system/dark_mode/color_mode_observer.h",
     "system/dark_mode/dark_mode_detailed_view.cc",
     "system/dark_mode/dark_mode_detailed_view.h",
     "system/dark_mode/dark_mode_detailed_view_controller.cc",
@@ -969,6 +1002,8 @@ component("ash") {
     "system/enterprise/enterprise_domain_observer.h",
     "system/gesture_education/gesture_education_notification_controller.cc",
     "system/gesture_education/gesture_education_notification_controller.h",
+    "system/holding_space/downloads_section.cc",
+    "system/holding_space/downloads_section.h",
     "system/holding_space/holding_space_color_provider_impl.cc",
     "system/holding_space/holding_space_color_provider_impl.h",
     "system/holding_space/holding_space_drag_util.cc",
@@ -983,20 +1018,28 @@ component("ash") {
     "system/holding_space/holding_space_item_view.h",
     "system/holding_space/holding_space_item_view_delegate.cc",
     "system/holding_space/holding_space_item_view_delegate.h",
-    "system/holding_space/holding_space_item_views_container.cc",
-    "system/holding_space/holding_space_item_views_container.h",
+    "system/holding_space/holding_space_item_views_section.cc",
+    "system/holding_space/holding_space_item_views_section.h",
     "system/holding_space/holding_space_tray.cc",
     "system/holding_space/holding_space_tray.h",
     "system/holding_space/holding_space_tray_bubble.cc",
     "system/holding_space/holding_space_tray_bubble.h",
+    "system/holding_space/holding_space_tray_child_bubble.cc",
+    "system/holding_space/holding_space_tray_child_bubble.h",
     "system/holding_space/holding_space_tray_icon.cc",
     "system/holding_space/holding_space_tray_icon.h",
     "system/holding_space/holding_space_tray_icon_preview.cc",
     "system/holding_space/holding_space_tray_icon_preview.h",
-    "system/holding_space/pinned_files_container.cc",
-    "system/holding_space/pinned_files_container.h",
-    "system/holding_space/recent_files_container.cc",
-    "system/holding_space/recent_files_container.h",
+    "system/holding_space/holding_space_util.cc",
+    "system/holding_space/holding_space_util.h",
+    "system/holding_space/pinned_files_bubble.cc",
+    "system/holding_space/pinned_files_bubble.h",
+    "system/holding_space/pinned_files_section.cc",
+    "system/holding_space/pinned_files_section.h",
+    "system/holding_space/recent_files_bubble.cc",
+    "system/holding_space/recent_files_bubble.h",
+    "system/holding_space/screen_captures_section.cc",
+    "system/holding_space/screen_captures_section.h",
     "system/ime/ime_feature_pod_controller.cc",
     "system/ime/ime_feature_pod_controller.h",
     "system/ime/ime_observer.h",
@@ -1053,6 +1096,8 @@ component("ash") {
     "system/message_center/message_center_ui_controller.cc",
     "system/message_center/message_center_ui_controller.h",
     "system/message_center/message_center_ui_delegate.h",
+    "system/message_center/message_center_utils.cc",
+    "system/message_center/message_center_utils.h",
     "system/message_center/metrics_utils.cc",
     "system/message_center/metrics_utils.h",
     "system/message_center/notification_swipe_control_view.cc",
@@ -1094,6 +1139,8 @@ component("ash") {
     "system/network/active_network_icon.h",
     "system/network/auto_connect_notifier.cc",
     "system/network/auto_connect_notifier.h",
+    "system/network/cellular_setup_notifier.cc",
+    "system/network/cellular_setup_notifier.h",
     "system/network/network_feature_pod_button.cc",
     "system/network/network_feature_pod_button.h",
     "system/network/network_feature_pod_controller.cc",
@@ -1155,6 +1202,8 @@ component("ash") {
     "system/palette/palette_utils.h",
     "system/palette/palette_welcome_bubble.cc",
     "system/palette/palette_welcome_bubble.h",
+    "system/palette/stylus_battery_delegate.cc",
+    "system/palette/stylus_battery_delegate.h",
     "system/palette/tools/capture_region_mode.cc",
     "system/palette/tools/capture_region_mode.h",
     "system/palette/tools/capture_screen_action.cc",
@@ -1169,16 +1218,13 @@ component("ash") {
     "system/palette/tools/magnifier_mode.h",
     "system/palette/tools/metalayer_mode.cc",
     "system/palette/tools/metalayer_mode.h",
+    "system/pcie_peripheral/pcie_peripheral_notification_controller.cc",
     "system/phonehub/bluetooth_disabled_view.cc",
     "system/phonehub/bluetooth_disabled_view.h",
-    "system/phonehub/connection_error_view.cc",
-    "system/phonehub/connection_error_view.h",
     "system/phonehub/continue_browsing_chip.cc",
     "system/phonehub/continue_browsing_chip.h",
     "system/phonehub/enable_hotspot_quick_action_controller.cc",
     "system/phonehub/enable_hotspot_quick_action_controller.h",
-    "system/phonehub/initial_connecting_view.cc",
-    "system/phonehub/initial_connecting_view.h",
     "system/phonehub/interstitial_view_button.cc",
     "system/phonehub/interstitial_view_button.h",
     "system/phonehub/locate_phone_quick_action_controller.cc",
@@ -1189,6 +1235,10 @@ component("ash") {
     "system/phonehub/onboarding_view.h",
     "system/phonehub/phone_connected_view.cc",
     "system/phonehub/phone_connected_view.h",
+    "system/phonehub/phone_connecting_view.cc",
+    "system/phonehub/phone_connecting_view.h",
+    "system/phonehub/phone_disconnected_view.cc",
+    "system/phonehub/phone_disconnected_view.h",
     "system/phonehub/phone_hub_content_view.cc",
     "system/phonehub/phone_hub_content_view.h",
     "system/phonehub/phone_hub_interstitial_view.cc",
@@ -1213,6 +1263,8 @@ component("ash") {
     "system/phonehub/silence_phone_quick_action_controller.h",
     "system/phonehub/task_continuation_view.cc",
     "system/phonehub/task_continuation_view.h",
+    "system/phonehub/tether_connection_pending_view.cc",
+    "system/phonehub/tether_connection_pending_view.h",
     "system/phonehub/ui_constants.h",
     "system/power/backlights_forced_off_setter.cc",
     "system/power/backlights_forced_off_setter.h",
@@ -1222,6 +1274,8 @@ component("ash") {
     "system/power/battery_notification.h",
     "system/power/dual_role_notification.cc",
     "system/power/dual_role_notification.h",
+    "system/power/peripheral_battery_listener.cc",
+    "system/power/peripheral_battery_listener.h",
     "system/power/peripheral_battery_notifier.cc",
     "system/power/peripheral_battery_notifier.h",
     "system/power/power_button_controller.cc",
@@ -1283,8 +1337,6 @@ component("ash") {
     "system/status_area_widget_delegate.h",
     "system/supervised/supervised_icon_string.cc",
     "system/supervised/supervised_icon_string.h",
-    "system/supervised/supervised_notification_controller.cc",
-    "system/supervised/supervised_notification_controller.h",
     "system/system_notification_controller.cc",
     "system/system_notification_controller.h",
     "system/time/time_tray_item_view.cc",
@@ -1367,6 +1419,8 @@ component("ash") {
     "system/unified/notification_counter_view.h",
     "system/unified/notification_hidden_view.cc",
     "system/unified/notification_hidden_view.h",
+    "system/unified/notification_icons_controller.cc",
+    "system/unified/notification_icons_controller.h",
     "system/unified/page_indicator_view.cc",
     "system/unified/page_indicator_view.h",
     "system/unified/quiet_mode_feature_pod_controller.cc",
@@ -1379,8 +1433,6 @@ component("ash") {
     "system/unified/top_shortcut_button.h",
     "system/unified/top_shortcuts_view.cc",
     "system/unified/top_shortcuts_view.h",
-    "system/unified/unified_managed_device_view.cc",
-    "system/unified/unified_managed_device_view.h",
     "system/unified/unified_notifier_settings_controller.cc",
     "system/unified/unified_notifier_settings_controller.h",
     "system/unified/unified_slider_bubble_controller.cc",
@@ -1423,6 +1475,8 @@ component("ash") {
     "tray_action/tray_action.cc",
     "tray_action/tray_action.h",
     "tray_action/tray_action_observer.h",
+    "utility/layer_util.cc",
+    "utility/layer_util.h",
     "utility/screenshot_controller.cc",
     "utility/screenshot_controller.h",
     "utility/transformer_util.cc",
@@ -1447,8 +1501,6 @@ component("ash") {
     "wallpaper/wallpaper_widget_controller.h",
     "wallpaper/wallpaper_window_state_manager.cc",
     "wallpaper/wallpaper_window_state_manager.h",
-    "window_factory.cc",
-    "window_factory.h",
     "window_tree_host_lookup.cc",
     "window_user_data.h",
     "wm/always_on_top_controller.cc",
@@ -1478,6 +1530,8 @@ component("ash") {
     "wm/desks/desk_animation_base.h",
     "wm/desks/desk_animation_impl.cc",
     "wm/desks/desk_animation_impl.h",
+    "wm/desks/desk_drag_proxy.cc",
+    "wm/desks/desk_drag_proxy.h",
     "wm/desks/desk_mini_view.cc",
     "wm/desks/desk_mini_view.h",
     "wm/desks/desk_mini_view_animations.cc",
@@ -1490,15 +1544,22 @@ component("ash") {
     "wm/desks/desks_animations.h",
     "wm/desks/desks_bar_view.cc",
     "wm/desks/desks_bar_view.h",
+    "wm/desks/desks_constants.h",
     "wm/desks/desks_controller.cc",
     "wm/desks/desks_histogram_enums.h",
     "wm/desks/desks_restore_util.cc",
     "wm/desks/desks_restore_util.h",
     "wm/desks/desks_util.cc",
+    "wm/desks/expanded_state_new_desk_button.cc",
+    "wm/desks/expanded_state_new_desk_button.h",
     "wm/desks/new_desk_button.cc",
     "wm/desks/new_desk_button.h",
     "wm/desks/root_window_desk_switch_animator.cc",
     "wm/desks/root_window_desk_switch_animator.h",
+    "wm/desks/scroll_arrow_button.cc",
+    "wm/desks/scroll_arrow_button.h",
+    "wm/desks/zero_state_button.cc",
+    "wm/desks/zero_state_button.h",
     "wm/drag_details.cc",
     "wm/drag_details.h",
     "wm/drag_window_controller.cc",
@@ -1506,6 +1567,8 @@ component("ash") {
     "wm/drag_window_resizer.cc",
     "wm/event_client_impl.cc",
     "wm/event_client_impl.h",
+    "wm/full_restore/full_restore_controller.cc",
+    "wm/full_restore/full_restore_controller.h",
     "wm/fullscreen_window_finder.cc",
     "wm/fullscreen_window_finder.h",
     "wm/gestures/back_gesture/back_gesture_affordance.cc",
@@ -1561,7 +1624,6 @@ component("ash") {
     "wm/overview/overview_item.h",
     "wm/overview/overview_item_view.cc",
     "wm/overview/overview_item_view.h",
-    "wm/overview/overview_observer.h",
     "wm/overview/overview_session.cc",
     "wm/overview/overview_session.h",
     "wm/overview/overview_test_api.cc",
@@ -1648,12 +1710,16 @@ component("ash") {
     "wm/video_detector.h",
     "wm/window_animations.cc",
     "wm/window_animations.h",
-    "wm/window_cycle_controller.cc",
-    "wm/window_cycle_controller.h",
-    "wm/window_cycle_event_filter.cc",
-    "wm/window_cycle_event_filter.h",
-    "wm/window_cycle_list.cc",
-    "wm/window_cycle_list.h",
+    "wm/window_cycle/window_cycle_controller.cc",
+    "wm/window_cycle/window_cycle_controller.h",
+    "wm/window_cycle/window_cycle_event_filter.cc",
+    "wm/window_cycle/window_cycle_event_filter.h",
+    "wm/window_cycle/window_cycle_list.cc",
+    "wm/window_cycle/window_cycle_list.h",
+    "wm/window_cycle/window_cycle_tab_slider.cc",
+    "wm/window_cycle/window_cycle_tab_slider.h",
+    "wm/window_cycle/window_cycle_tab_slider_button.cc",
+    "wm/window_cycle/window_cycle_tab_slider_button.h",
     "wm/window_dimmer.cc",
     "wm/window_dimmer.h",
     "wm/window_finder.cc",
@@ -1711,6 +1777,7 @@ component("ash") {
     "//ash/public/cpp/resources:ash_public_unscaled_resources",
     "//ash/resources/vector_icons",
     "//ash/strings",
+    "//chromeos/services/machine_learning/public/mojom",
     "//chromeos/services/multidevice_setup/public/mojom",
     "//chromeos/ui/vector_icons",
     "//components/discardable_memory/public/mojom",
@@ -1723,6 +1790,7 @@ component("ash") {
     "//services/media_session/public/mojom",
     "//skia",
     "//ui/aura",
+    "//ui/base/cursor",
     "//ui/base/cursor:cursor_base",
     "//ui/base/cursor/mojom:cursor_type",
     "//ui/base/dragdrop/mojom:mojom_shared",
@@ -1742,6 +1810,9 @@ component("ash") {
     "//ash/assistant/ui",
     "//ash/assistant/ui:constants",
     "//ash/assistant/util",
+    "//ash/components/audio",
+    "//ash/components/pcie_peripheral",
+    "//ash/constants",
     "//ash/keyboard/ui",
     "//ash/login/resources:resources_grit",
     "//ash/services/recording",
@@ -1756,46 +1827,40 @@ component("ash") {
     "//cc/debug",
     "//cc/paint:paint",
     "//chromeos/assistant:buildflags",
-    "//chromeos/components/bloom/public/cpp",
+    "//chromeos/components/multidevice/logging",
     "//chromeos/components/phonehub",
     "//chromeos/components/quick_answers",
     "//chromeos/components/quick_answers/public/cpp:prefs",
-    "//chromeos/ui/base",
-    "//chromeos/ui/frame",
-    "//services/viz/public/mojom",
-
-    # TODO(https://crbug.com/644336): Make CrasAudioHandler Chrome or Ash only.
-    "//chromeos/audio",
-    "//chromeos/components/multidevice/logging",
-    "//chromeos/constants",
+    "//chromeos/components/sensors:buildflags",
+    "//chromeos/crosapi/cpp",
     "//chromeos/dbus",
-
-    # TODO(https://crbug.com/644336): Remove dependencies on CrasAudioClient.
     "//chromeos/dbus/audio",
     "//chromeos/dbus/constants",
     "//chromeos/dbus/hammerd",
     "//chromeos/dbus/power",
     "//chromeos/dbus/power:power_manager_proto",
     "//chromeos/dbus/services:services",
-
-    # TODO(https://crbug.com/644355): Remove Shill dependencies.
     "//chromeos/dbus/shill",
     "//chromeos/dbus/system_clock",
-
-    # TODO(https://crbug.com/644355): Remove Shill dependencies.
+    "//chromeos/login/login_state",
     "//chromeos/network",
     "//chromeos/services/assistant/public/cpp",
     "//chromeos/services/assistant/public/mojom",
+    "//chromeos/services/libassistant/public/cpp:structs",
     "//chromeos/services/multidevice_setup/public/mojom",
+    "//chromeos/services/nearby/public/cpp",
     "//chromeos/services/network_config/public/cpp",
     "//chromeos/services/network_config/public/mojom",
     "//chromeos/settings",
     "//chromeos/strings",
     "//chromeos/system",
+    "//chromeos/ui/base",
+    "//chromeos/ui/frame",
     "//components/account_id",
     "//components/country_codes",
     "//components/device_event_log",
     "//components/discardable_memory/service",
+    "//components/full_restore",
     "//components/media_message_center",
     "//components/onc",
     "//components/password_manager/core/browser:hash_password_manager",
@@ -1804,6 +1869,7 @@ component("ash") {
     "//components/quirks",
     "//components/services/app_service/public/cpp:app_update",
     "//components/session_manager:base",
+    "//components/session_manager/core",
     "//components/strings",
     "//components/sync",
     "//components/user_manager",
@@ -1820,6 +1886,7 @@ component("ash") {
     "//services/metrics/public/cpp:ukm_builders",
     "//services/network/public/cpp:cpp",
     "//services/preferences/public/cpp",
+    "//services/viz/public/mojom",
 
     # TODO(msw): Remove this; ash should not depend on blink/webkit.
     "//third_party/blink/public:blink_headers",
@@ -1831,7 +1898,6 @@ component("ash") {
     "//ui/accessibility/mojom",
     "//ui/base",
     "//ui/base:ui_data_pack",
-    "//ui/base/cursor",
     "//ui/base/ime/chromeos",
     "//ui/base/ime/init",
     "//ui/chromeos",
@@ -1894,6 +1960,23 @@ component("ash") {
       "//chromeos/assistant/internal/proto/google3",
     ]
   }
+
+  if (use_iioservice) {
+    sources -= [
+      "accelerometer/accelerometer_file_reader.cc",
+      "accelerometer/accelerometer_file_reader.h",
+    ]
+    sources += [
+      "accelerometer/accelerometer_provider_mojo.cc",
+      "accelerometer/accelerometer_provider_mojo.h",
+      "accelerometer/accelerometer_samples_observer.cc",
+      "accelerometer/accelerometer_samples_observer.h",
+    ]
+    deps += [
+      "//chromeos/components/sensors:sensors",
+      "//chromeos/components/sensors/mojom",
+    ]
+  }
 }
 
 # TODO(crbug.com/1112471): Get this to run cleanly under Python 3.
@@ -1937,6 +2020,7 @@ test("ash_unittests") {
     "accessibility/touch_exploration_controller_unittest.cc",
     "accessibility/touch_exploration_manager_unittest.cc",
     "ambient/ambient_controller_unittest.cc",
+    "ambient/ambient_photo_cache_unittest.cc",
     "ambient/ambient_photo_controller_unittest.cc",
     "ambient/autotest_ambient_api_unittest.cc",
     "ambient/model/ambient_backend_model_unittest.cc",
@@ -2022,7 +2106,6 @@ test("ash_unittests") {
     "fast_ink/fast_ink_points_unittest.cc",
     "fast_ink/laser/laser_pointer_controller_unittest.cc",
     "fast_ink/laser/laser_segment_utils_unittest.cc",
-    "first_run/first_run_helper_impl_unittest.cc",
     "focus_cycler_unittest.cc",
     "frame/caption_buttons/frame_caption_button_container_view_unittest.cc",
     "frame/caption_buttons/frame_size_button_unittest.cc",
@@ -2094,9 +2177,9 @@ test("ash_unittests") {
     "metrics/user_metrics_recorder_unittest.cc",
     "multi_device_setup/multi_device_notification_presenter_unittest.cc",
     "policy/policy_recommendation_restorer_unittest.cc",
-    "power/hfp_battery_listener_unittest.cc",
-    "power/hid_battery_listener_unittest.cc",
     "power/hid_battery_util_unittest.cc",
+    "projector/projector_controller_unittest.cc",
+    "projector/projector_metadata_model_unittest.cc",
     "quick_answers/quick_answers_controller_unittest.cc",
     "quick_answers/quick_answers_ui_controller_unittest.cc",
     "quick_answers/ui/quick_answers_view_unittest.cc",
@@ -2107,13 +2190,13 @@ test("ash_unittests") {
     "session/session_controller_impl_unittest.cc",
     "shelf/back_button_unittest.cc",
     "shelf/contextual_tooltip_unittest.cc",
+    "shelf/drag_handle_unittest.cc",
     "shelf/home_button_unittest.cc",
     "shelf/home_to_overview_nudge_controller_unittest.cc",
     "shelf/hotseat_widget_unittest.cc",
     "shelf/login_shelf_gesture_controller_unittest.cc",
     "shelf/login_shelf_view_unittest.cc",
     "shelf/scrollable_shelf_view_unittest.cc",
-    "shelf/shelf_app_button_unittest.cc",
     "shelf/shelf_application_menu_model_unittest.cc",
     "shelf/shelf_background_animator_unittest.cc",
     "shelf/shelf_button_pressed_metric_tracker_unittest.cc",
@@ -2144,12 +2227,12 @@ test("ash_unittests") {
     "system/accessibility/dictation_button_tray_unittest.cc",
     "system/accessibility/floating_accessibility_controller_unittest.cc",
     "system/accessibility/select_to_speak_menu_bubble_controller_unittest.cc",
+    "system/accessibility/select_to_speak_speed_bubble_controller_unittest.cc",
     "system/accessibility/select_to_speak_tray_unittest.cc",
     "system/accessibility/switch_access_back_button_bubble_controller_unittest.cc",
     "system/accessibility/switch_access_menu_bubble_controller_unittest.cc",
     "system/accessibility/tray_accessibility_unittest.cc",
     "system/audio/unified_audio_detailed_view_controller_unittest.cc",
-    "system/bloom/bloom_tray_unittest.cc",
     "system/bluetooth/bluetooth_notification_controller_unittest.cc",
     "system/bluetooth/bluetooth_power_controller_unittest.cc",
     "system/bluetooth/tray_bluetooth_helper_legacy_unittest.cc",
@@ -2168,6 +2251,7 @@ test("ash_unittests") {
     "system/message_center/ash_message_popup_collection_unittest.cc",
     "system/message_center/inactive_user_notification_blocker_unittest.cc",
     "system/message_center/message_center_ui_controller_unittest.cc",
+    "system/message_center/message_center_utils_unittest.cc",
     "system/message_center/notification_swipe_control_view_unittest.cc",
     "system/message_center/notifier_settings_view_unittest.cc",
     "system/message_center/session_state_notification_blocker_unittest.cc",
@@ -2177,6 +2261,7 @@ test("ash_unittests") {
     "system/nearby_share/nearby_share_feature_pod_controller_unittest.cc",
     "system/network/active_network_icon_unittest.cc",
     "system/network/auto_connect_notifier_unittest.cc",
+    "system/network/cellular_setup_notifier_unittest.cc",
     "system/network/network_icon_unittest.cc",
     "system/network/sms_observer_unittest.cc",
     "system/network/vpn_list_unittest.cc",
@@ -2192,6 +2277,7 @@ test("ash_unittests") {
     "system/palette/tools/create_note_unittest.cc",
     "system/palette/tools/metalayer_unittest.cc",
     "system/palette/tools/screenshot_unittest.cc",
+    "system/pcie_peripheral/pcie_peripheral_notification_controller_unittest.cc",
     "system/phonehub/phone_hub_notification_controller_unittest.cc",
     "system/phonehub/phone_hub_tray_unittest.cc",
     "system/phonehub/phone_hub_ui_controller_unittest.cc",
@@ -2200,6 +2286,8 @@ test("ash_unittests") {
     "system/phonehub/silence_phone_quick_action_controller_unittest.cc",
     "system/phonehub/task_continuation_view_unittest.cc",
     "system/power/backlights_forced_off_setter_unittest.cc",
+    "system/power/peripheral_battery_listener_unittest.cc",
+    "system/power/peripheral_battery_notifier_listener_integration_test.cc",
     "system/power/peripheral_battery_notifier_unittest.cc",
     "system/power/power_button_controller_unittest.cc",
     "system/power/power_button_screenshot_controller_unittest.cc",
@@ -2215,7 +2303,7 @@ test("ash_unittests") {
     "system/session/logout_confirmation_controller_unittest.cc",
     "system/session/session_limit_notification_controller_unittest.cc",
     "system/status_area_widget_unittest.cc",
-    "system/supervised/supervised_notification_controller_unittest.cc",
+    "system/time/time_tray_item_view_unittest.cc",
     "system/time/time_view_unittest.cc",
     "system/toast/toast_manager_unittest.cc",
     "system/tracing_notification_controller_unittest.cc",
@@ -2226,10 +2314,10 @@ test("ash_unittests") {
     "system/unified/camera_mic_tray_item_view_unittest.cc",
     "system/unified/feature_pods_container_view_unittest.cc",
     "system/unified/notification_counter_view_unittest.cc",
+    "system/unified/notification_icons_controller_unittest.cc",
     "system/unified/page_indicator_view_unittest.cc",
     "system/unified/quiet_mode_feature_pod_controller_unittest.cc",
     "system/unified/top_shortcuts_view_unittest.cc",
-    "system/unified/unified_managed_device_view_unittest.cc",
     "system/unified/unified_system_info_view_unittest.cc",
     "system/unified/unified_system_tray_controller_unittest.cc",
     "system/unified/unified_system_tray_unittest.cc",
@@ -2244,6 +2332,7 @@ test("ash_unittests") {
     "tray_action/test_tray_action_client.cc",
     "tray_action/test_tray_action_client.h",
     "tray_action/tray_action_unittest.cc",
+    "utility/layer_util_unittest.cc",
     "utility/screenshot_controller_unittest.cc",
     "wallpaper/wallpaper_controller_unittest.cc",
     "wallpaper/wallpaper_utils/wallpaper_color_calculator_unittest.cc",
@@ -2255,12 +2344,14 @@ test("ash_unittests") {
     "wm/client_controlled_state_unittest.cc",
     "wm/collision_detection/collision_detection_utils_unittest.cc",
     "wm/container_finder_unittest.cc",
+    "wm/cursor_manager_chromeos_unittest.cc",
     "wm/default_window_resizer_unittest.cc",
     "wm/desks/autotest_desks_api_unittests.cc",
     "wm/desks/desk_animation_impl_unittest.cc",
     "wm/desks/desks_unittests.cc",
     "wm/desks/root_window_desk_switch_animator_unittest.cc",
     "wm/drag_window_resizer_unittest.cc",
+    "wm/full_restore/full_restore_controller_unittest.cc",
     "wm/fullscreen_window_finder_unittest.cc",
     "wm/gestures/back_gesture/back_gesture_affordance_unittest.cc",
     "wm/gestures/back_gesture/back_gesture_contextual_nudge_controller_impl_unittest.cc",
@@ -2309,7 +2400,7 @@ test("ash_unittests") {
     "wm/toplevel_window_event_handler_unittest.cc",
     "wm/video_detector_unittest.cc",
     "wm/window_animations_unittest.cc",
-    "wm/window_cycle_controller_unittest.cc",
+    "wm/window_cycle/window_cycle_controller_unittest.cc",
     "wm/window_dimmer_unittest.cc",
     "wm/window_finder_unittest.cc",
     "wm/window_manager_unittest.cc",
@@ -2345,6 +2436,9 @@ test("ash_unittests") {
     "//ash/assistant/ui:constants",
     "//ash/assistant/ui/test_support",
     "//ash/assistant/util",
+    "//ash/components:unit_tests",
+    "//ash/components/audio",
+    "//ash/constants",
     "//ash/keyboard/ui",
     "//ash/keyboard/ui:test_support",
     "//ash/public/cpp",
@@ -2361,34 +2455,30 @@ test("ash_unittests") {
     "//base/util/values:values_util",
     "//build:branding_buildflags",
     "//chromeos:test_support",
-    "//chromeos/strings:strings_grit",
-    "//chromeos/ui/base",
-    "//chromeos/ui/frame",
-    "//chromeos/ui/vector_icons",
-
-    # TODO(https://crbug.com/644336): Make CrasAudioHandler Chrome or Ash only.
-    "//chromeos/audio",
-    "//chromeos/components/bloom/public/cpp",
     "//chromeos/components/phonehub:test_support",
     "//chromeos/components/quick_answers:quick_answers",
-    "//chromeos/constants",
     "//chromeos/dbus:test_support",
     "//chromeos/dbus/audio",
     "//chromeos/dbus/hammerd",
+    "//chromeos/dbus/hermes:hermes_clients",
+    "//chromeos/dbus/hermes:hermes_fakes",
     "//chromeos/dbus/power",
     "//chromeos/dbus/power:power_manager_proto",
     "//chromeos/dbus/services:test_support",
-
-    # TODO(https://crbug.com/644355): Remove Shill dependencies.
     "//chromeos/network:test_support",
     "//chromeos/services/assistant:test_support",
     "//chromeos/services/assistant/public/cpp",
     "//chromeos/services/assistant/public/mojom",
     "//chromeos/services/multidevice_setup/public/cpp:test_support",
     "//chromeos/services/multidevice_setup/public/mojom",
+    "//chromeos/services/nearby/public/cpp",
     "//chromeos/services/network_config/public/mojom",
+    "//chromeos/strings:strings_grit",
     "//chromeos/system",
+    "//chromeos/ui/base",
+    "//chromeos/ui/frame",
     "//chromeos/ui/frame:test_support",
+    "//chromeos/ui/vector_icons",
     "//components/account_id",
     "//components/arc:notification_test_support",
     "//components/media_message_center",
@@ -2396,6 +2486,7 @@ test("ash_unittests") {
     "//components/prefs:test_support",
     "//components/quirks",
     "//components/services/app_service/public/cpp:app_update",
+    "//components/session_manager/core",
     "//components/sync_preferences:test_support",
     "//components/ukm:test_support",
     "//components/user_manager",
@@ -2412,6 +2503,7 @@ test("ash_unittests") {
     "//services/media_session/public/mojom",
     "//services/metrics/public/cpp:ukm_builders",
     "//services/network:test_support",
+    "//services/viz/privileged/mojom/compositing",
     "//skia",
     "//testing/gmock",
     "//testing/gtest",
@@ -2424,7 +2516,7 @@ test("ash_unittests") {
     "//ui/base:test_support",
     "//ui/base/cursor:cursor_base",
     "//ui/base/cursor/mojom:cursor_type",
-    "//ui/base/dragdrop/mojom:mojom_shared",
+    "//ui/base/dragdrop/mojom",
     "//ui/base/ime",
     "//ui/base/ime/chromeos",
     "//ui/chromeos",
@@ -2475,6 +2567,18 @@ test("ash_unittests") {
     "//content/public/browser",
     "//content/public/common",
   ]
+
+  if (use_iioservice) {
+    sources += [
+      "accelerometer/accelerometer_provider_mojo_unittest.cc",
+      "accelerometer/accelerometer_samples_observer_unittest.cc",
+    ]
+    deps += [
+      "//chromeos/components/sensors:sensors",
+      "//chromeos/components/sensors:test_support",
+      "//chromeos/components/sensors/mojom",
+    ]
+  }
 }
 
 # TODO(oshima): Remove or migrate to new ash_ui_perftests
@@ -2511,6 +2615,7 @@ static_library("test_support") {
   public = [
     "public/cpp/holding_space/holding_space_test_api.h",
     "public/cpp/test/accessibility_controller_test_api.h",
+    "public/cpp/test/app_list_test_api.h",
     "public/cpp/test/assistant_test_api.h",
   ]
   sources = [
@@ -2577,7 +2682,10 @@ static_library("test_support") {
     "metrics/task_switch_time_tracker_test_api.h",
     "metrics/user_metrics_recorder_test_api.cc",
     "metrics/user_metrics_recorder_test_api.h",
-    "public/cpp/test/app_list_test_api.h",
+    "projector/test/mock_projector_metadata_controller.cc",
+    "projector/test/mock_projector_metadata_controller.h",
+    "projector/test/mock_projector_ui_controller.cc",
+    "projector/test/mock_projector_ui_controller.h",
     "public/cpp/test/shell_test_api.h",
     "rotator/screen_rotation_animator_test_api.cc",
     "rotator/screen_rotation_animator_test_api.h",
@@ -2620,6 +2728,10 @@ static_library("test_support") {
     "test/ash_test_views_delegate.h",
     "test/fake_android_intent_helper.cc",
     "test/fake_android_intent_helper.h",
+    "test/test_widget_builder.cc",
+    "test/test_widget_builder.h",
+    "test/test_window_builder.cc",
+    "test/test_window_builder.h",
     "test/toplevel_window.cc",
     "test/toplevel_window.h",
     "test/ui_controls_factory_ash.cc",
@@ -2642,8 +2754,6 @@ static_library("test_support") {
     "wm/gestures/back_gesture/test_back_gesture_contextual_nudge_delegate.h",
     "wm/lock_state_controller_test_api.cc",
     "wm/lock_state_controller_test_api.h",
-    "wm/splitview/multi_display_overview_and_split_view_test.cc",
-    "wm/splitview/multi_display_overview_and_split_view_test.h",
     "wm/tablet_mode/tablet_mode_controller_test_api.cc",
     "wm/tablet_mode/tablet_mode_controller_test_api.h",
     "wm/test_activation_delegate.cc",
@@ -2679,6 +2789,10 @@ static_library("test_support") {
     "//ash/app_menu",
     "//ash/assistant/model:model",
     "//ash/assistant/ui:ui",
+    "//ash/components/audio",
+    "//ash/constants",
+    "//ash/keyboard/ui",
+    "//ash/keyboard/ui:test_support",
     "//ash/public/cpp",
     "//ash/public/cpp:test_support",
     "//ash/services/recording/public/mojom",
@@ -2686,27 +2800,16 @@ static_library("test_support") {
     "//base:i18n",
     "//base/test:test_support",
     "//cc:test_support",
-    "//chromeos/services/assistant/public/cpp",
-    "//chromeos/ui/frame",
-    "//ui/accessibility/mojom",
-    "//ui/platform_window/common",
-
-    # TODO(https://crbug.com/644336): Make CrasAudioHandler Chrome or Ash only.
-    "//chromeos/audio",
-    "//chromeos/constants",
     "//chromeos/dbus:test_support",
-
-    # TODO(https://crbug.com/644336): Remove dependencies on CrasAudioClient.
     "//chromeos/dbus/audio",
     "//chromeos/dbus/power",
     "//chromeos/dbus/power:power_manager_proto",
     "//chromeos/dbus/system_clock",
-
-    # TODO(https://crbug.com/644355): Remove Shill dependencies.
-    "//ash/keyboard/ui",
-    "//ash/keyboard/ui:test_support",
+    "//chromeos/login/login_state",
     "//chromeos/network:test_support",
+    "//chromeos/services/assistant/public/cpp",
     "//chromeos/system",
+    "//chromeos/ui/frame",
     "//components/account_id",
     "//components/prefs:test_support",
     "//components/user_manager:user_manager",
@@ -2717,6 +2820,7 @@ static_library("test_support") {
     "//skia",
     "//testing/gtest",
     "//ui/accessibility",
+    "//ui/accessibility/mojom",
     "//ui/aura",
     "//ui/aura:test_support",
     "//ui/base:test_support",
@@ -2732,6 +2836,7 @@ static_library("test_support") {
     "//ui/gl:test_support",
     "//ui/message_center",
     "//ui/message_center/public/cpp",
+    "//ui/platform_window/common",
     "//ui/views",
     "//ui/views:test_support",
     "//ui/wm",
diff --git a/chromium/ash/app_list/BUILD.gn b/chromium/ash/app_list/BUILD.gn
index a0ab4bc1921..79712b1cac1 100644
--- a/chromium/ash/app_list/BUILD.gn
+++ b/chromium/ash/app_list/BUILD.gn
@@ -46,8 +46,6 @@ component("app_list") {
     "views/assistant/assistant_main_view.h",
     "views/assistant/assistant_page_view.cc",
     "views/assistant/assistant_page_view.h",
-    "views/assistant/assistant_privacy_info_view.cc",
-    "views/assistant/assistant_privacy_info_view.h",
     "views/contents_view.cc",
     "views/contents_view.h",
     "views/expand_arrow_view.cc",
@@ -170,8 +168,6 @@ static_library("test_support") {
     "test/app_list_test_model.h",
     "test/app_list_test_view_delegate.cc",
     "test/app_list_test_view_delegate.h",
-    "test/test_app_list_color_provider.cc",
-    "test/test_app_list_color_provider.h",
     "test/test_search_result.cc",
     "test/test_search_result.h",
     "views/test/apps_grid_view_test_api.cc",
@@ -218,7 +214,6 @@ test("app_list_unittests") {
   sources = [
     "folder_image_unittest.cc",
     "test/run_all_unittests.cc",
-    "views/app_list_item_view_unittest.cc",
     "views/app_list_main_view_unittest.cc",
     "views/app_list_menu_model_adapter_unittest.cc",
     "views/app_list_view_unittest.cc",
@@ -237,13 +232,14 @@ test("app_list_unittests") {
   deps = [
     ":app_list",
     ":test_support",
+    "//ash/constants",
     "//ash/keyboard/ui",
     "//ash/public/cpp",
+    "//ash/public/cpp:test_support",
     "//ash/public/cpp/app_list/vector_icons",
     "//ash/search_box",
     "//base",
     "//base/test:test_support",
-    "//chromeos/constants",
     "//chromeos/services/assistant/public/cpp",
     "//mojo/core/embedder",
     "//mojo/public/cpp/bindings",
diff --git a/chromium/ash/assistant/model/BUILD.gn b/chromium/ash/assistant/model/BUILD.gn
index 7bbb28d52e3..6ca358d16af 100644
--- a/chromium/ash/assistant/model/BUILD.gn
+++ b/chromium/ash/assistant/model/BUILD.gn
@@ -50,6 +50,7 @@ component("model") {
     "//ash/public/cpp",
     "//chromeos/services/assistant/public/cpp",
     "//chromeos/services/assistant/public/mojom",
+    "//chromeos/services/libassistant/public/cpp:structs",
     "//ui/accessibility/mojom",
     "//ui/gfx/geometry",
   ]
diff --git a/chromium/ash/assistant/util/BUILD.gn b/chromium/ash/assistant/util/BUILD.gn
index 14d1fd0a451..f97e2b87795 100644
--- a/chromium/ash/assistant/util/BUILD.gn
+++ b/chromium/ash/assistant/util/BUILD.gn
@@ -26,10 +26,10 @@ component("util") {
 
   deps = [
     "//ash/assistant/model",
+    "//ash/constants",
     "//ash/public/cpp",
     "//base",
     "//base:i18n",
-    "//chromeos/constants",
     "//chromeos/services/assistant/public/cpp",
     "//chromeos/services/assistant/public/mojom",
     "//chromeos/ui/vector_icons",
diff --git a/chromium/ash/components/BUILD.gn b/chromium/ash/components/BUILD.gn
new file mode 100644
index 00000000000..f779dc1a65e
--- /dev/null
+++ b/chromium/ash/components/BUILD.gn
@@ -0,0 +1,23 @@
+# Copyright 2021 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/chromeos/ui_mode.gni")
+
+assert(is_chromeos_ash, "Non-ChromeOS builds cannot depend on //ash")
+
+# To add a unit test to this target, make a "unit_test" source_set in your
+# component and add a reference here.
+source_set("unit_tests") {
+  testonly = true
+  deps = [
+    "//ash/components/account_manager:unit_tests",
+    "//ash/components/audio:unit_tests",
+    "//ash/components/pcie_peripheral:unit_tests",
+  ]
+
+  data_deps = [
+    "//chromeos/strings:chromeos_test_strings",
+    "//ui/resources:ui_test_pak_data",
+  ]
+}
diff --git a/chromium/ash/components/account_manager/BUILD.gn b/chromium/ash/components/account_manager/BUILD.gn
new file mode 100644
index 00000000000..d60eec29f84
--- /dev/null
+++ b/chromium/ash/components/account_manager/BUILD.gn
@@ -0,0 +1,66 @@
+# Copyright 2019 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/chromeos/ui_mode.gni")
+import("//third_party/protobuf/proto_library.gni")
+
+assert(is_chromeos_ash, "Non-ChromeOS builds cannot depend on //ash")
+
+component("account_manager") {
+  sources = [
+    "account_manager.cc",
+    "account_manager.h",
+    "account_manager_ash.cc",
+    "account_manager_ash.h",
+    "account_manager_factory.cc",
+    "account_manager_factory.h",
+    "account_manager_ui.cc",
+    "account_manager_ui.h",
+  ]
+
+  public_deps = [
+    ":account_manager_proto",
+    "//components/account_manager_core:account_manager_core",
+  ]
+
+  deps = [
+    "//ash/constants",
+    "//base",
+    "//chromeos/crosapi/mojom",
+    "//components/prefs:prefs",
+    "//google_apis",
+    "//net",
+    "//services/network/public/cpp:cpp",
+  ]
+
+  defines = [ "IS_ASH_COMPONENTS_ACCOUNT_MANAGER_IMPL" ]
+}
+
+source_set("unit_tests") {
+  testonly = true
+  sources = [
+    "account_manager_ash_unittest.cc",
+    "account_manager_unittest.cc",
+  ]
+
+  deps = [
+    ":account_manager",
+    "//base",
+    "//base/test:test_support",
+    "//chromeos/crosapi/mojom",
+    "//components/prefs:test_support",
+    "//net",
+    "//services/network:test_support",
+    "//services/network/public/cpp:cpp",
+    "//testing/gmock",
+    "//testing/gtest",
+  ]
+}
+
+proto_library("account_manager_proto") {
+  visibility = [ ":*" ]
+  sources = [ "tokens.proto" ]
+
+  proto_out_dir = "ash/components/account_manager"
+}
diff --git a/chromium/ash/components/audio/BUILD.gn b/chromium/ash/components/audio/BUILD.gn
new file mode 100644
index 00000000000..0a6c5ce67a4
--- /dev/null
+++ b/chromium/ash/components/audio/BUILD.gn
@@ -0,0 +1,52 @@
+# Copyright 2019 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/chromeos/ui_mode.gni")
+import("//testing/test.gni")
+
+assert(is_chromeos_ash, "Non-Chrome-OS builds must not depend on //ash")
+
+component("audio") {
+  defines = [ "IS_ASH_COMPONENTS_AUDIO_IMPL" ]
+  deps = [
+    "//ash/constants",
+    "//base",
+    "//chromeos/dbus/audio",
+    "//components/prefs",
+    "//media/base:video_facing",
+    "//services/media_session/public/mojom",
+  ]
+  sources = [
+    "audio_device.cc",
+    "audio_device.h",
+    "audio_devices_pref_handler.h",
+    "audio_devices_pref_handler_impl.cc",
+    "audio_devices_pref_handler_impl.h",
+    "audio_devices_pref_handler_stub.cc",
+    "audio_devices_pref_handler_stub.h",
+    "audio_pref_observer.h",
+    "cras_audio_handler.cc",
+    "cras_audio_handler.h",
+    "sounds.h",
+  ]
+}
+
+source_set("unit_tests") {
+  testonly = true
+  deps = [
+    ":audio",
+    "//ash/constants",
+    "//base/test:test_support",
+    "//chromeos/dbus/audio",
+    "//components/prefs:test_support",
+    "//media/base:video_facing",
+    "//services/media_session/public/mojom",
+    "//testing/gmock",
+    "//testing/gtest",
+  ]
+  sources = [
+    "audio_devices_pref_handler_impl_unittest.cc",
+    "cras_audio_handler_unittest.cc",
+  ]
+}
diff --git a/chromium/ash/components/pcie_peripheral/BUILD.gn b/chromium/ash/components/pcie_peripheral/BUILD.gn
new file mode 100644
index 00000000000..569d73e546c
--- /dev/null
+++ b/chromium/ash/components/pcie_peripheral/BUILD.gn
@@ -0,0 +1,35 @@
+# Copyright 2021 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/chromeos/ui_mode.gni")
+
+assert(is_chromeos_ash, "Non-ChromeOS builds cannot depend on //ash")
+
+component("pcie_peripheral") {
+  defines = [ "IS_ASH_PCIE_PERIPHERAL_IMPL" ]
+
+  deps = [
+    "//base",
+    "//chromeos/dbus/typecd",
+  ]
+
+  sources = [
+    "pcie_peripheral_manager.cc",
+    "pcie_peripheral_manager.h",
+  ]
+}
+
+source_set("unit_tests") {
+  testonly = true
+
+  sources = [ "pcie_peripheral_manager_unittest.cc" ]
+
+  deps = [
+    ":pcie_peripheral",
+    "//base/test:test_support",
+    "//chromeos/dbus/typecd",
+    "//services/device/public/cpp:test_support",
+    "//testing/gtest",
+  ]
+}
diff --git a/chromium/ash/constants/BUILD.gn b/chromium/ash/constants/BUILD.gn
new file mode 100644
index 00000000000..90227b577eb
--- /dev/null
+++ b/chromium/ash/constants/BUILD.gn
@@ -0,0 +1,30 @@
+# Copyright 2019 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/chromeos/ui_mode.gni")
+
+assert(is_chromeos_ash, "Non-Chrome-OS builds must not depend on //ash")
+
+component("constants") {
+  output_name = "ash_constants"
+  defines = [ "IS_ASH_CONSTANTS_IMPL" ]
+  deps = [
+    "//base",
+    "//build:branding_buildflags",
+  ]
+  sources = [
+    "ash_constants.cc",
+    "ash_constants.h",
+    "ash_features.cc",
+    "ash_features.h",
+    "ash_paths.cc",
+    "ash_paths.h",
+    "ash_pref_names.cc",
+    "ash_pref_names.h",
+    "ash_switches.cc",
+    "ash_switches.h",
+    "devicetype.cc",
+    "devicetype.h",
+  ]
+}
diff --git a/chromium/ash/public/cpp/BUILD.gn b/chromium/ash/public/cpp/BUILD.gn
index 5f5392abd8e..655315d8d4f 100644
--- a/chromium/ash/public/cpp/BUILD.gn
+++ b/chromium/ash/public/cpp/BUILD.gn
@@ -55,9 +55,11 @@ component("cpp") {
     "app_list/app_list_types.h",
     "app_list/internal_app_id_constants.h",
     "app_menu_constants.h",
+    "app_types.cc",
     "app_types.h",
     "arc_app_id_provider.cc",
     "arc_app_id_provider.h",
+    "ash_constants.cc",
     "ash_constants.h",
     "ash_features.cc",
     "ash_features.h",
@@ -222,6 +224,9 @@ component("cpp") {
     "presentation_time_recorder.h",
     "privacy_screen_dlp_helper.cc",
     "privacy_screen_dlp_helper.h",
+    "projector/projector_client.h",
+    "projector/projector_controller.cc",
+    "projector/projector_controller.h",
     "quick_answers/controller/quick_answers_browser_client.cc",
     "quick_answers/controller/quick_answers_browser_client.h",
     "quick_answers/controller/quick_answers_controller.cc",
@@ -267,6 +272,9 @@ component("cpp") {
     "shell_window_ids.h",
     "shutdown_controller.cc",
     "shutdown_controller.h",
+    "style/color_mode_observer.h",
+    "style/color_provider.cc",
+    "style/color_provider.h",
     "stylus_utils.cc",
     "stylus_utils.h",
     "system_tray.cc",
@@ -283,6 +291,8 @@ component("cpp") {
     "update_types.h",
     "view_shadow.cc",
     "view_shadow.h",
+    "views_text_services_context_menu_impl.cc",
+    "views_text_services_context_menu_impl.h",
     "vm_camera_mic_constants.cc",
     "vm_camera_mic_constants.h",
     "wallpaper_controller.cc",
@@ -310,8 +320,8 @@ component("cpp") {
   ]
 
   deps = [
+    "//ash/constants",
     "//base/util/values:values_util",
-    "//chromeos/constants",
     "//chromeos/dbus/power:power_manager_proto",
     "//chromeos/services/assistant/public/cpp",
     "//chromeos/services/cellular_setup:in_process_esim_manager",
@@ -321,7 +331,7 @@ component("cpp") {
     "//chromeos/ui/vector_icons",
     "//components/pref_registry",
     "//components/prefs",
-    "//components/sync:rest_of_sync",
+    "//components/sync/model",
     "//mojo/public/cpp/bindings",
     "//net/traffic_annotation",
     "//services/network/public/cpp:cpp",
@@ -362,6 +372,7 @@ source_set("unit_tests") {
     "app_list/app_list_config_provider_unittest.cc",
     "default_scale_factor_retriever_unittest.cc",
     "file_icon_util_unittest.cc",
+    "holding_space/holding_space_image_unittest.cc",
     "holding_space/holding_space_item_unittest.cc",
     "metrics_util_unittest.cc",
     "pagination/pagination_model_unittest.cc",
@@ -375,6 +386,7 @@ source_set("unit_tests") {
     ":cpp",
     "//base",
     "//base/test:test_support",
+    "//chromeos/ui/vector_icons",
     "//mojo/public/cpp/bindings",
     "//testing/gtest",
     "//ui/aura:test_support",
@@ -388,6 +400,8 @@ source_set("unit_tests") {
 source_set("test_support") {
   testonly = true
   sources = [
+    "test/test_app_list_color_provider.cc",
+    "test/test_app_list_color_provider.h",
     "test/test_image_downloader.cc",
     "test/test_image_downloader.h",
     "test/test_keyboard_controller_observer.cc",
diff --git a/chromium/ash/public/cpp/external_arc/BUILD.gn b/chromium/ash/public/cpp/external_arc/BUILD.gn
index 8f83d7faa86..7abbd103601 100644
--- a/chromium/ash/public/cpp/external_arc/BUILD.gn
+++ b/chromium/ash/public/cpp/external_arc/BUILD.gn
@@ -30,19 +30,16 @@ static_library("external_arc") {
     "overlay/arc_overlay_controller_impl.h",
     "overlay/arc_overlay_manager.cc",
     "overlay/arc_overlay_manager.h",
-    "overlay/test/fake_arc_overlay_controller_impl.cc",
-    "overlay/test/fake_arc_overlay_controller_impl.h",
-    "overlay/test/test_arc_overlay_manager.cc",
-    "overlay/test/test_arc_overlay_manager.h",
     "toast/arc_toast_surface_manager.cc",
     "toast/arc_toast_surface_manager.h",
   ]
   defines = [ "ASH_PUBLIC_IMPLEMENTATION" ]
   deps = [
+    "//ash/constants",
     "//ash/public/cpp",
     "//base",
-    "//chromeos/constants",
     "//components/account_id",
+    "//components/arc:arc_base_utils",
     "//components/arc:arc_metrics_constants",
     "//components/arc:connection_holder",
     "//components/arc/mojom:notifications",
@@ -96,6 +93,10 @@ source_set("test_support") {
     "message_center/mock_arc_notification_item.h",
     "message_center/mock_arc_notification_surface.cc",
     "message_center/mock_arc_notification_surface.h",
+    "overlay/test/fake_arc_overlay_controller_impl.cc",
+    "overlay/test/fake_arc_overlay_controller_impl.h",
+    "overlay/test/test_arc_overlay_manager.cc",
+    "overlay/test/test_arc_overlay_manager.h",
   ]
   deps = [
     ":external_arc",
diff --git a/chromium/ash/resources/vector_icons/BUILD.gn b/chromium/ash/resources/vector_icons/BUILD.gn
index 4b122a0a17d..726c8c4f2d2 100644
--- a/chromium/ash/resources/vector_icons/BUILD.gn
+++ b/chromium/ash/resources/vector_icons/BUILD.gn
@@ -30,15 +30,22 @@ aggregate_vector_icons("ash_vector_icons") {
     "battery.icon",
     "capture_mode.icon",
     "capture_mode_circle_stop.icon",
-    "capture_mode_feedback.icon",
+    "capture_mode_close.icon",
+    "capture_mode_copied_to_clipboard.icon",
     "capture_mode_fullscreen.icon",
     "capture_mode_image.icon",
+    "capture_mode_mic.icon",
+    "capture_mode_mic_off.icon",
+    "capture_mode_play.icon",
     "capture_mode_region.icon",
+    "capture_mode_settings.icon",
     "capture_mode_video.icon",
     "capture_mode_window.icon",
+    "check.icon",
     "check_circle.icon",
     "chevron_right.icon",
     "clipboard.icon",
+    "clipboard_empty.icon",
     "clipboard_launcher_inner.icon",
     "clipboard_launcher_no_assistant.icon",
     "clipboard_launcher_outer.icon",
@@ -53,8 +60,13 @@ aggregate_vector_icons("ash_vector_icons") {
     "dictation_off_newui.icon",
     "dictation_on.icon",
     "dictation_on_newui.icon",
+    "do_not_disturb_disabled.icon",
     "dogfood.icon",
+    "eight_files.icon",
+    "files_app.icon",
+    "five_files.icon",
     "folder.icon",
+    "four_files.icon",
     "global_media_controls.icon",
     "holding_space.icon",
     "hollow_check_circle.icon",
@@ -69,6 +81,8 @@ aggregate_vector_icons("ash_vector_icons") {
     "lock_screen_backspace.icon",
     "lock_screen_caps_lock.icon",
     "lock_screen_dropdown.icon",
+    "lock_screen_easy_unlock_close.icon",
+    "lock_screen_easy_unlock_open.icon",
     "lock_screen_fingerprint.icon",
     "lock_screen_fingerprint_success.icon",
     "lock_screen_password_invisible.icon",
@@ -81,6 +95,7 @@ aggregate_vector_icons("ash_vector_icons") {
     "login_screen_button_dropdown.icon",
     "login_screen_menu_dropdown.icon",
     "mic.icon",
+    "more_than_nine_files.icon",
     "music_note.icon",
     "muted_microphone.icon",
     "network_badge_off.icon",
@@ -100,6 +115,7 @@ aggregate_vector_icons("ash_vector_icons") {
     "network_ethernet.icon",
     "network_mobile_not_connected_x.icon",
     "network_vpn.icon",
+    "nine_files.icon",
     "notification_accessibility.icon",
     "notification_accessibility_braille.icon",
     "notification_battery_critical.icon",
@@ -133,14 +149,17 @@ aggregate_vector_icons("ash_vector_icons") {
     "palette_action_capture_screen.icon",
     "palette_action_create_note.icon",
     "palette_mode_laser_pointer.icon",
+    "palette_mode_laser_pointer_light_mode.icon",
     "palette_mode_magnify.icon",
     "palette_mode_metalayer.icon",
     "palette_tray_icon_capture_region.icon",
     "palette_tray_icon_default.icon",
     "palette_tray_icon_default_newui.icon",
     "palette_tray_icon_laser_pointer.icon",
+    "palette_tray_icon_laser_pointer_light_mode.icon",
     "palette_tray_icon_magnify.icon",
     "palette_tray_icon_metalayer.icon",
+    "palette_tray_icon_projector.icon",
     "phone_hub_battery_saver.icon",
     "phone_hub_battery_saver_outline.icon",
     "phone_hub_default_favicon.icon",
@@ -156,15 +175,24 @@ aggregate_vector_icons("ash_vector_icons") {
     "pin_request_lock.icon",
     "pinned.icon",
     "privacy_screen.icon",
+    "projector_drag_handle.icon",
+    "projector_key_idea.icon",
+    "remove_circle_outline.icon",
     "select_to_speak_next_paragraph.icon",
     "select_to_speak_next_sentence.icon",
     "select_to_speak_pause.icon",
     "select_to_speak_play.icon",
     "select_to_speak_prev_paragraph.icon",
     "select_to_speak_prev_sentence.icon",
+    "select_to_speak_reading_speed_fast.icon",
+    "select_to_speak_reading_speed_faster.icon",
+    "select_to_speak_reading_speed_normal.icon",
+    "select_to_speak_reading_speed_peppy.icon",
+    "select_to_speak_reading_speed_slow.icon",
     "select_to_speak_stop.icon",
     "send.icon",
     "settings.icon",
+    "seven_files.icon",
     "shelf_add_person_button.icon",
     "shelf_apps_button.icon",
     "shelf_back.icon",
@@ -182,6 +210,8 @@ aggregate_vector_icons("ash_vector_icons") {
     "shelf_shutdown_button.icon",
     "shelf_sign_out_button.icon",
     "shelf_unlock_button.icon",
+    "six_files.icon",
+    "stylus_battery_status_unknown.icon",
     "switch_access.icon",
     "switch_access_back.icon",
     "switch_access_close.icon",
@@ -190,9 +220,11 @@ aggregate_vector_icons("ash_vector_icons") {
     "switch_access_decrement.icon",
     "switch_access_end_text_selection.icon",
     "switch_access_increment.icon",
+    "switch_access_item_scan.icon",
     "switch_access_jump_to_beginning_of_text.icon",
     "switch_access_jump_to_end_of_text.icon",
     "switch_access_keyboard.icon",
+    "switch_access_left_click.icon",
     "switch_access_move_backward_one_char_of_text.icon",
     "switch_access_move_backward_one_word_of_text.icon",
     "switch_access_move_cursor.icon",
@@ -202,6 +234,7 @@ aggregate_vector_icons("ash_vector_icons") {
     "switch_access_move_up_one_line_of_text.icon",
     "switch_access_paste.icon",
     "switch_access_point_scan.icon",
+    "switch_access_right_click.icon",
     "switch_access_scroll_down.icon",
     "switch_access_scroll_left.icon",
     "switch_access_scroll_right.icon",
@@ -289,11 +322,12 @@ aggregate_vector_icons("ash_vector_icons") {
     "system_tray_tracing.icon",
     "system_tray_update.icon",
     "system_tray_volume_mute.icon",
+    "three_files.icon",
     "touch_calibration_complete_check.icon",
     "touch_calibration_hand.icon",
     "tray_action_new_lock_screen_note.icon",
+    "two_files.icon",
     "unified_menu_accessibility.icon",
-    "unified_menu_arrow_back.icon",
     "unified_menu_battery_alert.icon",
     "unified_menu_battery_alert_outline.icon",
     "unified_menu_battery_bolt.icon",
diff --git a/chromium/ash/services/recording/public/mojom/BUILD.gn b/chromium/ash/services/recording/public/mojom/BUILD.gn
index a9eadd3673d..b59b7b0156f 100644
--- a/chromium/ash/services/recording/public/mojom/BUILD.gn
+++ b/chromium/ash/services/recording/public/mojom/BUILD.gn
@@ -11,5 +11,6 @@ mojom("mojom") {
     "//media/mojo/mojom",
     "//services/audio/public/mojom",
     "//services/viz/privileged/mojom/compositing",
+    "//ui/gfx/image/mojom",
   ]
 }
diff --git a/chromium/ash/services/recording/public/mojom/recording_service.mojom b/chromium/ash/services/recording/public/mojom/recording_service.mojom
index f53cbeab336..30bbd81fd8e 100644
--- a/chromium/ash/services/recording/public/mojom/recording_service.mojom
+++ b/chromium/ash/services/recording/public/mojom/recording_service.mojom
@@ -8,7 +8,9 @@ import "mojo/public/mojom/base/big_string.mojom";
 import "services/audio/public/mojom/stream_factory.mojom";
 import "services/viz/privileged/mojom/compositing/frame_sink_video_capture.mojom";
 import "services/viz/public/mojom/compositing/frame_sink_id.mojom";
+import "services/viz/public/mojom/compositing/subtree_capture_id.mojom";
 import "ui/gfx/geometry/mojom/geometry.mojom";
+import "ui/gfx/image/mojom/image.mojom";
 
 // Defines the interface for the recording service client (e.g. ash), which
 // lives in a remote process other than that of the recording service itself.
@@ -24,13 +26,14 @@ interface RecordingServiceClient {
   // Called by the service to inform the client that an in-progress video
   // recording ended, and no further frames will be provided. If |success| is
   // false, then recording is being terminated by the service itself due to an
-  // internal failure.
-  OnRecordingEnded(bool success);
+  // internal failure. The service can provide an RGB image |thumbnail|
+  // representing the recorded video. It can be empty in case of a failure.
+  OnRecordingEnded(bool success, gfx.mojom.ImageSkia? thumbnail);
 };
 
 // Defines the interface of the recording service which is implemented by
 // |recording::RecordingService| and runs in its own utility process. It is
-// launched by the process on which the |RecordingServiceClient| resides, and is
+// launched by the Ash on which the |RecordingServiceClient| resides, and is
 // used to perform audio/video recording of the whole screen, a partial region
 // of it, or an individual window. The service captures, encodes, and muxes the
 // audio and video frames, and sends the WebM muxed video chunks to the client.
@@ -44,47 +47,102 @@ interface RecordingService {
 
   // Starts a fullscreen recording of a root window which has the given
   // |frame_sink_id|. The resulting video will have a resolution equal to the
-  // given |video_size| in DIPs. Note that if the aspect ratio of |video_size|
-  // is different than that of the captured source, the content will letterbox
-  // or pillarbox as needed.
+  // given |frame_sink_size| in DIPs. Note that calling OnFrameSinkSizeChanged()
+  // will do nothing in this recording mode, and the output video will maintain
+  // the same size as the given |frame_sink_size|. The content of the video will
+  // letterbox within that size as needed. This is desired in Fullscreen
+  // recording, as it makes it clear when the recorded display changes rotation,
+  // resolution, or device scale factor.
   // |frame_sink_id| must be valid.
   RecordFullscreen(
       pending_remote<RecordingServiceClient> client,
       pending_remote<viz.mojom.FrameSinkVideoCapturer> video_capturer,
       pending_remote<audio.mojom.StreamFactory>? audio_stream_factory,
       viz.mojom.FrameSinkId frame_sink_id,
-      gfx.mojom.Size video_size);
+      gfx.mojom.Size frame_sink_size);
 
-  // Starts a recording of a window which has the given |frame_sink_id|.
-  // |initial_video_size| and |max_video_size| specify a range of acceptable
-  // capture resolutions in DIPs. The resolution of the output will adapt
-  // dynamically as the window being recorded gets resized by the end user (e.g.
-  // resized, maximized, fullscreened, ... etc.).
-  // Note that if the aspect ratio of |max_video_size| is different than that of
-  // the captured source, the content will letterbox  or pillarbox as needed.
-  // |frame_sink_id| must be valid.
+  // Starts a recording of a window. If this window has a valid |frame_sink_id|,
+  // and submits its own compositor frames independently, then
+  // |subtree_capture_id| can be default-constructed and won't be used.
+  // Otherwise, for windows that don't submit compositor frames (e.g. non-root
+  // windows), the given |frame_sink_id| must be of the root window they're
+  // descendant from, and they must be made capturable by tagging the them with
+  // a valid |subtree_capture_id| before calling this (see
+  // aura::Window::MakeWindowCapturable()).
+  // |window_size| is the initial size of the recorded window, and can be
+  // updated by calling OnRecordedWindowSizeChanged() when the window gets
+  // resized by the user (e.g. resized, maximized, fullscreened, ... etc.).
+  // Unlike fullscreen recording, updating the window size will update the
+  // output video size, since it is desired for the video dimensions to always
+  // match the those of the window without letterboxing.
+  // |frame_sink_size| is the current size of the frame sink whose
+  // |frame_sink_id| was given. This can be updated by calling
+  // OnFrameSinkSizeChanged() which will update the resolution constraints on
+  // the capturer to avoid letterboxing, so the resulting video frames are sharp
+  // and crisp, and their size match that of the window.
   RecordWindow(
       pending_remote<RecordingServiceClient> client,
       pending_remote<viz.mojom.FrameSinkVideoCapturer> video_capturer,
       pending_remote<audio.mojom.StreamFactory>? audio_stream_factory,
       viz.mojom.FrameSinkId frame_sink_id,
-      gfx.mojom.Size initial_video_size,
-      gfx.mojom.Size max_video_size);
+      gfx.mojom.Size frame_sink_size,
+      viz.mojom.SubtreeCaptureId subtree_capture_id,
+      gfx.mojom.Size window_size);
 
   // Starts a recording of a partial region of a root window which has the given
   // |frame_sink_id|. The video will be captured at a resolution equal to the
-  // given |full_capture_size| in DIPs, but the resulting video frames will be
+  // given |frame_sink_size| in DIPs, but the resulting video frames will be
   // cropped to the given |crop_region| in DIPs.
+  // If the root window gets resized (due to e.g. rotation, device scale factor
+  // change ... etc.) OnFrameSinkSizeChanged() must be called to update the
+  // resolution constraints on the capturer in order to avoid letterboxing.
+  // Letterboxing breaks the relation between |crop_region| and generated video
+  // frame sizes, which results in the wrong region being shown in the video.
   // |frame_sink_id| must be valid.
   RecordRegion(
       pending_remote<RecordingServiceClient> client,
       pending_remote<viz.mojom.FrameSinkVideoCapturer> video_capturer,
       pending_remote<audio.mojom.StreamFactory>? audio_stream_factory,
       viz.mojom.FrameSinkId frame_sink_id,
-      gfx.mojom.Size full_capture_size,
+      gfx.mojom.Size frame_sink_size,
       gfx.mojom.Rect crop_region);
 
   // Stops an on-going video recording. The remaining frames will continue being
   // provided to the client until OnRecordingEnded() is called.
   StopRecording();
+
+  // Called by the client to let the service know that a window being recorded
+  // is about to move to a different display (i.e a different root window),
+  // giving it the |new_frame_sink_id| of that new root window. It also provides
+  // the |new_frame_sink_size| in DIPs (since the new display may have different
+  // bounds).
+  // Note that changing the window's root doesn't affect the window's
+  // SubtreeCaptureId, and therefore it doesn't need to be reprovided.
+  // This can *only* be called when the service is already recording a window
+  // (i.e. RecordWindow() has already been called to start the recording of a
+  // window).
+  OnRecordedWindowChangingRoot(
+      viz.mojom.FrameSinkId new_frame_sink_id,
+      gfx.mojom.Size new_frame_sink_size);
+
+  // Called by the client to let the service know that a window being recorded
+  // has been resized (e.g. due to snapping, maximizing, user resizing, ...
+  // etc.). |new_window_size| is the new size in DIPs which will be used to
+  // change the dimensions of the output video to match the new size. Therefore,
+  // it's better to throttle such changes to avoid having to change the size of
+  // the video repeatedly.
+  // This can *only* be called when the service is already recording a window
+  // (i.e. RecordWindow() has already been called to start the recording of a
+  // window).
+  OnRecordedWindowSizeChanged(gfx.mojom.Size new_window_size);
+
+  // Called by the client to let the service know that the frame sink being
+  // recorded (whose |frame_sink_id| was provided to the above functions) has
+  // changed its size to |new_frame_sink_size| in DIPs.
+  // The service will update the capturer resolution constraints and the output
+  // video size if needed.
+  // This does nothing when recording a fullscreen display, as the capturer
+  // already takes care of centering and letter-boxing the video content within
+  // the initial requested video resolution.
+  OnFrameSinkSizeChanged(gfx.mojom.Size new_frame_sink_size);
 };
diff --git a/chromium/ash/shortcut_viewer/BUILD.gn b/chromium/ash/shortcut_viewer/BUILD.gn
index 25df657cf8d..f9b2d57e62a 100644
--- a/chromium/ash/shortcut_viewer/BUILD.gn
+++ b/chromium/ash/shortcut_viewer/BUILD.gn
@@ -26,6 +26,7 @@ source_set("shortcut_viewer") {
 
   deps = [
     "//ash",
+    "//ash/constants",
     "//ash/public/cpp",
     "//ash/public/cpp/resources:ash_public_unscaled_resources",
     "//ash/search_box",
diff --git a/chromium/ash/shortcut_viewer/strings/BUILD.gn b/chromium/ash/shortcut_viewer/strings/BUILD.gn
index 04202153115..a2f8a466963 100644
--- a/chromium/ash/shortcut_viewer/strings/BUILD.gn
+++ b/chromium/ash/shortcut_viewer/strings/BUILD.gn
@@ -2,65 +2,13 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/locales.gni")
 import("//tools/grit/grit_rule.gni")
 
 grit("strings") {
   source = "../shortcut_viewer_strings.grd"
-  outputs = [
-    "grit/shortcut_viewer_strings.h",
-    "shortcut_viewer_strings_am.pak",
-    "shortcut_viewer_strings_ar.pak",
-    "shortcut_viewer_strings_bg.pak",
-    "shortcut_viewer_strings_bn.pak",
-    "shortcut_viewer_strings_ca.pak",
-    "shortcut_viewer_strings_cs.pak",
-    "shortcut_viewer_strings_da.pak",
-    "shortcut_viewer_strings_de.pak",
-    "shortcut_viewer_strings_el.pak",
-    "shortcut_viewer_strings_en-GB.pak",
-    "shortcut_viewer_strings_en-US.pak",
-    "shortcut_viewer_strings_es-419.pak",
-    "shortcut_viewer_strings_es.pak",
-    "shortcut_viewer_strings_et.pak",
-    "shortcut_viewer_strings_fake-bidi.pak",
-    "shortcut_viewer_strings_fa.pak",
-    "shortcut_viewer_strings_fil.pak",
-    "shortcut_viewer_strings_fi.pak",
-    "shortcut_viewer_strings_fr.pak",
-    "shortcut_viewer_strings_gu.pak",
-    "shortcut_viewer_strings_he.pak",
-    "shortcut_viewer_strings_hi.pak",
-    "shortcut_viewer_strings_hr.pak",
-    "shortcut_viewer_strings_hu.pak",
-    "shortcut_viewer_strings_id.pak",
-    "shortcut_viewer_strings_it.pak",
-    "shortcut_viewer_strings_ja.pak",
-    "shortcut_viewer_strings_kn.pak",
-    "shortcut_viewer_strings_ko.pak",
-    "shortcut_viewer_strings_lt.pak",
-    "shortcut_viewer_strings_lv.pak",
-    "shortcut_viewer_strings_ml.pak",
-    "shortcut_viewer_strings_mr.pak",
-    "shortcut_viewer_strings_ms.pak",
-    "shortcut_viewer_strings_nb.pak",
-    "shortcut_viewer_strings_nl.pak",
-    "shortcut_viewer_strings_pl.pak",
-    "shortcut_viewer_strings_pt-BR.pak",
-    "shortcut_viewer_strings_pt-PT.pak",
-    "shortcut_viewer_strings_ro.pak",
-    "shortcut_viewer_strings_ru.pak",
-    "shortcut_viewer_strings_sk.pak",
-    "shortcut_viewer_strings_sl.pak",
-    "shortcut_viewer_strings_sr.pak",
-    "shortcut_viewer_strings_sv.pak",
-    "shortcut_viewer_strings_sw.pak",
-    "shortcut_viewer_strings_ta.pak",
-    "shortcut_viewer_strings_te.pak",
-    "shortcut_viewer_strings_th.pak",
-    "shortcut_viewer_strings_tr.pak",
-    "shortcut_viewer_strings_uk.pak",
-    "shortcut_viewer_strings_vi.pak",
-    "shortcut_viewer_strings_zh-CN.pak",
-    "shortcut_viewer_strings_zh-TW.pak",
-  ]
+  outputs = [ "grit/shortcut_viewer_strings.h" ] +
+            process_file_template(
+                locales_with_fake_bidi,
+                [ "shortcut_viewer_strings_{{source_name_part}}.pak" ])
 }
diff --git a/chromium/ash/shortcut_viewer/vector_icons/BUILD.gn b/chromium/ash/shortcut_viewer/vector_icons/BUILD.gn
index 626286bb853..f9695914d2c 100644
--- a/chromium/ash/shortcut_viewer/vector_icons/BUILD.gn
+++ b/chromium/ash/shortcut_viewer/vector_icons/BUILD.gn
@@ -26,6 +26,7 @@ aggregate_vector_icons("ksv_vector_icons") {
     "ksv_search_close.icon",
     "ksv_search_no_result.icon",
     "ksv_separator_plus.icon",
+    "ksv_snapshot.icon",
     "ksv_volume_down.icon",
     "ksv_volume_up.icon",
   ]
diff --git a/chromium/ash/strings/BUILD.gn b/chromium/ash/strings/BUILD.gn
index f4a002f03a3..48b58a51be3 100644
--- a/chromium/ash/strings/BUILD.gn
+++ b/chromium/ash/strings/BUILD.gn
@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/locales.gni")
 import("//tools/grit/grit_rule.gni")
 import("//tools/grit/repack.gni")
 
@@ -9,66 +10,10 @@ assert(is_chromeos)
 
 grit("strings") {
   source = "../ash_strings.grd"
-
   defines = [ "is_chrome_branded=$is_chrome_branded" ]
-
-  outputs = [
-    "grit/ash_strings.h",
-    "ash_strings_am.pak",
-    "ash_strings_ar.pak",
-    "ash_strings_bg.pak",
-    "ash_strings_bn.pak",
-    "ash_strings_ca.pak",
-    "ash_strings_cs.pak",
-    "ash_strings_da.pak",
-    "ash_strings_de.pak",
-    "ash_strings_el.pak",
-    "ash_strings_en-GB.pak",
-    "ash_strings_en-US.pak",
-    "ash_strings_es.pak",
-    "ash_strings_es-419.pak",
-    "ash_strings_et.pak",
-    "ash_strings_fa.pak",
-    "ash_strings_fake-bidi.pak",
-    "ash_strings_fi.pak",
-    "ash_strings_fil.pak",
-    "ash_strings_fr.pak",
-    "ash_strings_gu.pak",
-    "ash_strings_he.pak",
-    "ash_strings_hi.pak",
-    "ash_strings_hr.pak",
-    "ash_strings_hu.pak",
-    "ash_strings_id.pak",
-    "ash_strings_it.pak",
-    "ash_strings_ja.pak",
-    "ash_strings_kn.pak",
-    "ash_strings_ko.pak",
-    "ash_strings_lt.pak",
-    "ash_strings_lv.pak",
-    "ash_strings_ml.pak",
-    "ash_strings_mr.pak",
-    "ash_strings_ms.pak",
-    "ash_strings_nl.pak",
-    "ash_strings_nb.pak",
-    "ash_strings_pl.pak",
-    "ash_strings_pt-BR.pak",
-    "ash_strings_pt-PT.pak",
-    "ash_strings_ro.pak",
-    "ash_strings_ru.pak",
-    "ash_strings_sk.pak",
-    "ash_strings_sl.pak",
-    "ash_strings_sr.pak",
-    "ash_strings_sv.pak",
-    "ash_strings_sw.pak",
-    "ash_strings_ta.pak",
-    "ash_strings_te.pak",
-    "ash_strings_th.pak",
-    "ash_strings_tr.pak",
-    "ash_strings_uk.pak",
-    "ash_strings_vi.pak",
-    "ash_strings_zh-CN.pak",
-    "ash_strings_zh-TW.pak",
-  ]
+  outputs = [ "grit/ash_strings.h" ] +
+            process_file_template(locales_with_fake_bidi,
+                                  [ "ash_strings_{{source_name_part}}.pak" ])
 }
 
 # Creates locale-specific pak files with strings needed for ash_unittests, etc.