BASELINE: Update Chromium to 62.0.3202.101

Change-Id: I2d5eca8117600df6d331f6166ab24d943d9814ac
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

14 files changed, 174 insertions, 137 deletions

diff --git a/chromium/ash/BUILD.gn b/chromium/ash/BUILD.gn
index 6af7b3d742a..d476e6a4e19 100644
--- a/chromium/ash/BUILD.gn
+++ b/chromium/ash/BUILD.gn
@@ -42,6 +42,10 @@ component("ash") {
     "accelerators/magnifier_key_scroller.h",
     "accelerators/spoken_feedback_toggler.cc",
     "accelerators/spoken_feedback_toggler.h",
+    "accessibility/accessibility_controller.cc",
+    "accessibility/accessibility_controller.h",
+
+    # TODO(jamescook): Move these into accessibility/ after M61 stable.
     "accessibility_delegate.h",
     "accessibility_types.h",
     "animation/animation_change_type.h",
@@ -179,8 +183,6 @@ component("ash") {
     "host/ash_window_tree_host_platform.h",
     "host/ash_window_tree_host_unified.cc",
     "host/ash_window_tree_host_unified.h",
-    "host/ash_window_tree_host_x11.cc",
-    "host/ash_window_tree_host_x11.h",
     "host/root_window_transformer.h",
     "host/transformer_helper.cc",
     "host/transformer_helper.h",
@@ -198,10 +200,6 @@ component("ash") {
     "laser/laser_pointer_view.h",
     "laser/laser_segment_utils.cc",
     "laser/laser_segment_utils.h",
-    "link_handler_model.cc",
-    "link_handler_model.h",
-    "link_handler_model_factory.cc",
-    "link_handler_model_factory.h",
     "login/lock_screen_controller.cc",
     "login/lock_screen_controller.h",
     "login/ui/lock_contents_view.cc",
@@ -223,6 +221,10 @@ component("ash") {
     "login/ui/login_pin_view.h",
     "login/ui/login_user_view.cc",
     "login/ui/login_user_view.h",
+    "login/ui/pin_keyboard_animation.cc",
+    "login/ui/pin_keyboard_animation.h",
+    "login/ui/user_switch_flip_animation.cc",
+    "login/ui/user_switch_flip_animation.h",
     "login_status.h",
     "magnifier/magnification_controller.cc",
     "magnifier/magnification_controller.h",
@@ -285,8 +287,6 @@ component("ash") {
     "shelf/overflow_button.h",
     "shelf/shelf.cc",
     "shelf/shelf.h",
-    "shelf/shelf_alignment_menu.cc",
-    "shelf/shelf_alignment_menu.h",
     "shelf/shelf_application_menu_model.cc",
     "shelf/shelf_application_menu_model.h",
     "shelf/shelf_background_animator.cc",
@@ -299,6 +299,8 @@ component("ash") {
     "shelf/shelf_button_pressed_metric_tracker.cc",
     "shelf/shelf_button_pressed_metric_tracker.h",
     "shelf/shelf_constants.h",
+    "shelf/shelf_context_menu_model.cc",
+    "shelf/shelf_context_menu_model.h",
     "shelf/shelf_controller.cc",
     "shelf/shelf_controller.h",
     "shelf/shelf_layout_manager.cc",
@@ -367,8 +369,6 @@ component("ash") {
     "system/date/system_info_default_view.h",
     "system/date/tray_system_info.cc",
     "system/date/tray_system_info.h",
-    "system/devicetype_utils.cc",
-    "system/devicetype_utils.h",
     "system/display_scale/scale_detailed_view.cc",
     "system/display_scale/scale_detailed_view.h",
     "system/display_scale/scale_view.cc",
@@ -461,6 +461,8 @@ component("ash") {
     "system/power/battery_notification.h",
     "system/power/dual_role_notification.cc",
     "system/power/dual_role_notification.h",
+    "system/power/power_button_display_controller.cc",
+    "system/power/power_button_display_controller.h",
     "system/power/power_event_observer.cc",
     "system/power/power_event_observer.h",
     "system/power/power_status.cc",
@@ -485,8 +487,6 @@ component("ash") {
     "system/screen_security/screen_share_tray_item.h",
     "system/screen_security/screen_tray_item.cc",
     "system/screen_security/screen_tray_item.h",
-    "system/session/last_window_closed_observer.h",
-    "system/session/logout_button_observer.h",
     "system/session/logout_button_tray.cc",
     "system/session/logout_button_tray.h",
     "system/session/logout_confirmation_controller.cc",
@@ -534,8 +534,6 @@ component("ash") {
     "system/tray/system_tray_bubble.h",
     "system/tray/system_tray_controller.cc",
     "system/tray/system_tray_controller.h",
-    "system/tray/system_tray_delegate.cc",
-    "system/tray/system_tray_delegate.h",
     "system/tray/system_tray_item.cc",
     "system/tray/system_tray_item.h",
     "system/tray/system_tray_notifier.cc",
@@ -599,6 +597,12 @@ component("ash") {
     "system/virtual_keyboard/virtual_keyboard_tray.h",
     "system/web_notification/ash_popup_alignment_delegate.cc",
     "system/web_notification/ash_popup_alignment_delegate.h",
+    "system/web_notification/login_state_notification_blocker.cc",
+    "system/web_notification/login_state_notification_blocker.h",
+    "system/web_notification/message_center_bubble.cc",
+    "system/web_notification/message_center_bubble.h",
+    "system/web_notification/message_center_controller.cc",
+    "system/web_notification/message_center_controller.h",
     "system/web_notification/web_notification_tray.cc",
     "system/web_notification/web_notification_tray.h",
     "touch/ash_touch_transform_controller.cc",
@@ -633,8 +637,6 @@ component("ash") {
     "wm/always_on_top_controller.h",
     "wm/ash_focus_rules.cc",
     "wm/ash_focus_rules.h",
-    "wm/boot_splash_screen_chromeos.cc",
-    "wm/boot_splash_screen_chromeos.h",
     "wm/container_finder.cc",
     "wm/container_finder.h",
     "wm/cursor_manager_chromeos.cc",
@@ -686,6 +688,8 @@ component("ash") {
     "wm/overview/cleanup_animation_observer.cc",
     "wm/overview/cleanup_animation_observer.h",
     "wm/overview/overview_animation_type.h",
+    "wm/overview/overview_window_drag_controller.cc",
+    "wm/overview/overview_window_drag_controller.h",
     "wm/overview/scoped_hide_overview_windows.cc",
     "wm/overview/scoped_hide_overview_windows.h",
     "wm/overview/scoped_overview_animation_settings.cc",
@@ -733,6 +737,8 @@ component("ash") {
     "wm/session_state_animator_impl.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/stacking_controller.cc",
     "wm/stacking_controller.h",
     "wm/switchable_windows.cc",
@@ -747,8 +753,10 @@ component("ash") {
     "wm/system_wallpaper_controller.cc",
     "wm/system_wallpaper_controller.h",
     "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard.h",
-    "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc",
-    "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_x11.h",
+    "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_ozone.cc",
+    "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h",
+    "wm/tablet_mode/scoped_skip_user_session_blocked_check.cc",
+    "wm/tablet_mode/scoped_skip_user_session_blocked_check.h",
     "wm/tablet_mode/tablet_mode_backdrop_delegate_impl.cc",
     "wm/tablet_mode/tablet_mode_backdrop_delegate_impl.h",
     "wm/tablet_mode/tablet_mode_controller.cc",
@@ -762,6 +770,8 @@ component("ash") {
     "wm/tablet_mode/tablet_mode_window_manager.h",
     "wm/tablet_mode/tablet_mode_window_state.cc",
     "wm/tablet_mode/tablet_mode_window_state.h",
+    "wm/tablet_mode/touchpad_and_keyboard_disabler.cc",
+    "wm/tablet_mode/touchpad_and_keyboard_disabler.h",
     "wm/toplevel_window_event_handler.cc",
     "wm/toplevel_window_event_handler.h",
     "wm/video_detector.cc",
@@ -852,15 +862,20 @@ component("ash") {
     "//base/third_party/dynamic_annotations",
     "//cc",
     "//cc/debug",
-    "//cc/surfaces",
     "//chromeos",
     "//chromeos:power_manager_proto",
     "//components/device_event_log",
     "//components/onc",
+    "//components/pref_registry",
+    "//components/prefs",
     "//components/quirks",
     "//components/session_manager:base",
+    "//components/session_manager/core",
     "//components/signin/core/account_id",
+    "//components/strings",
     "//components/user_manager",
+    "//components/vector_icons",
+    "//components/viz/service",
     "//components/wallpaper",
     "//device/bluetooth",
     "//gpu/command_buffer/client",
@@ -875,7 +890,6 @@ component("ash") {
     "//skia",
 
     # TODO(msw): Remove this; only ash_with_content should depend on webkit.
-    "//components/vector_icons",
     "//third_party/WebKit/public:blink_headers",
     "//third_party/icu",
     "//third_party/qcms",
@@ -886,6 +900,7 @@ component("ash") {
     "//ui/base:ui_data_pack",
     "//ui/base/ime",
     "//ui/chromeos",
+    "//ui/chromeos/events",
     "//ui/chromeos/resources",
     "//ui/chromeos/strings",
     "//ui/compositor",
@@ -894,14 +909,17 @@ component("ash") {
     "//ui/display/types",
     "//ui/display/util",
     "//ui/events",
+    "//ui/events:dom_keycode_converter",
     "//ui/events:events_base",
     "//ui/events:gesture_detection",
     "//ui/events/devices",
+    "//ui/events/ozone:events_ozone",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/keyboard",
     "//ui/message_center",
     "//ui/native_theme",
+    "//ui/ozone",
     "//ui/platform_window",
     "//ui/platform_window/stub",
     "//ui/resources",
@@ -917,39 +935,6 @@ component("ash") {
     "display/test_data/",
   ]
 
-  if (use_x11) {
-    configs += [
-      "//build/config/linux:x11",
-      "//build/config/linux:xfixes",
-    ]
-    deps += [
-      "//ui/events/devices/x11",
-      "//ui/events/platform",
-      "//ui/gfx/x",
-    ]
-  } else {
-    sources -= [
-      "host/ash_window_tree_host_x11.cc",
-      "host/ash_window_tree_host_x11.h",
-      "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc",
-      "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_x11.h",
-    ]
-  }
-
-  if (use_ozone) {
-    deps += [
-      "//ui/events:dom_keycode_converter",
-      "//ui/events/ozone:events_ozone",
-      "//ui/ozone",
-    ]
-    sources += [
-      "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_ozone.cc",
-      "wm/tablet_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h",
-      "wm/tablet_mode/touchpad_and_keyboard_disabler.cc",
-      "wm/tablet_mode/touchpad_and_keyboard_disabler.h",
-    ]
-  }
-
   # Usage of content should be in ash_content_unittests.
   assert_no_deps = [
     "//content/public/browser",
@@ -1007,8 +992,6 @@ static_library("ash_shell_lib") {
     "../ui/views/test/test_views_delegate_aura.cc",
     "shell/app_list.cc",
     "shell/bubble.cc",
-    "shell/context_menu.cc",
-    "shell/context_menu.h",
     "shell/example_app_list_presenter.cc",
     "shell/example_app_list_presenter.h",
     "shell/example_factory.h",
@@ -1107,8 +1090,6 @@ test("ash_content_unittests") {
     "content/display/screen_orientation_controller_chromeos_unittest.cc",
     "content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc",
     "content/keyboard_overlay/keyboard_overlay_view_unittest.cc",
-    "test/ash_test_suite.cc",
-    "test/ash_test_suite.h",
     "test/ash_unittests.cc",
   ]
   configs += [
@@ -1129,7 +1110,6 @@ test("ash_content_unittests") {
     "//components/quirks",
     "//components/signin/core/account_id",
     "//components/user_manager",
-    "//components/viz/test:test_support",
     "//content/public/browser",
     "//content/test:test_support",
     "//device/bluetooth",
@@ -1154,9 +1134,7 @@ test("ash_content_unittests") {
   ]
 
   data_deps = [
-    "//ash/strings:ash_test_strings",
     "//ash/resources:ash_test_resources_with_content_100_percent",
-    "//ash/resources:ash_test_resources_200_percent",
   ]
 }
 
@@ -1170,6 +1148,7 @@ source_set("common_unittests") {
     "accelerators/accelerator_filter_unittest.cc",
     "accelerators/accelerator_table_unittest.cc",
     "accelerators/spoken_feedback_toggler_unittest.cc",
+    "accessibility/accessibility_controller_unittest.cc",
     "ash_touch_exploration_manager_chromeos_unittest.cc",
     "autoclick/autoclick_unittest.cc",
     "display/display_configuration_controller_unittest.cc",
@@ -1215,6 +1194,7 @@ source_set("common_unittests") {
     "shelf/shelf_application_menu_model_unittest.cc",
     "shelf/shelf_background_animator_unittest.cc",
     "shelf/shelf_button_pressed_metric_tracker_unittest.cc",
+    "shelf/shelf_context_menu_model_unittest.cc",
     "shelf/shelf_controller_unittest.cc",
     "shelf/shelf_layout_manager_unittest.cc",
     "shelf/shelf_locking_manager_unittest.cc",
@@ -1260,6 +1240,7 @@ source_set("common_unittests") {
     "system/power/tray_power_unittest.cc",
     "system/power/video_activity_notifier_unittest.cc",
     "system/screen_security/screen_tray_item_unittest.cc",
+    "system/session/logout_button_tray_unittest.cc",
     "system/session/logout_confirmation_controller_unittest.cc",
     "system/session/tray_session_length_limit_unittest.cc",
     "system/status_area_widget_unittest.cc",
@@ -1272,10 +1253,13 @@ source_set("common_unittests") {
     "system/tray/tray_event_filter_unittest.cc",
     "system/tray/tray_info_label_unittest.cc",
     "system/tray/tri_view_unittest.cc",
+    "system/tray_accessibility_unittest.cc",
+    "system/tray_caps_lock_unittest.cc",
     "system/tray_tracing_unittest.cc",
     "system/update/tray_update_unittest.cc",
     "system/user/tray_user_unittest.cc",
     "system/web_notification/ash_popup_alignment_delegate_unittest.cc",
+    "system/web_notification/login_state_notification_blocker_unittest.cc",
     "system/web_notification/web_notification_tray_unittest.cc",
     "test/ash_test_helper_unittest.cc",
     "tooltips/tooltip_controller_unittest.cc",
@@ -1301,6 +1285,7 @@ source_set("common_unittests") {
     "wm/system_modal_container_layout_manager_unittest.cc",
     "wm/tablet_mode/accelerometer_test_data_literals.cc",
     "wm/tablet_mode/tablet_mode_window_manager_unittest.cc",
+    "wm/tablet_mode/touchpad_and_keyboard_disabler_unittest.cc",
     "wm/toplevel_window_event_handler_unittest.cc",
     "wm/video_detector_unittest.cc",
     "wm/window_animations_unittest.cc",
@@ -1330,6 +1315,7 @@ source_set("common_unittests") {
     "//chromeos:test_support",
     "//chromeos:test_support_without_gmock",
     "//components/prefs:test_support",
+    "//components/session_manager/core",
     "//components/user_manager:test_support",
     "//device/bluetooth",
     "//services/ui/public/interfaces",
@@ -1341,6 +1327,7 @@ source_set("common_unittests") {
     "//ui/aura:test_support",
     "//ui/base",
     "//ui/base:test_support",
+    "//ui/chromeos/events",
     "//ui/compositor:test_support",
     "//ui/display",
     "//ui/events:test_support",
@@ -1358,10 +1345,6 @@ source_set("common_unittests") {
   public_deps = [
     ":test_support_without_content",
   ]
-
-  if (use_ozone) {
-    sources += [ "wm/tablet_mode/touchpad_and_keyboard_disabler_unittest.cc" ]
-  }
 }
 
 test("ash_unittests") {
@@ -1402,9 +1385,6 @@ test("ash_unittests") {
     # TODO: port to mash. http://crbug.com/695570.
     "extended_desktop_unittest.cc",
 
-    # Specific to X11.
-    "host/ash_window_tree_host_x11_unittest.cc",
-
     # TODO: magnifier not supported in mash. http://crbug.com/647438.
     "magnifier/magnification_controller_unittest.cc",
     "magnifier/partial_magnification_controller_unittest.cc",
@@ -1415,8 +1395,6 @@ test("ash_unittests") {
     # TODO: fails as ScreenLayoutObserver is not installed in mash,
     # http://crbug.com/696752.
     "system/screen_layout_observer_unittest.cc",
-    "test/ash_test_suite.cc",
-    "test/ash_test_suite.h",
     "test/ash_unittests.cc",
 
     # TODO(riajiang): port to work with mash. http://crbug.com/698032.
@@ -1484,13 +1462,11 @@ test("ash_unittests") {
     "//ash/touch_hud",
     "//base",
     "//base/test:test_support",
-    "//cc:test_support",
     "//chromeos",
     "//chromeos:test_support_without_gmock",
     "//components/quirks",
     "//components/signin/core/account_id",
     "//components/user_manager",
-    "//components/viz/test:test_support",
     "//device/bluetooth",
     "//mojo/edk/system",
     "//net:net",
@@ -1534,16 +1510,10 @@ test("ash_unittests") {
   ]
 
   data_deps = [
-    "//ash/strings:ash_test_strings",
     "//ash/resources:ash_test_resources_100_percent",
-    "//ash/resources:ash_test_resources_200_percent",
     "//testing/buildbot/filters:ash_unittests_filters",
   ]
 
-  if (!use_x11) {
-    sources -= [ "host/ash_window_tree_host_x11_unittest.cc" ]
-  }
-
   # Usage of content should be in ash_with_content.
   assert_no_deps = [
     "//content/public/browser",
@@ -1555,17 +1525,13 @@ test("ash_perftests") {
   sources = [
     "perftests/ash_background_filter_blur_perftest.cc",
     "test/ash_perftests.cc",
-    "test/ash_test_suite.cc",
-    "test/ash_test_suite.h",
   ]
 
   deps = [
     ":test_support_without_content",
     "//ash/public/cpp:ash_public_cpp",
     "//base/test:test_support",
-    "//cc:test_support",
     "//cc/base",
-    "//components/viz/test:test_support",
     "//mojo/edk/embedder:headers",
     "//testing/gtest",
     "//testing/perf",
@@ -1594,9 +1560,7 @@ executable("ash_shell_with_content") {
   ]
 
   data_deps = [
-    "//ash/strings:ash_test_strings",
     "//ash/resources:ash_test_resources_with_content_100_percent",
-    "//ash/resources:ash_test_resources_200_percent",
   ]
 }
 
@@ -1645,8 +1609,8 @@ static_library("test_support_common") {
   testonly = true
   visibility = [ ":*" ]
   sources = [
-    "app_list/test_app_list_view_presenter_impl.cc",
-    "app_list/test_app_list_view_presenter_impl.h",
+    "app_list/test_app_list_presenter_impl.cc",
+    "app_list/test_app_list_presenter_impl.h",
     "display/display_configuration_controller_test_api.cc",
     "display/display_configuration_controller_test_api.h",
     "display/mirror_window_test_api.cc",
@@ -1697,6 +1661,8 @@ static_library("test_support_common") {
     "test/ash_test_environment.h",
     "test/ash_test_helper.cc",
     "test/ash_test_helper.h",
+    "test/ash_test_suite.cc",
+    "test/ash_test_suite.h",
     "test/ash_test_views_delegate.cc",
     "test/ash_test_views_delegate.h",
 
@@ -1748,10 +1714,12 @@ static_library("test_support_common") {
     "//base",
     "//base:i18n",
     "//base/test:test_support",
+    "//cc:test_support",
     "//chromeos",
     "//components/prefs:test_support",
     "//components/signin/core/account_id",
     "//components/user_manager:user_manager",
+    "//components/viz/test:test_support",
     "//device/bluetooth",
     "//services/ui/public/cpp/input_devices",
     "//services/ui/public/interfaces",
@@ -1780,9 +1748,11 @@ static_library("test_support_common") {
     "//ui/wm/public",
   ]
 
-  if (use_x11) {
-    deps += [ "//ui/gfx/x" ]
-  }
+  data_deps = [
+    "//ash/strings:ash_test_strings",
+    "//ash/resources:ash_test_resources_100_percent",
+    "//ash/resources:ash_test_resources_200_percent",
+  ]
 }
 
 static_library("interactive_ui_test_support") {
diff --git a/chromium/ash/mus/BUILD.gn b/chromium/ash/mus/BUILD.gn
index f990801f643..9d1ac5bee3f 100644
--- a/chromium/ash/mus/BUILD.gn
+++ b/chromium/ash/mus/BUILD.gn
@@ -28,8 +28,6 @@ source_set("lib") {
     "bridge/shell_port_mash.h",
     "bridge/workspace_event_handler_mus.cc",
     "bridge/workspace_event_handler_mus.h",
-    "context_menu_mus.cc",
-    "context_menu_mus.h",
     "disconnected_app_handler.cc",
     "disconnected_app_handler.h",
     "display_synchronizer.cc",
@@ -52,8 +50,6 @@ source_set("lib") {
     "property_util.h",
     "shell_delegate_mus.cc",
     "shell_delegate_mus.h",
-    "system_tray_delegate_mus.cc",
-    "system_tray_delegate_mus.h",
     "top_level_window_factory.cc",
     "top_level_window_factory.h",
     "touch_transform_setter_mus.cc",
@@ -82,7 +78,7 @@ source_set("lib") {
     "//ui/app_list/presenter:mojom",
     "//ui/chromeos",
     "//ui/display/manager",
-    "//ui/display/manager/chromeos/mojo:interfaces",
+    "//ui/events/devices/mojo",
     "//ui/keyboard",
     "//ui/keyboard:mojom",
     "//ui/message_center",
diff --git a/chromium/ash/public/cpp/BUILD.gn b/chromium/ash/public/cpp/BUILD.gn
index 9b729dc1b16..1a5667c613e 100644
--- a/chromium/ash/public/cpp/BUILD.gn
+++ b/chromium/ash/public/cpp/BUILD.gn
@@ -37,10 +37,13 @@ component("ash_public_cpp") {
     "shelf_model.cc",
     "shelf_model.h",
     "shelf_model_observer.h",
+    "shelf_prefs.cc",
+    "shelf_prefs.h",
     "shelf_types.cc",
     "shelf_types.h",
     "shell_window_ids.cc",
     "shell_window_ids.h",
+    "touchscreen_enabled_source.h",
     "voice_interaction_state.h",
     "window_pin_type.cc",
     "window_pin_type.h",
@@ -53,9 +56,11 @@ component("ash_public_cpp") {
   defines = [ "ASH_PUBLIC_IMPLEMENTATION" ]
 
   deps = [
+    "//components/prefs",
     "//mojo/common:common_custom_types",
     "//skia/public/interfaces",
     "//ui/aura",
+    "//ui/display",
     "//ui/views",
     "//ui/views/mus",
   ]
diff --git a/chromium/ash/public/interfaces/BUILD.gn b/chromium/ash/public/interfaces/BUILD.gn
index 9c7c601564a..912705f1e2d 100644
--- a/chromium/ash/public/interfaces/BUILD.gn
+++ b/chromium/ash/public/interfaces/BUILD.gn
@@ -25,11 +25,12 @@ mojom("interfaces_internal") {
     "media.mojom",
     "new_window.mojom",
     "night_light_controller.mojom",
+    "pref_connector.mojom",
     "session_controller.mojom",
     "shelf.mojom",
     "shutdown.mojom",
     "system_tray.mojom",
-    "touch_view.mojom",
+    "tablet_mode.mojom",
     "tray_action.mojom",
     "update.mojom",
     "user_info.mojom",
@@ -44,6 +45,7 @@ mojom("interfaces_internal") {
     "//components/proximity_auth/public/interfaces",
     "//components/signin/public/interfaces",
     "//mojo/common:common_custom_types",
+    "//services/preferences/public/interfaces",
     "//skia/public/interfaces",
     "//ui/events/mojo:interfaces",
     "//ui/gfx/image/mojo:interfaces",
diff --git a/chromium/ash/public/interfaces/ime_controller.mojom b/chromium/ash/public/interfaces/ime_controller.mojom
index 8bccdf5f106..0b2768e4c55 100644
--- a/chromium/ash/public/interfaces/ime_controller.mojom
+++ b/chromium/ash/public/interfaces/ime_controller.mojom
@@ -26,6 +26,10 @@ interface ImeController {
   // some Chinese IMEs) prefer this to keeping the IME menu under the primary
   // system tray menu.
   ShowImeMenuOnShelf(bool show);
+
+  // Report caps lock state changes from chrome (which is the source of truth)
+  // to the tray.
+  SetCapsLockState(bool enabled);
 };
 
 // Interface for ash to send input method requests to its client (e.g. Chrome).
@@ -48,4 +52,12 @@ interface ImeControllerClient {
   // Activates an input method menu item. The |key| must be a value from the
   // ImeMenuItems provided via RefreshIme. Does nothing if the |key| is invalid.
   ActivateImeMenuItem(string key);
+
+  // When the caps lock state change originates from the tray (i.e. clicking the
+  // caps lock toggle from the settings menu from the caps lock icon), propagate
+  // the change to the client without sending a change notification back to the
+  // tray.
+  // TODO(crbug/759435): Ideally this interaction should only be to disable the
+  // caps lock.
+  SetCapsLockFromTray(bool enabled);
 };
diff --git a/chromium/ash/public/interfaces/pref_connector.mojom b/chromium/ash/public/interfaces/pref_connector.mojom
new file mode 100644
index 00000000000..817bf470906
--- /dev/null
+++ b/chromium/ash/public/interfaces/pref_connector.mojom
@@ -0,0 +1,24 @@
+// Copyright 2017 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.
+
+module ash.mojom;
+
+import "components/signin/public/interfaces/account_id.mojom";
+import "services/preferences/public/interfaces/preferences.mojom";
+
+const string kPrefConnectorServiceName = "ash_pref_connector";
+
+// A connector of PrefStoreConnectors. Provides ash with access to per-profile
+// prefs.
+interface PrefConnector {
+  // Provides a PrefStoreConnector for the signin screen profile prefs. Once
+  // connected the prefs continue to be available even after the user logs in.
+  GetPrefStoreConnectorForSigninScreen(
+      prefs.mojom.PrefStoreConnector& connector);
+
+  // Provides, via |connector|, a PrefStoreConnector for |account_id|. If
+  // |account_id| is invalid or unknown, |connector| will be closed.
+  GetPrefStoreConnectorForUser(signin.mojom.AccountId account_id,
+                               prefs.mojom.PrefStoreConnector& connector);
+};
diff --git a/chromium/ash/public/interfaces/session_controller.mojom b/chromium/ash/public/interfaces/session_controller.mojom
index e64153de68f..df95f6f5d57 100644
--- a/chromium/ash/public/interfaces/session_controller.mojom
+++ b/chromium/ash/public/interfaces/session_controller.mojom
@@ -97,6 +97,10 @@ struct SessionInfo {
   // Whether the screen should be locked automatically before suspending.
   bool should_lock_screen_automatically;
 
+  // Whether the session is in app mode, which includes a kiosk-like mode for
+  // fullscreen web content or running a single [forced] Chrome or ARC app.
+  bool is_running_in_app_mode;
+
   // Sets whether adding a user session to ash is allowed.
   AddUserSessionPolicy add_user_session_policy;
 
diff --git a/chromium/ash/public/interfaces/shelf.mojom b/chromium/ash/public/interfaces/shelf.mojom
index 7382716c269..8f7c854c5cb 100644
--- a/chromium/ash/public/interfaces/shelf.mojom
+++ b/chromium/ash/public/interfaces/shelf.mojom
@@ -8,6 +8,16 @@ import "mojo/common/string16.mojom";
 import "skia/public/interfaces/bitmap.mojom";
 import "ui/events/mojo/event.mojom";
 
+// The types of menu items shown in shelf context and application list menus.
+// These values roughly match ui::MenuModel::ItemType (sans TYPE_BUTTON_ITEM).
+enum MenuItemType {
+  COMMAND,    // An item that performs an action when selected.
+  CHECK,      // An item that can be selected/checked to toggle a boolean state.
+  RADIO,      // An item that can be selected/checked among a group of choices.
+  SEPARATOR,  // An item that shows a horizontal line separator.
+  SUBMENU,    // An item that presents a submenu within another menu.
+};
+
 // The actions that may be performed when a shelf item is selected.
 // These values match ash::ShelfAction.
 enum ShelfAction {
@@ -18,12 +28,6 @@ enum ShelfAction {
   APP_LIST_SHOWN,    // The app list launcher menu was shown.
 };
 
-// These values match ash::ShelfAlignment.
-enum ShelfAlignment { BOTTOM, LEFT, RIGHT, BOTTOM_LOCKED, };
-
-// These values match ash::ShelfAutoHideBehavior.
-enum ShelfAutoHideBehavior { ALWAYS, NEVER, HIDDEN, };
-
 // Represents the status of items in the shelf.
 // These values match ash::ShelfItemStatus.
 enum ShelfItemStatus {
@@ -78,22 +82,10 @@ interface ShelfController {
   UpdateShelfItem(ShelfItem item);
   // Sets the |delegate| for the item with |id|.
   SetShelfItemDelegate(ShelfID id, ShelfItemDelegate delegate);
-
-  // Set the shelf alignment and auto-hide behavior. See Shelf for details.
-  // TODO(jamescook): Eliminate all these methods and use the ash pref service
-  // to observe and to set prefs. http://crbug.com/723085
-  SetAlignment(ShelfAlignment alignment, int64 display_id);
-  SetAutoHideBehavior(ShelfAutoHideBehavior auto_hide, int64 display_id);
 };
 
 // A Shelf observer, used to persist profile settings and cache a ShelfModel.
 interface ShelfObserver {
-  // TODO(jamescook): Eliminate all these methods and use the ash pref service
-  // to observe and to set prefs. http://crbug.com/723085
-  OnShelfInitialized(int64 display_id);
-  OnAlignmentChanged(ShelfAlignment alignment, int64 display_id);
-  OnAutoHideBehaviorChanged(ShelfAutoHideBehavior auto_hide, int64 display_id);
-
   // Called when the |item| has been added at |index|.
   OnShelfItemAdded(int32 index, ShelfItem item);
   // Called when the item with |id| has been removed.
@@ -114,14 +106,24 @@ interface ShelfItemDelegate {
   // The callback reports the action taken and any app menu items to show.
   //
   // NOTE: This codepath is not currently used for context menu triggering.
-  // TODO(msw): Remove |display_id| once panels are removed. crbug.com/691099
+  // TODO(crbug.com/691099): Remove |display_id| once panels are removed.
   ItemSelected(ui.mojom.Event event,
                int64 display_id,
                ShelfLaunchSource source) => (ShelfAction action,
                                              array<MenuItem>? menu_items);
 
+  // Called when spawning a shelf item context menu, returns custom menu items.
+  // TODO(mash): Clients should push context menu items to Ash's shelf model.
+  GetContextMenuItems(int64 display_id) => (array<MenuItem> items);
+
   // Called on invocation of a shelf item's context or application menu command.
-  ExecuteCommand(uint32 command_id, int32 event_flags);
+  // |from_context_menu| is true if the command came from a context menu, or
+  // false if the command came from an application menu. If the |display_id| is
+  // unknown or irrelevant, callers may pass |display::kInvalidDisplayId|.
+  ExecuteCommand(bool from_context_menu,
+                 int64 command_id,
+                 int32 event_flags,
+                 int64 display_id);
 
   // Closes all windows associated with this shelf item.
   Close();
@@ -129,18 +131,15 @@ interface ShelfItemDelegate {
 
 // MenuItems are used to populate application menus for shelf items.
 // Note: Some menus only support a subset of these item features (eg. no icons).
-// Note: These are not yet used for shelf item or ash shell context menus.
 struct MenuItem {
-  enum Type { ITEM, CHECK, RADIO, SEPARATOR, SUBMENU };
-
-  Type type;                         // The type of the menu item.
-  uint32 command_id;                 // The client's arbitrary item command id.
+  MenuItemType type;                 // The type of the menu item.
+  int64 command_id;                  // The client's arbitrary item command id.
   mojo.common.mojom.String16 label;  // The string label, may be empty.
-  skia.mojom.Bitmap image;           // The image icon, may be null.
+  skia.mojom.Bitmap? image;          // The image icon, may be null.
   array<MenuItem>? submenu;          // The optional nested submenu item list.
   bool enabled;                      // The enabled state.
   bool checked;                      // The checked state.
-  uint32 radio_group_id;             // The radio group id.
+  int64 radio_group_id;              // The radio group id.
 };
 
 // Identifier for shelf items and their windows.
diff --git a/chromium/ash/public/interfaces/shelf.typemap b/chromium/ash/public/interfaces/shelf.typemap
index e3bd00f08b1..6aa61cf2b19 100644
--- a/chromium/ash/public/interfaces/shelf.typemap
+++ b/chromium/ash/public/interfaces/shelf.typemap
@@ -6,6 +6,7 @@ mojom = "//ash/public/interfaces/shelf.mojom"
 public_headers = [
   "//ash/public/cpp/shelf_item.h",
   "//ash/public/cpp/shelf_types.h",
+  "//ui/base/models/menu_model.h",
 ]
 traits_headers = [ "//ash/public/cpp/shelf_struct_traits.h" ]
 sources = [
@@ -14,8 +15,10 @@ sources = [
 public_deps = [
   "//mojo/common:common_custom_types",
   "//skia/public/interfaces",
+  "//ui/base",
 ]
 type_mappings = [
+  "ash.mojom.MenuItemType=ui::MenuModel::ItemType",
   "ash.mojom.ShelfAction=ash::ShelfAction",
   "ash.mojom.ShelfAlignment=ash::ShelfAlignment",
   "ash.mojom.ShelfAutoHideBehavior=ash::ShelfAutoHideBehavior",
diff --git a/chromium/ash/public/interfaces/shutdown.mojom b/chromium/ash/public/interfaces/shutdown.mojom
index 4785e773aef..11437eb195f 100644
--- a/chromium/ash/public/interfaces/shutdown.mojom
+++ b/chromium/ash/public/interfaces/shutdown.mojom
@@ -11,4 +11,8 @@ interface ShutdownController {
   // when the user initiates a shutdown via an UI element. Used in enterprise
   // environments for devices that should not be shut down.
   SetRebootOnShutdown(bool reboot_on_shutdown);
+
+  // Triggers an animated shutdown after the login screen shutdown button was
+  // pressed.
+  RequestShutdownFromLoginScreen();
 };
diff --git a/chromium/ash/public/interfaces/system_tray.mojom b/chromium/ash/public/interfaces/system_tray.mojom
index a52d63ecf26..c1204687be8 100644
--- a/chromium/ash/public/interfaces/system_tray.mojom
+++ b/chromium/ash/public/interfaces/system_tray.mojom
@@ -40,10 +40,12 @@ interface SystemTray {
                  bool factory_reset_required,
                  UpdateType update_type);
 
-  // Shows an icon in the system tray indicating that a software update is
-  // available but user's agreement is required as current connection is
-  // cellular. Once shown the icon persists until reboot.
-  ShowUpdateOverCellularAvailableIcon();
+  // If |visible| is true, shows an icon in the system tray which indicates that
+  // a software update is available but user's agreement is required as current
+  // connection is cellular. If |visible| is false, hides the icon because the
+  // user's one time permission on update over cellular connection has been
+  // granted.
+  SetUpdateOverCellularAvailableIconVisible(bool visible);
 };
 
 // Allows ash system tray to control a client (e.g. Chrome browser). Requests
diff --git a/chromium/ash/public/interfaces/touch_view.mojom b/chromium/ash/public/interfaces/tablet_mode.mojom
index a1461e28456..7ff3cb14de3 100644
--- a/chromium/ash/public/interfaces/touch_view.mojom
+++ b/chromium/ash/public/interfaces/tablet_mode.mojom
@@ -4,16 +4,16 @@
 
 module ash.mojom;
 
-// Used to listen for when TouchView is toggled.
-interface TouchViewObserver {
-  // This is fired after the touch view mode has been toggled.
-  OnTouchViewToggled(bool enabled);
+// Used to listen for when TabletMode is toggled.
+interface TabletModeObserver {
+  // This is fired after the tablet mode has been toggled.
+  OnTabletModeToggled(bool enabled);
 };
 
-// Accepts observers which are notified of the current state of TouchView, and
+// Accepts observers which are notified of the current state of TabletMode, and
 // of all future state changes.
-interface TouchViewManager {
-  // Calling this method triggers an initial notification of the touch view
+interface TabletModeManager {
+  // Calling this method triggers an initial notification of the tablet mode
   // state. Observers are automatically removed as their connections are closed.
-  AddObserver(TouchViewObserver observer);
+  AddObserver(TabletModeObserver observer);
 };
diff --git a/chromium/ash/resources/vector_icons/BUILD.gn b/chromium/ash/resources/vector_icons/BUILD.gn
index d0a2c4e7bb0..053dfcbcc65 100644
--- a/chromium/ash/resources/vector_icons/BUILD.gn
+++ b/chromium/ash/resources/vector_icons/BUILD.gn
@@ -62,10 +62,28 @@ aggregate_vector_icons("ash_vector_icons") {
     "network_ethernet.icon",
     "network_vpn.1x.icon",
     "network_vpn.icon",
+    "notification_accessibility.1x.icon",
+    "notification_accessibility.icon",
     "notification_accessibility_braille.icon",
+    "notification_battery_critical.icon",
+    "notification_battery_fluctuating.icon",
+    "notification_battery_low.icon",
+    "notification_bluetooth_battery_warning.1x.icon",
+    "notification_bluetooth_battery_warning.icon",
+    "notification_bluetooth.icon",
+    "notification_capslock.1x.icon",
+    "notification_capslock.icon",
+    "notification_chromevox.1x.icon",
+    "notification_chromevox.icon",
     "notification_display_error.icon",
     "notification_feedback_button.1x.icon",
     "notification_feedback_button.icon",
+    "notification_low_power_battery.icon",
+    "notification_screen.icon",
+    "notification_settings.icon",
+    "notification_stylus_battery_warning.1x.icon",
+    "notification_stylus_battery_warning.icon",
+    "notification_timer.icon",
     "palette_action_capture_region.1x.icon",
     "palette_action_capture_region.icon",
     "palette_action_capture_screen.1x.icon",
@@ -108,8 +126,6 @@ aggregate_vector_icons("ash_vector_icons") {
     "system_menu_accessibility_chromevox.icon",
     "system_menu_accessibility_contrast.1x.icon",
     "system_menu_accessibility_contrast.icon",
-    "system_menu_accessibility_large_cursor.1x.icon",
-    "system_menu_accessibility_large_cursor.icon",
     "system_menu_accessibility_screen_magnifier.1x.icon",
     "system_menu_audio_input.icon",
     "system_menu_audio_input.1x.icon",
@@ -242,8 +258,6 @@ aggregate_vector_icons("ash_vector_icons") {
     "touch_calibration_hand.icon",
     "tray_action_new_lock_screen_note.1x.icon",
     "tray_action_new_lock_screen_note.icon",
-    "window_control_back.1x.icon",
-    "window_control_back.icon",
     "window_control_close.1x.icon",
     "window_control_close.icon",
     "window_control_left_snapped.1x.icon",
diff --git a/chromium/ash/strings/BUILD.gn b/chromium/ash/strings/BUILD.gn
index b6c7fe128e5..a2341cc36d9 100644
--- a/chromium/ash/strings/BUILD.gn
+++ b/chromium/ash/strings/BUILD.gn
@@ -77,6 +77,7 @@ template("repack_one_locale_ash") {
     # Each input pak file should also have a deps line for completeness.
     sources = [
       "$root_gen_dir/ash/strings/ash_strings_${locale}.pak",
+      "$root_gen_dir/components/strings/components_strings_${locale}.pak",
       "$root_gen_dir/device/bluetooth/strings/bluetooth_strings_${locale}.pak",
       "$root_gen_dir/ui/chromeos/strings/ui_chromeos_strings_${locale}.pak",
       "$root_gen_dir/ui/strings/app_locale_settings_${locale}.pak",
@@ -85,6 +86,7 @@ template("repack_one_locale_ash") {
 
     deps = [
       "//ash/strings",
+      "//components/strings",
       "//device/bluetooth/strings",
       "//ui/chromeos/strings",
       "//ui/strings:app_locale_settings",