BASELINE: Update Chromium to 80.0.3987.136

Change-Id: I98e1649aafae85ba3a83e67af00bb27ef301db7b
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>

10 files changed, 128 insertions, 72 deletions

diff --git a/chromium/ash/BUILD.gn b/chromium/ash/BUILD.gn
index 10d8dfbd1f2..40a65e5c774 100644
--- a/chromium/ash/BUILD.gn
+++ b/chromium/ash/BUILD.gn
@@ -31,14 +31,8 @@ component("ash") {
     "accessibility/accessibility_controller_impl.h",
     "accessibility/accessibility_delegate.h",
     "accessibility/focus_ring_controller.h",
-    "app_list/app_list_controller_impl.h",
-    "detachable_base/detachable_base_handler.h",
-    "detachable_base/detachable_base_observer.h",
-    "display/display_prefs.h",
     "display/output_protection_delegate.h",
     "display/screen_orientation_controller.h",
-    "events/event_rewriter_controller_impl.h",
-    "focus_cycler.h",
     "frame/header_view.h",
     "frame/non_client_frame_view_ash.h",
     "frame/wide_frame_view.h",
@@ -50,6 +44,8 @@ component("ash") {
     "public/cpp/arc_custom_tab.h",
     "public/cpp/ash_prefs.h",
     "public/cpp/assistant/assistant_settings.h",
+    "public/cpp/autotest_desks_api.h",
+    "public/cpp/autotest_private_api_utils.h",
     "public/cpp/docked_magnifier_controller.h",
     "public/cpp/event_rewriter_controller.h",
     "public/cpp/first_run_helper.h",
@@ -74,12 +70,9 @@ component("ash") {
     "shell_observer.h",
     "sticky_keys/sticky_keys_controller.h",
     "system/status_area_widget.h",
-    "system/status_area_widget_delegate.h",
     "system/tray/system_tray_notifier.h",
     "system/unified/unified_system_tray.h",
     "touch/touch_hud_debug.h",
-    "touch/touch_observer_hud.h",
-    "wm/client_controlled_state.h",
     "wm/desks/desks_util.h",
     "wm/drag_window_resizer.h",
     "wm/mru_window_tracker.h",
@@ -171,14 +164,21 @@ component("ash") {
     "ambient/model/photo_model.cc",
     "ambient/model/photo_model.h",
     "ambient/model/photo_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_container_view.cc",
     "ambient/ui/ambient_container_view.h",
+    "ambient/ui/assistant_response_container_view.cc",
+    "ambient/ui/assistant_response_container_view.h",
     "ambient/ui/photo_view.cc",
     "ambient/ui/photo_view.h",
     "ambient/util/ambient_util.cc",
     "ambient/util/ambient_util.h",
     "animation/animation_change_type.h",
     "app_list/app_list_controller_impl.cc",
+    "app_list/app_list_controller_impl.h",
     "app_list/app_list_presenter_delegate_impl.cc",
     "app_list/app_list_presenter_delegate_impl.h",
     "ash_export.h",
@@ -195,6 +195,8 @@ component("ash") {
     "assistant/assistant_notification_controller.h",
     "assistant/assistant_notification_expiry_monitor.cc",
     "assistant/assistant_notification_expiry_monitor.h",
+    "assistant/assistant_proactive_suggestions_controller.cc",
+    "assistant/assistant_proactive_suggestions_controller.h",
     "assistant/assistant_screen_context_controller.cc",
     "assistant/assistant_screen_context_controller.h",
     "assistant/assistant_settings.cc",
@@ -208,6 +210,10 @@ component("ash") {
     "assistant/assistant_ui_controller.h",
     "assistant/assistant_view_delegate_impl.cc",
     "assistant/assistant_view_delegate_impl.h",
+    "assistant/assistant_web_ui_controller.cc",
+    "assistant/assistant_web_ui_controller.h",
+    "assistant/assistant_web_view_delegate_impl.cc",
+    "assistant/assistant_web_view_delegate_impl.h",
     "autoclick/autoclick_controller.cc",
     "autoclick/autoclick_controller.h",
     "autoclick/autoclick_drag_event_rewriter.cc",
@@ -216,6 +222,7 @@ component("ash") {
     "autoclick/autoclick_ring_handler.h",
     "autoclick/autoclick_scroll_position_handler.cc",
     "autoclick/autoclick_scroll_position_handler.h",
+    "autotest_private_api_utils.cc",
     "bluetooth_devices_observer.cc",
     "bluetooth_devices_observer.h",
     "cancel_mode.cc",
@@ -235,8 +242,10 @@ component("ash") {
     "debug.cc",
     "debug.h",
     "detachable_base/detachable_base_handler.cc",
+    "detachable_base/detachable_base_handler.h",
     "detachable_base/detachable_base_notification_controller.cc",
     "detachable_base/detachable_base_notification_controller.h",
+    "detachable_base/detachable_base_observer.h",
     "detachable_base/detachable_base_pairing_status.h",
     "disconnected_app_handler.cc",
     "disconnected_app_handler.h",
@@ -257,6 +266,7 @@ component("ash") {
     "display/display_move_window_util.cc",
     "display/display_move_window_util.h",
     "display/display_prefs.cc",
+    "display/display_prefs.h",
     "display/display_shutdown_observer.cc",
     "display/display_shutdown_observer.h",
     "display/display_util.cc",
@@ -273,7 +283,6 @@ component("ash") {
     "display/null_mouse_warp_controller.cc",
     "display/null_mouse_warp_controller.h",
     "display/output_protection_delegate.cc",
-    "display/output_protection_delegate.h",
     "display/overscan_calibrator.cc",
     "display/overscan_calibrator.h",
     "display/persistent_window_controller.cc",
@@ -289,6 +298,7 @@ component("ash") {
     "display/screen_ash.cc",
     "display/screen_ash.h",
     "display/screen_orientation_controller.cc",
+    "display/screen_orientation_controller.h",
     "display/screen_position_controller.cc",
     "display/screen_position_controller.h",
     "display/shared_display_edge_indicator.cc",
@@ -308,6 +318,7 @@ component("ash") {
     "drag_drop/drag_image_view.cc",
     "drag_drop/drag_image_view.h",
     "events/event_rewriter_controller_impl.cc",
+    "events/event_rewriter_controller_impl.h",
     "events/keyboard_driven_event_rewriter.cc",
     "events/keyboard_driven_event_rewriter.h",
     "events/select_to_speak_event_handler.cc",
@@ -321,6 +332,7 @@ component("ash") {
     "first_run/first_run_helper_impl.cc",
     "first_run/first_run_helper_impl.h",
     "focus_cycler.cc",
+    "focus_cycler.h",
     "frame/header_view.cc",
     "frame/non_client_frame_view_ash.cc",
     "frame/snap_controller_impl.cc",
@@ -340,7 +352,6 @@ component("ash") {
     "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_launcher_gesture_handler_observer.h",
     "home_screen/home_screen_controller.cc",
     "home_screen/home_screen_controller.h",
     "home_screen/home_screen_delegate.h",
@@ -348,6 +359,8 @@ component("ash") {
     "home_screen/home_screen_presenter.h",
     "home_screen/swipe_home_to_overview_controller.cc",
     "home_screen/swipe_home_to_overview_controller.h",
+    "home_screen/window_scale_animation.cc",
+    "home_screen/window_scale_animation.h",
     "host/ash_window_tree_host.cc",
     "host/ash_window_tree_host.h",
     "host/ash_window_tree_host_init_params.h",
@@ -403,6 +416,8 @@ component("ash") {
     "login/ui/animation_frame.h",
     "login/ui/arrow_button_view.cc",
     "login/ui/arrow_button_view.h",
+    "login/ui/bottom_status_indicator.cc",
+    "login/ui/bottom_status_indicator.h",
     "login/ui/horizontal_image_sequence_animation_decoder.cc",
     "login/ui/horizontal_image_sequence_animation_decoder.h",
     "login/ui/hover_notifier.cc",
@@ -471,6 +486,7 @@ component("ash") {
     "magnifier/docked_magnifier_controller_impl.cc",
     "magnifier/docked_magnifier_controller_impl.h",
     "magnifier/magnification_controller.cc",
+    "magnifier/magnification_controller.h",
     "magnifier/magnifier_utils.cc",
     "magnifier/magnifier_utils.h",
     "magnifier/partial_magnification_controller.cc",
@@ -545,6 +561,7 @@ component("ash") {
     "scoped_root_window_for_new_windows.h",
     "screen_util.cc",
     "screen_util.h",
+    "screenshot_delegate.h",
     "session/multiprofiles_intro_dialog.cc",
     "session/multiprofiles_intro_dialog.h",
     "session/session_aborted_dialog.cc",
@@ -552,6 +569,7 @@ component("ash") {
     "session/session_activation_observer_holder.cc",
     "session/session_activation_observer_holder.h",
     "session/session_controller_impl.cc",
+    "session/session_controller_impl.h",
     "session/session_observer.cc",
     "session/session_observer.h",
     "session/teleport_warning_dialog.cc",
@@ -564,6 +582,8 @@ component("ash") {
     "shelf/home_button.h",
     "shelf/home_button_controller.cc",
     "shelf/home_button_controller.h",
+    "shelf/hotseat_transition_animator.cc",
+    "shelf/hotseat_transition_animator.h",
     "shelf/hotseat_widget.cc",
     "shelf/hotseat_widget.h",
     "shelf/login_shelf_view.cc",
@@ -611,6 +631,7 @@ component("ash") {
     "shelf/shelf_locking_manager.h",
     "shelf/shelf_menu_model_adapter.cc",
     "shelf/shelf_menu_model_adapter.h",
+    "shelf/shelf_metrics.h",
     "shelf/shelf_navigation_widget.cc",
     "shelf/shelf_navigation_widget.h",
     "shelf/shelf_observer.h",
@@ -919,6 +940,7 @@ component("ash") {
     "system/status_area_layout_manager.h",
     "system/status_area_widget.cc",
     "system/status_area_widget_delegate.cc",
+    "system/status_area_widget_delegate.h",
     "system/supervised/supervised_icon_string.cc",
     "system/supervised/supervised_icon_string.h",
     "system/supervised/supervised_notification_controller.cc",
@@ -981,6 +1003,8 @@ component("ash") {
     "system/tray/tray_utils.h",
     "system/tray/tri_view.cc",
     "system/tray/tri_view.h",
+    "system/tray/unfocusable_label.cc",
+    "system/tray/unfocusable_label.h",
     "system/tray/view_click_listener.h",
     "system/unified/collapse_button.cc",
     "system/unified/collapse_button.h",
@@ -1057,6 +1081,7 @@ component("ash") {
     "touch/touch_hud_renderer.cc",
     "touch/touch_hud_renderer.h",
     "touch/touch_observer_hud.cc",
+    "touch/touch_observer_hud.h",
     "tray_action/tray_action.cc",
     "tray_action/tray_action.h",
     "tray_action/tray_action_observer.h",
@@ -1096,6 +1121,7 @@ component("ash") {
     "wm/base_state.cc",
     "wm/base_state.h",
     "wm/client_controlled_state.cc",
+    "wm/client_controlled_state.h",
     "wm/collision_detection/collision_detection_utils.cc",
     "wm/collision_detection/collision_detection_utils.h",
     "wm/container_finder.cc",
@@ -1106,6 +1132,7 @@ component("ash") {
     "wm/default_state.h",
     "wm/default_window_resizer.cc",
     "wm/default_window_resizer.h",
+    "wm/desks/autotest_desks_api.cc",
     "wm/desks/close_desk_button.cc",
     "wm/desks/close_desk_button.h",
     "wm/desks/desk.cc",
@@ -1160,8 +1187,6 @@ component("ash") {
     "wm/overlay_event_filter.h",
     "wm/overlay_layout_manager.cc",
     "wm/overlay_layout_manager.h",
-    "wm/overview/caption_container_view.cc",
-    "wm/overview/caption_container_view.h",
     "wm/overview/cleanup_animation_observer.cc",
     "wm/overview/cleanup_animation_observer.h",
     "wm/overview/delayed_animation_observer.h",
@@ -1174,6 +1199,7 @@ component("ash") {
     "wm/overview/overview_animation_type.h",
     "wm/overview/overview_constants.h",
     "wm/overview/overview_controller.cc",
+    "wm/overview/overview_controller.h",
     "wm/overview/overview_delegate.h",
     "wm/overview/overview_grid.cc",
     "wm/overview/overview_grid.h",
@@ -1183,6 +1209,8 @@ component("ash") {
     "wm/overview/overview_highlight_controller.h",
     "wm/overview/overview_item.cc",
     "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",
@@ -1223,6 +1251,7 @@ component("ash") {
     "wm/session_state_animator_impl.h",
     "wm/splitview/split_view_constants.h",
     "wm/splitview/split_view_controller.cc",
+    "wm/splitview/split_view_controller.h",
     "wm/splitview/split_view_divider.cc",
     "wm/splitview/split_view_divider.h",
     "wm/splitview/split_view_divider_handler_view.cc",
@@ -1279,6 +1308,8 @@ component("ash") {
     "wm/window_dimmer.cc",
     "wm/window_dimmer.h",
     "wm/window_finder.cc",
+    "wm/window_mini_view.cc",
+    "wm/window_mini_view.h",
     "wm/window_mirror_view.cc",
     "wm/window_mirror_view.h",
     "wm/window_mirror_view_pip.cc",
@@ -1334,9 +1365,12 @@ component("ash") {
     "//ash/resources/vector_icons",
     "//ash/strings",
     "//ash/wayland",
+    "//chromeos/services/multidevice_setup/public/mojom",
     "//components/discardable_memory/public/mojom",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/system",
+    "//services/content/public/mojom",
+    "//services/data_decoder/public/mojom",
     "//services/device/public/cpp/bluetooth",
     "//services/device/public/mojom",
     "//services/media_session/public/cpp",
@@ -1459,7 +1493,7 @@ component("ash") {
     "//ui/events:events_base",
     "//ui/events:gesture_detection",
     "//ui/events/devices",
-    "//ui/events/ozone:events_ozone",
+    "//ui/events/ozone",
     "//ui/message_center",
     "//ui/native_theme",
     "//ui/ozone",
@@ -1574,7 +1608,6 @@ static_library("ash_shell_lib_with_content") {
     "//ash/components/shortcut_viewer",
     "//ash/public/cpp",
     "//ash/public/cpp:manifest",
-    "//ash/public/cpp:manifest_for_tests",
     "//base:i18n",
     "//chrome:packed_resources",
 
@@ -1621,16 +1654,21 @@ static_library("ash_shell_lib_with_content") {
   ]
 }
 
-copy("dbus_service_files") {
+action("dbus_service_files") {
   sources = [
     "dbus/org.chromium.DisplayService.conf",
     "dbus/org.chromium.GesturePropertiesService.conf",
     "dbus/org.chromium.LivenessService.conf",
     "dbus/org.chromium.UrlHandlerService.conf",
   ]
+  output_conf_file = "$root_out_dir/dbus/ash_dbus_services.conf"
   outputs = [
-    "$root_out_dir/dbus/{{source_file_part}}",
+    output_conf_file,
   ]
+
+  script = "//chromeos/tools/concat_dbus_conf_files.py"
+  args = [ rebase_path(output_conf_file, root_build_dir) ]
+  args += rebase_path(sources, root_build_dir)
 }
 
 test("ash_unittests") {
@@ -1670,6 +1708,7 @@ test("ash_unittests") {
     "assistant/assistant_state_controller_unittest.cc",
     "assistant/model/assistant_query_history_unittest.cc",
     "assistant/ui/assistant_container_view_unittest.cc",
+    "assistant/ui/assistant_web_container_view_unittest.cc",
     "assistant/util/deep_link_util_unittest.cc",
     "autoclick/autoclick_drag_event_rewriter_unittest.cc",
     "autoclick/autoclick_unittest.cc",
@@ -1690,6 +1729,7 @@ test("ash_unittests") {
     "display/extended_mouse_warp_controller_unittest.cc",
     "display/mirror_window_controller_unittest.cc",
     "display/mouse_cursor_event_filter_unittest.cc",
+    "display/overscan_calibrator_unittest.cc",
     "display/persistent_window_controller_unittest.cc",
     "display/projecting_observer_unittest.cc",
     "display/resolution_notification_controller_unittest.cc",
@@ -1717,8 +1757,12 @@ test("ash_unittests") {
     "frame/non_client_frame_view_ash_unittest.cc",
     "highlighter/highlighter_controller_unittest.cc",
     "highlighter/highlighter_gesture_util_unittest.cc",
+    "home_screen/drag_window_from_shelf_controller_test_api.cc",
+    "home_screen/drag_window_from_shelf_controller_test_api.h",
+    "home_screen/drag_window_from_shelf_controller_unittest.cc",
     "home_screen/home_launcher_gesture_handler_unittest.cc",
     "home_screen/home_screen_controller_unittest.cc",
+    "home_screen/swipe_home_to_overview_controller_unittest.cc",
     "ime/ime_controller_unittest.cc",
     "keyboard/arc/arc_input_method_surface_manager_unittest.cc",
     "keyboard/keyboard_controller_impl_unittest.cc",
@@ -1755,6 +1799,7 @@ test("ash_unittests") {
     "login/ui/login_user_view_unittest.cc",
     "login/ui/note_action_launch_button_unittest.cc",
     "login/ui/parent_access_view_unittest.cc",
+    "login/ui/views_utils_unittest.cc",
     "magnifier/docked_magnifier_controller_impl_unittest.cc",
     "magnifier/magnification_controller_unittest.cc",
     "magnifier/magnifier_test_utils.cc",
@@ -1904,6 +1949,7 @@ test("ash_unittests") {
     "wm/collision_detection/collision_detection_utils_unittest.cc",
     "wm/container_finder_unittest.cc",
     "wm/default_window_resizer_unittest.cc",
+    "wm/desks/autotest_desks_api_unittests.cc",
     "wm/desks/desks_unittests.cc",
     "wm/drag_window_resizer_unittest.cc",
     "wm/fullscreen_window_finder_unittest.cc",
@@ -1955,10 +2001,12 @@ test("ash_unittests") {
     "wm/window_mirror_view_unittest.cc",
     "wm/window_modality_controller_unittest.cc",
     "wm/window_positioner_unittest.cc",
+    "wm/window_positioning_utils_unittest.cc",
     "wm/window_preview_view_unittest.cc",
     "wm/window_state_unittest.cc",
     "wm/window_transient_descendant_iterator_unittest.cc",
     "wm/window_util_unittest.cc",
+    "wm/work_area_insets_unittest.cc",
     "wm/workspace/magnetism_matcher_unittest.cc",
     "wm/workspace/multi_window_resize_controller_unittest.cc",
     "wm/workspace/workspace_event_handler_unittest.cc",
@@ -1989,7 +2037,6 @@ test("ash_unittests") {
     "//ash/keyboard/ui:test_support",
     "//ash/public/cpp",
     "//ash/public/cpp:manifest",
-    "//ash/public/cpp:manifest_for_tests",
     "//ash/public/cpp:test_support",
     "//ash/public/cpp:unit_tests",
     "//ash/public/cpp/vector_icons",
@@ -2015,6 +2062,7 @@ test("ash_unittests") {
     # TODO(https://crbug.com/644355): Remove Shill dependencies.
     "//chromeos/network:test_support",
     "//chromeos/services/assistant:test_support",
+    "//chromeos/services/assistant/public:feature_flags",
     "//chromeos/services/assistant/public/cpp:prefs",
     "//chromeos/services/assistant/public/mojom",
     "//chromeos/services/multidevice_setup/public/cpp:test_support",
@@ -2038,6 +2086,7 @@ test("ash_unittests") {
     "//mojo/core/embedder",
     "//mojo/public/cpp/bindings",
     "//net:net",
+    "//services/data_decoder/public/cpp:test_support",
     "//services/device/public/cpp/bluetooth",
     "//services/media_session/public/cpp/test:test_support",
     "//services/media_session/public/mojom",
@@ -2185,14 +2234,20 @@ static_library("test_support") {
   public = [
     "public/cpp/shelf_test_api.h",
     "public/cpp/system_tray_test_api.h",
+    "public/cpp/test/accessibility_controller_test_api.h",
+    "public/cpp/test/assistant_test_api.h",
   ]
   sources = [
+    "accessibility/accessibility_controller_test_api_impl.cc",
+    "accessibility/accessibility_controller_test_api_impl.h",
     "accessibility/test_accessibility_controller_client.cc",
     "accessibility/test_accessibility_controller_client.h",
     "app_list/test/app_list_test_helper.cc",
     "app_list/test/app_list_test_helper.h",
     "app_list/test/test_app_list_client.cc",
     "app_list/test/test_app_list_client.h",
+    "app_list/views/assistant/assistant_test_api_impl.cc",
+    "app_list/views/assistant/assistant_test_api_impl.h",
     "app_menu/notification_menu_view_test_api.cc",
     "app_menu/notification_menu_view_test_api.h",
     "assistant/test/assistant_ash_test_base.cc",
@@ -2223,8 +2278,6 @@ 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",
-    "mojo_test_interface_factory.cc",
-    "mojo_test_interface_factory.h",
     "public/cpp/shelf_test_api.cc",
     "public/cpp/test/shell_test_api.h",
     "rotator/screen_rotation_animator_test_api.cc",
@@ -2258,8 +2311,6 @@ static_library("test_support") {
     "system/power/power_button_test_base.h",
     "system/power/power_event_observer_test_api.cc",
     "system/power/power_event_observer_test_api.h",
-    "system/status_area_widget_test_api.cc",
-    "system/status_area_widget_test_api.h",
     "system/status_area_widget_test_helper.cc",
     "system/status_area_widget_test_helper.h",
     "system/unified/unified_system_tray_test_api.cc",
@@ -2327,10 +2378,10 @@ static_library("test_support") {
     "//ash/app_list:test_support",
     "//ash/app_menu",
     "//ash/assistant/model:model",
+    "//ash/assistant/ui:ui",
     "//ash/components/fast_ink",
     "//ash/public/cpp",
     "//ash/public/cpp:test_support",
-    "//ash/public/mojom:test_interfaces",
     "//base",
     "//base:i18n",
     "//base/test:test_support",
diff --git a/chromium/ash/app_list/BUILD.gn b/chromium/ash/app_list/BUILD.gn
index d3a924bdac7..36147f1ae83 100644
--- a/chromium/ash/app_list/BUILD.gn
+++ b/chromium/ash/app_list/BUILD.gn
@@ -118,6 +118,7 @@ component("app_list") {
     "//base/third_party/dynamic_annotations",
     "//cc/paint",
     "//chromeos:chromeos",
+    "//chromeos/services/assistant/public:feature_flags",
     "//components/keyed_service/core",
     "//components/sync",
     "//mojo/public/cpp/bindings",
diff --git a/chromium/ash/assistant/model/BUILD.gn b/chromium/ash/assistant/model/BUILD.gn
index dd18c207615..0205d6142cf 100644
--- a/chromium/ash/assistant/model/BUILD.gn
+++ b/chromium/ash/assistant/model/BUILD.gn
@@ -31,11 +31,14 @@ component("model") {
     "assistant_suggestions_model.cc",
     "assistant_suggestions_model.h",
     "assistant_suggestions_model_observer.h",
-    "assistant_ui_element.cc",
-    "assistant_ui_element.h",
     "assistant_ui_model.cc",
     "assistant_ui_model.h",
     "assistant_ui_model_observer.h",
+    "ui/assistant_card_element.cc",
+    "ui/assistant_card_element.h",
+    "ui/assistant_text_element.cc",
+    "ui/assistant_text_element.h",
+    "ui/assistant_ui_element.h",
   ]
 
   deps = [
diff --git a/chromium/ash/assistant/ui/BUILD.gn b/chromium/ash/assistant/ui/BUILD.gn
index 88ef2fb65ef..89d3113511b 100644
--- a/chromium/ash/assistant/ui/BUILD.gn
+++ b/chromium/ash/assistant/ui/BUILD.gn
@@ -50,10 +50,15 @@ component("ui") {
     "assistant_notification_view.h",
     "assistant_overlay.h",
     "assistant_view_delegate.h",
+    "assistant_view_ids.h",
+    "assistant_web_container_view.cc",
+    "assistant_web_container_view.h",
     "assistant_web_view.cc",
     "assistant_web_view.h",
+    "assistant_web_view_delegate.h",
     "base/assistant_button.cc",
     "base/assistant_button.h",
+    "base/assistant_button_listener.h",
     "base/assistant_scroll_view.cc",
     "base/assistant_scroll_view.h",
     "base/stack_layout.cc",
@@ -92,6 +97,10 @@ component("ui") {
     "main_stage/suggestion_container_view.h",
     "main_stage/ui_element_container_view.cc",
     "main_stage/ui_element_container_view.h",
+    "proactive_suggestions_rich_view.cc",
+    "proactive_suggestions_rich_view.h",
+    "proactive_suggestions_simple_view.cc",
+    "proactive_suggestions_simple_view.h",
     "proactive_suggestions_view.cc",
     "proactive_suggestions_view.h",
   ]
@@ -100,6 +109,7 @@ component("ui") {
     "//ash/assistant/model",
     "//ash/assistant/ui:constants",
     "//ash/assistant/util",
+    "//ash/keyboard/ui",
     "//ash/public/cpp",
     "//ash/public/cpp/vector_icons",
     "//ash/resources/vector_icons",
diff --git a/chromium/ash/assistant/util/BUILD.gn b/chromium/ash/assistant/util/BUILD.gn
index ca6f935e2a7..4b16671395f 100644
--- a/chromium/ash/assistant/util/BUILD.gn
+++ b/chromium/ash/assistant/util/BUILD.gn
@@ -26,6 +26,7 @@ component("util") {
     "//ash/assistant/model",
     "//base",
     "//base:i18n",
+    "//chromeos/services/assistant/public/mojom",
     "//net",
     "//ui/base",
     "//ui/gfx",
diff --git a/chromium/ash/components/cursor/BUILD.gn b/chromium/ash/components/cursor/BUILD.gn
index 8184365572b..57c349c9463 100644
--- a/chromium/ash/components/cursor/BUILD.gn
+++ b/chromium/ash/components/cursor/BUILD.gn
@@ -16,7 +16,7 @@ source_set("cursor") {
     "//skia",
     "//ui/aura",
     "//ui/events",
-    "//ui/events/ozone:events_ozone",
+    "//ui/events/ozone",
     "//ui/gfx",
     "//ui/views:views",
   ]
diff --git a/chromium/ash/components/shortcut_viewer/BUILD.gn b/chromium/ash/components/shortcut_viewer/BUILD.gn
index ca115a1bfcb..fa8b90ce2d1 100644
--- a/chromium/ash/components/shortcut_viewer/BUILD.gn
+++ b/chromium/ash/components/shortcut_viewer/BUILD.gn
@@ -36,7 +36,7 @@ source_set("shortcut_viewer") {
     "//ui/chromeos/search_box",
     "//ui/events:events_base",
     "//ui/events/devices",
-    "//ui/events/ozone:events_ozone_layout",
+    "//ui/events/ozone/layout",
     "//ui/views",
   ]
 }
diff --git a/chromium/ash/public/cpp/BUILD.gn b/chromium/ash/public/cpp/BUILD.gn
index 69a3202d893..d0c1f3ad44d 100644
--- a/chromium/ash/public/cpp/BUILD.gn
+++ b/chromium/ash/public/cpp/BUILD.gn
@@ -17,6 +17,8 @@ component("cpp") {
     "accessibility_focus_ring_controller.h",
     "accessibility_focus_ring_info.cc",
     "accessibility_focus_ring_info.h",
+    "ambient/ambient_mode_state.cc",
+    "ambient/ambient_mode_state.h",
     "ambient/photo_controller.cc",
     "ambient/photo_controller.h",
     "android_intent_helper.cc",
@@ -38,14 +40,6 @@ component("cpp") {
     "app_list/app_list_types.cc",
     "app_list/app_list_types.h",
     "app_list/internal_app_id_constants.h",
-    "app_list/term_break_iterator.cc",
-    "app_list/term_break_iterator.h",
-    "app_list/tokenized_string.cc",
-    "app_list/tokenized_string.h",
-    "app_list/tokenized_string_char_iterator.cc",
-    "app_list/tokenized_string_char_iterator.h",
-    "app_list/tokenized_string_match.cc",
-    "app_list/tokenized_string_match.h",
     "app_menu_constants.h",
     "app_types.h",
     "arc_app_id_provider.cc",
@@ -290,23 +284,6 @@ source_set("manifest") {
   ]
 }
 
-source_set("manifest_for_tests") {
-  testonly = true
-
-  sources = [
-    "test_manifest.cc",
-    "test_manifest.h",
-  ]
-
-  deps = [
-    ":manifest",
-    "//ash/public/mojom:test_interfaces",
-    "//base",
-    "//services/service_manager/public/cpp",
-    "//services/service_manager/public/mojom",
-  ]
-}
-
 source_set("unit_tests") {
   testonly = true
   sources = [
@@ -343,6 +320,8 @@ source_set("test_support") {
     "test/test_keyboard_controller_observer.h",
     "test/test_new_window_delegate.cc",
     "test/test_new_window_delegate.h",
+    "test/test_photo_controller.cc",
+    "test/test_photo_controller.h",
     "test/test_system_tray_client.cc",
     "test/test_system_tray_client.h",
   ]
@@ -354,6 +333,7 @@ source_set("test_support") {
     "//ui/aura",
     "//ui/aura:test_support",
     "//ui/gfx",
+    "//ui/gfx:test_support",
     "//ui/views",
   ]
 }
diff --git a/chromium/ash/public/mojom/BUILD.gn b/chromium/ash/public/mojom/BUILD.gn
index 118409980fd..4c7aa4e167f 100644
--- a/chromium/ash/public/mojom/BUILD.gn
+++ b/chromium/ash/public/mojom/BUILD.gn
@@ -41,17 +41,3 @@ mojom("mojom") {
   export_define = "ASH_PUBLIC_IMPLEMENTATION=1"
   export_header = "ash/public/cpp/ash_public_export.h"
 }
-
-mojom("test_interfaces") {
-  testonly = true
-  disable_variants = true
-  sources = [
-    "status_area_widget_test_api.test-mojom",
-  ]
-  deps = [
-    ":mojom",
-    "//components/account_id/mojom",
-    "//mojo/public/mojom/base",
-    "//ui/gfx/geometry/mojom",
-  ]
-}
diff --git a/chromium/ash/public/mojom/cros_display_config.mojom b/chromium/ash/public/mojom/cros_display_config.mojom
index a3b30049d4c..41c57a0a90a 100644
--- a/chromium/ash/public/mojom/cros_display_config.mojom
+++ b/chromium/ash/public/mojom/cros_display_config.mojom
@@ -7,6 +7,8 @@ module ash.mojom;
 import "ui/gfx/geometry/mojom/geometry.mojom";
 import "ui/display/mojom/display.mojom";
 
+// This API is used for communication between Settings WebUI and Ash C++ code.
+
 // All points, bounds, and insets are in display pixels unless otherwise
 // sepcified.
 
@@ -69,6 +71,26 @@ enum DisplayConfigSource {
   kPolicy
 };
 
+// Describes the options the DisplayConfigProperties.rotation and
+// DisplayUnitInfo.rotation_options can be set to.
+enum DisplayRotationOptions {
+  // In physical tablet state, enables auto-rotation and clears the user
+  // rotation lock. Otherwise, it behaves the same as kZeroDegrees.
+  kAutoRotate,
+  // In physical tablet state, Sets the user rotation lock to 0 degrees.
+  // Otherwise, it sets the display rotation to 0.
+  kZeroDegrees,
+  // In physical tablet state, Sets the user rotation lock to 90 degrees.
+  // Otherwise, it sets the display rotation 90.
+  k90Degrees,
+  // In physical tablet state, Sets the user rotation lock to 180 degrees.
+  // Otherwise, it sets the display rotation 180.
+  k180Degrees,
+  // In physical tablet state, Sets the user rotation lock to 270 degrees.
+  // Otherwise, it sets the display rotation 270.
+  k270Degrees,
+};
+
 // Defines a pair of display + touch points used for touch calibration.
 struct TouchCalibrationPair {
   // The coordinates of the display point.
@@ -134,7 +156,7 @@ struct Edid {
 
 // Struct wrapper so that the property can be optional.
 struct DisplayRotation {
-  display.mojom.Rotation rotation;
+  DisplayRotationOptions rotation;
 };
 
 // Defines the properties for a display mode, i.e. a valid size and scale.
@@ -168,8 +190,8 @@ struct DisplayUnitInfo {
   bool is_internal;
   // True if this display is enabled.
   bool is_enabled;
-  // True when the display is in tablet mode.
-  bool is_tablet_mode;
+  // True when the device is in tablet physical state.
+  bool is_in_tablet_physical_state;
   // True if this display has a touch input device associated with it.
   bool has_touch_support;
   // True if this display has an accelerometer associated with it.
@@ -178,8 +200,8 @@ struct DisplayUnitInfo {
   double dpi_x;
   // The number of pixels per inch along the y-axis.
   double dpi_y;
-  // The display's clockwise rotation.
-  display.mojom.Rotation rotation;
+  // The display rotation options.
+  DisplayRotationOptions rotation_options;
   // The display's logical bounds.
   gfx.mojom.Rect bounds;
   // The display's ovserscan insets within its screen's bounds.
@@ -207,7 +229,9 @@ struct DisplayConfigProperties {
   // Note: overscan values may not be negative or larger than a half of the
   // screen's size. Overscan cannot be changed on the internal monitor.
   gfx.mojom.Insets? overscan;
-  // If provided updates the display's rotation.
+  // If provided updates the display's rotation, or if the device is in a
+  // physical tablet state, it can be used to set or clear the user rotation
+  // lock, enabling or disabling auto-rotation.
   DisplayRotation? rotation;
   // If provided, updates the display's logical bounds origin. Note: when
   // updating the display origin, some constraints will be applied. so the final