BASELINE: Update Chromium to 60.0.3112.70

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

14 files changed, 304 insertions, 93 deletions

diff --git a/chromium/ash/BUILD.gn b/chromium/ash/BUILD.gn
index 7fd1372aa3b..793a7e5956c 100644
--- a/chromium/ash/BUILD.gn
+++ b/chromium/ash/BUILD.gn
@@ -61,8 +61,6 @@ component("ash") {
     "ash_touch_exploration_manager_chromeos.cc",
     "ash_touch_exploration_manager_chromeos.h",
     "ash_view_ids.h",
-    "aura/aura_layout_manager_adapter.cc",
-    "aura/aura_layout_manager_adapter.h",
     "aura/key_event_watcher_aura.cc",
     "aura/key_event_watcher_aura.h",
     "aura/pointer_watcher_adapter.cc",
@@ -85,6 +83,15 @@ component("ash") {
     "devtools/ash_devtools_css_agent.h",
     "devtools/ash_devtools_dom_agent.cc",
     "devtools/ash_devtools_dom_agent.h",
+    "devtools/ui_element.cc",
+    "devtools/ui_element.h",
+    "devtools/ui_element_delegate.h",
+    "devtools/view_element.cc",
+    "devtools/view_element.h",
+    "devtools/widget_element.cc",
+    "devtools/widget_element.h",
+    "devtools/window_element.cc",
+    "devtools/window_element.h",
     "display/cursor_window_controller.cc",
     "display/cursor_window_controller.h",
     "display/display_animator.h",
@@ -179,9 +186,7 @@ component("ash") {
     "host/root_window_transformer.h",
     "host/transformer_helper.cc",
     "host/transformer_helper.h",
-    "ime/input_method_event_handler.cc",
-    "ime/input_method_event_handler.h",
-    "ime_control_delegate.h",
+    "ime/ime_switch_type.h",
     "key_event_watcher.cc",
     "key_event_watcher.h",
     "keyboard/keyboard_observer_register.cc",
@@ -201,13 +206,19 @@ component("ash") {
     "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",
+    "login/ui/lock_contents_view.h",
+    "login/ui/lock_screen.cc",
+    "login/ui/lock_screen.h",
+    "login/ui/lock_window.cc",
+    "login/ui/lock_window.h",
     "login_status.h",
     "magnifier/magnification_controller.cc",
     "magnifier/magnification_controller.h",
     "magnifier/partial_magnification_controller.cc",
     "magnifier/partial_magnification_controller.h",
-    "material_design/material_design_controller.cc",
-    "material_design/material_design_controller.h",
     "media_controller.cc",
     "media_controller.h",
     "metrics/desktop_task_switch_metric_recorder.cc",
@@ -248,9 +259,9 @@ component("ash") {
     "screenshot_delegate.h",
     "session/session_controller.cc",
     "session/session_controller.h",
+    "session/session_observer.cc",
+    "session/session_observer.h",
     "session/session_state_delegate.h",
-    "session/session_state_observer.cc",
-    "session/session_state_observer.h",
     "shared/immersive_context.cc",
     "shared/immersive_context.h",
     "shared/immersive_focus_watcher.h",
@@ -273,6 +284,8 @@ component("ash") {
     "shelf/overflow_bubble_view.h",
     "shelf/overflow_button.cc",
     "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",
@@ -286,11 +299,9 @@ component("ash") {
     "shelf/shelf_button.h",
     "shelf/shelf_button_pressed_metric_tracker.cc",
     "shelf/shelf_button_pressed_metric_tracker.h",
-    "shelf/shelf_constants.cc",
     "shelf/shelf_constants.h",
     "shelf/shelf_controller.cc",
     "shelf/shelf_controller.h",
-    "shelf/shelf_delegate.h",
     "shelf/shelf_layout_manager.cc",
     "shelf/shelf_layout_manager.h",
     "shelf/shelf_layout_manager_observer.h",
@@ -299,6 +310,7 @@ component("ash") {
     "shelf/shelf_model.cc",
     "shelf/shelf_model.h",
     "shelf/shelf_model_observer.h",
+    "shelf/shelf_observer.h",
     "shelf/shelf_tooltip_manager.cc",
     "shelf/shelf_tooltip_manager.h",
     "shelf/shelf_view.cc",
@@ -311,11 +323,6 @@ component("ash") {
     "shelf/shelf_window_watcher.h",
     "shelf/shelf_window_watcher_item_delegate.cc",
     "shelf/shelf_window_watcher_item_delegate.h",
-    "shelf/wm_shelf.cc",
-    "shelf/wm_shelf.h",
-    "shelf/wm_shelf_observer.h",
-    "shelf/wm_shelf_util.cc",
-    "shelf/wm_shelf_util.h",
     "shell.cc",
     "shell.h",
     "shell_delegate.h",
@@ -360,6 +367,12 @@ component("ash") {
     "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",
+    "system/display_scale/scale_view.h",
+    "system/display_scale/tray_scale.cc",
+    "system/display_scale/tray_scale.h",
     "system/enterprise/enterprise_domain_observer.h",
     "system/enterprise/tray_enterprise.cc",
     "system/enterprise/tray_enterprise.h",
@@ -375,9 +388,10 @@ component("ash") {
     "system/keyboard_brightness_controller.h",
     "system/locale/locale_notification_controller.cc",
     "system/locale/locale_notification_controller.h",
+    "system/lock_screen_action/lock_screen_action_tray.cc",
+    "system/lock_screen_action/lock_screen_action_tray.h",
     "system/media_security/multi_profile_media_tray_item.cc",
     "system/media_security/multi_profile_media_tray_item.h",
-    "system/network/network_detailed_view.h",
     "system/network/network_icon.cc",
     "system/network/network_icon.h",
     "system/network/network_icon_animation.cc",
@@ -387,9 +401,6 @@ component("ash") {
     "system/network/network_info.h",
     "system/network/network_list.cc",
     "system/network/network_list.h",
-    "system/network/network_list_delegate.h",
-    "system/network/network_list_view_base.cc",
-    "system/network/network_list_view_base.h",
     "system/network/network_observer.h",
     "system/network/network_portal_detector_observer.h",
     "system/network/network_state_list_detailed_view.cc",
@@ -408,6 +419,12 @@ component("ash") {
     "system/network/vpn_list_view.h",
     "system/networking_config_delegate.cc",
     "system/networking_config_delegate.h",
+    "system/night_light/night_light_controller.cc",
+    "system/night_light/night_light_controller.h",
+    "system/night_light/night_light_toggle_button.cc",
+    "system/night_light/night_light_toggle_button.h",
+    "system/night_light/tray_night_light.cc",
+    "system/night_light/tray_night_light.h",
     "system/overview/overview_button_tray.cc",
     "system/overview/overview_button_tray.h",
     "system/palette/common_palette_tool.cc",
@@ -432,6 +449,8 @@ component("ash") {
     "system/palette/tools/laser_pointer_mode.h",
     "system/palette/tools/magnifier_mode.cc",
     "system/palette/tools/magnifier_mode.h",
+    "system/palette/tools/metalayer_mode.cc",
+    "system/palette/tools/metalayer_mode.h",
     "system/power/battery_notification.cc",
     "system/power/battery_notification.h",
     "system/power/dual_role_notification.cc",
@@ -471,13 +490,13 @@ component("ash") {
     "system/session/session_length_limit_observer.h",
     "system/session/tray_session_length_limit.cc",
     "system/session/tray_session_length_limit.h",
+    "system/status_area_focus_observer.h",
     "system/status_area_layout_manager.cc",
     "system/status_area_layout_manager.h",
     "system/status_area_widget.cc",
     "system/status_area_widget.h",
     "system/status_area_widget_delegate.cc",
     "system/status_area_widget_delegate.h",
-    "system/supervised/custodian_info_tray_observer.h",
     "system/supervised/tray_supervised_user.cc",
     "system/supervised/tray_supervised_user.h",
     "system/system_clock_observer.cc",
@@ -496,10 +515,6 @@ component("ash") {
     "system/toast/toast_overlay.h",
     "system/tray/actionable_view.cc",
     "system/tray/actionable_view.h",
-    "system/tray/default_system_tray_delegate.cc",
-    "system/tray/default_system_tray_delegate.h",
-    "system/tray/fixed_sized_image_view.cc",
-    "system/tray/fixed_sized_image_view.h",
     "system/tray/hover_highlight_view.cc",
     "system/tray/hover_highlight_view.h",
     "system/tray/ime_info.cc",
@@ -522,14 +537,14 @@ component("ash") {
     "system/tray/system_tray_item.h",
     "system/tray/system_tray_notifier.cc",
     "system/tray/system_tray_notifier.h",
-    "system/tray/throbber_view.cc",
-    "system/tray/throbber_view.h",
     "system/tray/tray_background_view.cc",
     "system/tray/tray_background_view.h",
     "system/tray/tray_bubble_wrapper.cc",
     "system/tray/tray_bubble_wrapper.h",
     "system/tray/tray_constants.cc",
     "system/tray/tray_constants.h",
+    "system/tray/tray_container.cc",
+    "system/tray/tray_container.h",
     "system/tray/tray_details_view.cc",
     "system/tray/tray_details_view.h",
     "system/tray/tray_event_filter.cc",
@@ -589,8 +604,13 @@ component("ash") {
     "touch/touch_observer_hud.h",
     "touch/touch_uma.cc",
     "touch/touch_uma.h",
+    "tray_action/tray_action.cc",
+    "tray_action/tray_action.h",
+    "tray_action/tray_action_observer.h",
     "utility/screenshot_controller.cc",
     "utility/screenshot_controller.h",
+    "utility/transformer_util.cc",
+    "utility/transformer_util.h",
     "virtual_keyboard_controller.cc",
     "virtual_keyboard_controller.h",
     "wallpaper/wallpaper_controller.cc",
@@ -647,6 +667,8 @@ component("ash") {
     "wm/lock_state_observer.h",
     "wm/lock_window_state.cc",
     "wm/lock_window_state.h",
+    "wm/maximize_mode/maximize_mode_backdrop_delegate_impl.cc",
+    "wm/maximize_mode/maximize_mode_backdrop_delegate_impl.h",
     "wm/maximize_mode/maximize_mode_controller.cc",
     "wm/maximize_mode/maximize_mode_controller.h",
     "wm/maximize_mode/maximize_mode_event_handler.cc",
@@ -662,8 +684,6 @@ component("ash") {
     "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h",
     "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc",
     "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h",
-    "wm/maximize_mode/workspace_backdrop_delegate.cc",
-    "wm/maximize_mode/workspace_backdrop_delegate.h",
     "wm/mru_window_tracker.cc",
     "wm/mru_window_tracker.h",
     "wm/overlay_event_filter.cc",
@@ -671,13 +691,8 @@ component("ash") {
     "wm/overview/cleanup_animation_observer.cc",
     "wm/overview/cleanup_animation_observer.h",
     "wm/overview/overview_animation_type.h",
+    "wm/overview/scoped_overview_animation_settings.cc",
     "wm/overview/scoped_overview_animation_settings.h",
-    "wm/overview/scoped_overview_animation_settings_aura.cc",
-    "wm/overview/scoped_overview_animation_settings_aura.h",
-    "wm/overview/scoped_overview_animation_settings_factory.cc",
-    "wm/overview/scoped_overview_animation_settings_factory.h",
-    "wm/overview/scoped_overview_animation_settings_factory_aura.cc",
-    "wm/overview/scoped_overview_animation_settings_factory_aura.h",
     "wm/overview/scoped_transform_overview_window.cc",
     "wm/overview/scoped_transform_overview_window.h",
     "wm/overview/window_grid.cc",
@@ -764,8 +779,6 @@ component("ash") {
     "wm/window_resizer.h",
     "wm/window_state.cc",
     "wm/window_state.h",
-    "wm/window_state_aura.cc",
-    "wm/window_state_aura.h",
     "wm/window_state_delegate.cc",
     "wm/window_state_delegate.h",
     "wm/window_state_observer.h",
@@ -775,8 +788,6 @@ component("ash") {
     "wm/window_util.h",
     "wm/wm_event.cc",
     "wm/wm_event.h",
-    "wm/wm_screen_util.cc",
-    "wm/wm_screen_util.h",
     "wm/wm_snap_to_pixel_layout_manager.cc",
     "wm/wm_snap_to_pixel_layout_manager.h",
     "wm/wm_toplevel_window_event_handler.cc",
@@ -785,6 +796,9 @@ component("ash") {
     "wm/wm_types.h",
     "wm/wm_window_animations.cc",
     "wm/wm_window_animations.h",
+    "wm/workspace/backdrop_controller.cc",
+    "wm/workspace/backdrop_controller.h",
+    "wm/workspace/backdrop_delegate.h",
     "wm/workspace/magnetism_matcher.cc",
     "wm/workspace/magnetism_matcher.h",
     "wm/workspace/multi_window_resize_controller.cc",
@@ -799,14 +813,12 @@ component("ash") {
     "wm/workspace/workspace_event_handler_aura.h",
     "wm/workspace/workspace_layout_manager.cc",
     "wm/workspace/workspace_layout_manager.h",
-    "wm/workspace/workspace_layout_manager_backdrop_delegate.h",
     "wm/workspace/workspace_types.h",
     "wm/workspace/workspace_window_resizer.cc",
     "wm/workspace/workspace_window_resizer.h",
     "wm/workspace_controller.cc",
     "wm/workspace_controller.h",
     "wm_display_observer.h",
-    "wm_layout_manager.h",
     "wm_transient_window_observer.h",
     "wm_window.cc",
     "wm_window.h",
@@ -840,6 +852,7 @@ component("ash") {
     "//components/signin/core/account_id",
     "//components/ui_devtools",
     "//components/user_manager",
+    "//components/vector_icons",
     "//components/wallpaper",
     "//device/bluetooth",
     "//gpu/command_buffer/client",
@@ -848,6 +861,7 @@ component("ash") {
     "//net",
     "//services/preferences/public/cpp",
     "//services/service_manager/public/cpp",
+    "//services/ui/public/cpp",
     "//services/ui/public/interfaces",
     "//skia",
 
@@ -997,6 +1011,8 @@ static_library("ash_shell_lib") {
     "shell/toplevel_window.cc",
     "shell/toplevel_window.h",
     "shell/widgets.cc",
+    "shell/window_type_launcher.cc",
+    "shell/window_type_launcher.h",
     "shell/window_watcher.cc",
     "shell/window_watcher.h",
     "shell/window_watcher_shelf_item_delegate.cc",
@@ -1023,6 +1039,7 @@ static_library("ash_shell_lib") {
     "//ui/base",
     "//ui/gfx",
     "//ui/gfx/geometry",
+    "//ui/message_center",
     "//ui/views",
     "//ui/views:test_support",
     "//ui/views/examples:views_examples_lib",
@@ -1041,8 +1058,6 @@ static_library("ash_shell_lib_with_content") {
     "shell/content/client/shell_main_delegate.h",
     "shell/content/shell_content_state_impl.cc",
     "shell/content/shell_content_state_impl.h",
-    "shell/window_type_launcher.cc",
-    "shell/window_type_launcher.h",
   ]
 
   deps = [
@@ -1154,11 +1169,13 @@ source_set("common_unittests") {
     "laser/laser_pointer_controller_unittest.cc",
     "laser/laser_pointer_points_unittest.cc",
     "laser/laser_segment_utils_unittest.cc",
+    "login/lock_screen_controller_unittest.cc",
     "metrics/desktop_task_switch_metric_recorder_unittest.cc",
     "metrics/pointer_metrics_recorder_unittest.cc",
     "metrics/task_switch_metrics_recorder_unittest.cc",
     "metrics/task_switch_time_tracker_unittest.cc",
     "metrics/user_metrics_recorder_unittest.cc",
+    "mus/window_manager_common_unittests.cc",
     "mus_property_mirror_ash_unittest.cc",
     "root_window_controller_unittest.cc",
     "rotator/screen_rotation_animation_unittest.cc",
@@ -1185,16 +1202,23 @@ source_set("common_unittests") {
     "system/brightness/tray_brightness_unittest.cc",
     "system/date/date_view_unittest.cc",
     "system/date/system_info_default_view_unittest.cc",
+    "system/enterprise/tray_enterprise_unittest.cc",
     "system/ime/tray_ime_chromeos_unittest.cc",
     "system/ime_menu/ime_menu_tray_unittest.cc",
+    "system/lock_screen_action/lock_screen_action_tray_unittest.cc",
     "system/media_security/multi_profile_media_tray_item_unittest.cc",
+    "system/network/network_icon_unittest.cc",
     "system/network/sms_observer_unittest.cc",
+    "system/network/tray_network_unittest.cc",
     "system/network/vpn_list_unittest.cc",
+    "system/night_light/night_light_controller_unittest.cc",
+    "system/night_light/tray_night_light_unittest.cc",
     "system/overview/overview_button_tray_unittest.cc",
     "system/palette/mock_palette_tool_delegate.cc",
     "system/palette/mock_palette_tool_delegate.h",
     "system/palette/palette_tool_manager_unittest.cc",
     "system/palette/tools/create_note_unittest.cc",
+    "system/palette/tools/metalayer_unittest.cc",
     "system/palette/tools/screenshot_unittest.cc",
     "system/power/power_event_observer_unittest.cc",
     "system/power/power_status_unittest.cc",
@@ -1219,6 +1243,7 @@ source_set("common_unittests") {
     "system/web_notification/web_notification_tray_unittest.cc",
     "test/ash_test_helper_unittest.cc",
     "tooltips/tooltip_controller_unittest.cc",
+    "tray_action/tray_action_unittest.cc",
     "wallpaper/wallpaper_controller_unittest.cc",
     "window_user_data_unittest.cc",
     "wm/ash_focus_rules_unittest.cc",
@@ -1252,13 +1277,11 @@ source_set("common_unittests") {
     "wm/workspace/workspace_event_handler_unittest.cc",
     "wm/workspace/workspace_layout_manager_unittest.cc",
     "wm/workspace/workspace_window_resizer_unittest.cc",
-    "wm/workspace_controller_test_helper.cc",
-    "wm/workspace_controller_test_helper.h",
     "wm/workspace_controller_unittest.cc",
-    "wm_window_unittest.cc",
   ]
   deps = [
     "//ash",
+    "//ash/mus:lib",
     "//ash/public/cpp:ash_public_cpp",
     "//ash/public/cpp:unit_tests",
     "//ash/resources/vector_icons",
@@ -1268,6 +1291,7 @@ source_set("common_unittests") {
     "//chromeos",
     "//chromeos:power_manager_proto",
     "//chromeos:test_support_without_gmock",
+    "//components/prefs:test_support",
     "//device/bluetooth",
     "//services/ui/public/interfaces",
     "//testing/gmock",
@@ -1485,7 +1509,7 @@ executable("ash_shell_with_content") {
   deps = [
     ":ash_shell_lib_with_content",
     "//base",
-    "//build/config/sanitizers:deps",
+    "//build/config:exe_and_shlib_deps",
     "//build/win:default_exe_manifest",
     "//components/user_manager",
     "//content",
diff --git a/chromium/ash/autoclick/mus/BUILD.gn b/chromium/ash/autoclick/mus/BUILD.gn
index 6e7481b9168..c69bc11f635 100644
--- a/chromium/ash/autoclick/mus/BUILD.gn
+++ b/chromium/ash/autoclick/mus/BUILD.gn
@@ -22,7 +22,6 @@ source_set("lib") {
     "//mojo/common",
     "//mojo/public/cpp/bindings",
     "//services/service_manager/public/cpp",
-    "//services/service_manager/public/cpp:sources",
     "//services/ui/public/cpp",
     "//services/ui/public/interfaces",
     "//ui/aura",
@@ -45,7 +44,6 @@ service("accessibility_autoclick") {
     "//base",
     "//mojo/public/cpp/bindings",
     "//services/service_manager/public/cpp",
-    "//services/service_manager/public/cpp:sources",
     "//ui/views/mus:for_mojo_application",
   ]
 
diff --git a/chromium/ash/mus/BUILD.gn b/chromium/ash/mus/BUILD.gn
index cd65be32e0c..1409ea739c5 100644
--- a/chromium/ash/mus/BUILD.gn
+++ b/chromium/ash/mus/BUILD.gn
@@ -20,6 +20,8 @@ source_set("lib") {
     "accelerators/accelerator_ids.h",
     "accessibility_delegate_mus.cc",
     "accessibility_delegate_mus.h",
+    "ash_window_tree_host_mus.cc",
+    "ash_window_tree_host_mus.h",
     "bridge/immersive_handler_factory_mus.cc",
     "bridge/immersive_handler_factory_mus.h",
     "bridge/shell_port_mash.cc",
@@ -46,14 +48,14 @@ source_set("lib") {
     "property_util.h",
     "screen_mus.cc",
     "screen_mus.h",
-    "shelf_delegate_mus.cc",
-    "shelf_delegate_mus.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",
+    "touch_transform_setter_mus.h",
     "wallpaper_delegate_mus.cc",
     "wallpaper_delegate_mus.h",
     "window_manager.cc",
@@ -72,10 +74,12 @@ source_set("lib") {
     "//components/user_manager",
     "//components/wallpaper",
     "//device/bluetooth",
+    "//services/ui/public/interfaces/input_devices",
     "//ui/app_list/presenter",
     "//ui/app_list/presenter:mojom",
     "//ui/chromeos",
     "//ui/display/manager",
+    "//ui/display/manager/chromeos/mojo:interfaces",
     "//ui/keyboard",
     "//ui/keyboard:mojom",
     "//ui/message_center",
@@ -89,9 +93,9 @@ source_set("lib") {
     "//mash/public/interfaces",
     "//mojo/common:common_base",
     "//services/service_manager/public/cpp",
-    "//services/tracing/public/cpp",
     "//services/ui/common:mus_common",
     "//services/ui/public/cpp",
+    "//services/ui/public/cpp/input_devices",
     "//services/ui/public/interfaces",
     "//services/ui/public/interfaces/display",
     "//skia",
@@ -190,12 +194,6 @@ source_set("unittests") {
     "bridge/shell_port_mash_test_api.h",
     "non_client_frame_controller_unittest.cc",
     "screen_mus_unittest.cc",
-    "test/ash_test_impl_mus.cc",
-    "test/ash_test_impl_mus.h",
-    "test/wm_test_base.cc",
-    "test/wm_test_base.h",
-    "test/wm_test_helper.cc",
-    "test/wm_test_helper.h",
     "top_level_window_factory_unittest.cc",
     "window_manager_unittest.cc",
   ]
@@ -214,6 +212,7 @@ source_set("unittests") {
     "//services/service_manager/public/cpp:service_test_support",
     "//services/ui/common:mus_common",
     "//services/ui/public/cpp",
+    "//services/ui/public/cpp/input_devices",
     "//services/ui/public/interfaces",
     "//skia",
     "//testing/gtest",
diff --git a/chromium/ash/mus/standalone/BUILD.gn b/chromium/ash/mus/standalone/BUILD.gn
new file mode 100644
index 00000000000..01ebe41d771
--- /dev/null
+++ b/chromium/ash/mus/standalone/BUILD.gn
@@ -0,0 +1,42 @@
+# 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.
+
+import("//services/service_manager/public/cpp/service.gni")
+import("//services/service_manager/public/service_manifest.gni")
+
+assert(is_chromeos)
+
+service("ash_standalone") {
+  output_name = "ash_standalone"
+  testonly = true
+
+  sources = [
+    "ash_standalone_main.cc",
+  ]
+
+  deps = [
+    "//ash:ash_shell_lib",
+    "//ash/mus:lib",
+    "//ash/mus:resources",
+    "//ash/mus:resources_200",
+    "//services/service_manager/public/cpp",
+    "//services/ui/public/cpp/input_devices",
+    "//services/ui/public/interfaces",
+    "//ui/app_list/presenter",
+    "//ui/views/examples:views_examples_lib",
+  ]
+
+  # TODO(beng): This target relies on //mash/session, but there is a cycle so we
+  #             can't state that dependency here.
+  data_deps = [
+    "//ash/mus:resources",
+    "//ash/mus:resources_200",
+    "//services/ui",
+  ]
+}
+
+service_manifest("manifest") {
+  name = "ash_standalone"
+  source = "manifest.json"
+}
diff --git a/chromium/ash/public/cpp/BUILD.gn b/chromium/ash/public/cpp/BUILD.gn
index 5fa8010024f..78e71442a6c 100644
--- a/chromium/ash/public/cpp/BUILD.gn
+++ b/chromium/ash/public/cpp/BUILD.gn
@@ -5,9 +5,11 @@
 # C++ headers and sources that can be used outside ash.
 component("ash_public_cpp") {
   sources = [
-    "app_launch_id.cc",
-    "app_launch_id.h",
+    "ash_pref_names.cc",
+    "ash_pref_names.h",
     "ash_public_export.h",
+    "ash_typography.cc",
+    "ash_typography.h",
     "config.h",
     "mus_property_mirror_ash.cc",
     "mus_property_mirror_ash.h",
@@ -34,6 +36,7 @@ component("ash_public_cpp") {
     "//mojo/common:common_custom_types",
     "//skia/public/interfaces",
     "//ui/aura",
+    "//ui/views",
     "//ui/views/mus",
   ]
 
diff --git a/chromium/ash/public/interfaces/BUILD.gn b/chromium/ash/public/interfaces/BUILD.gn
index 17dd86484f1..3784b9c7819 100644
--- a/chromium/ash/public/interfaces/BUILD.gn
+++ b/chromium/ash/public/interfaces/BUILD.gn
@@ -17,6 +17,7 @@ mojom("interfaces_internal") {
     "constants.mojom",
     "event_properties.mojom",
     "locale.mojom",
+    "lock_screen.mojom",
     "media.mojom",
     "new_window.mojom",
     "session_controller.mojom",
@@ -24,6 +25,7 @@ mojom("interfaces_internal") {
     "shutdown.mojom",
     "system_tray.mojom",
     "touch_view.mojom",
+    "tray_action.mojom",
     "update.mojom",
     "volume.mojom",
     "vpn_list.mojom",
@@ -40,6 +42,7 @@ mojom("interfaces_internal") {
     "//ui/gfx/image/mojo:interfaces",
   ]
 
+  component_output_prefix = "ash_public_interfaces_internal"
   export_class_attribute = "ASH_PUBLIC_EXPORT"
   export_define = "ASH_PUBLIC_IMPLEMENTATION=1"
   export_header = "ash/public/cpp/ash_public_export.h"
diff --git a/chromium/ash/public/interfaces/lock_screen.mojom b/chromium/ash/public/interfaces/lock_screen.mojom
new file mode 100644
index 00000000000..d29b331e358
--- /dev/null
+++ b/chromium/ash/public/interfaces/lock_screen.mojom
@@ -0,0 +1,44 @@
+// 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";
+
+// Allows clients (e.g. Chrome browser) to control the ash lock screen.
+interface LockScreen {
+  // Sets the client interface.
+  SetClient(LockScreenClient client);
+
+  // Requests to show error message in the ash lock screen.
+  // TODO(xiaoyinh): login_attempts is probabaly not needed from chrome,
+  // remove it when we start to count the login attempts in ash lock screen.
+  // |login_attempts|: The number of the login authentication attempts.
+  // |error_text|:     The error text to be shown in lock screen.
+  // |help_link_text|: The help link to be shown in lock screen.
+  // |help_topic_id|:  The id of the help app topic regarding this error.
+  ShowErrorMessage(int32 login_attempts,
+                   string error_text,
+                   string help_link_text,
+                   int32 help_topic_id);
+
+  // Requests to close any displayed error messages in ash lock screen.
+  ClearErrors();
+};
+
+// Allows ash lock screen to control a client (e.g. Chrome browser). Requests
+// often involve preferences or talk to cryptohome that is not available to ash.
+interface LockScreenClient {
+  // Request user authentication in chrome.
+  // If auth succeeds:
+  // chrome will hide the lock screen and clear any displayed error messages.
+  // If auth fails:
+  // chrome will request lock screen to show error messages.
+  // |account_id|:           The account id of the user we are authenticating.
+  // |hashed_password|:      The hashed password of the user.
+  // |authenticated_by_pin|: True if we are using pin to authenticate.
+  AuthenticateUser(signin.mojom.AccountId account_id,
+                   string hashed_password,
+	           bool authenticated_by_pin);
+};
diff --git a/chromium/ash/public/interfaces/session_controller.mojom b/chromium/ash/public/interfaces/session_controller.mojom
index 6a2e43834d6..246b2ba93c3 100644
--- a/chromium/ash/public/interfaces/session_controller.mojom
+++ b/chromium/ash/public/interfaces/session_controller.mojom
@@ -71,7 +71,8 @@ enum CycleUserDirection {
   PREVIOUS,  // Cycle to the previous user.
 };
 
-// Info about a user session in ash.
+// Info about a user session in ash. May be sent repeatedly for a single user
+// because individual fields may change (e.g. the avatar image or custodians).
 struct UserSession {
   // A user session id for the user session. It is generated by session manager
   // (chrome) when a user session starts and never changes during the lifetime
@@ -84,6 +85,22 @@ struct UserSession {
   string display_name;
   string display_email;
   gfx.mojom.ImageSkia avatar;
+
+  // For supervised users only, the email address of the custodian account.
+  // Empty for non-supervised users. Available after profile is loaded.
+  string custodian_email;
+
+  // For supervised users only, the email address of the second custodian
+  // account, if any. Available after profile is loaded.
+  string second_custodian_email;
+
+  // Whether the settings icon should be enabled in the system tray menu.
+  // Usually true after login, but can be false for specialized user sessions
+  // (e.g. adding supervised users).
+  bool should_enable_settings;
+
+  // Similar to |should_show_settings| but for the notification tray.
+  bool should_show_notification_tray;
 };
 
 // Matches ash::AddUserSessionPolicy.
@@ -135,10 +152,25 @@ interface SessionController {
   // active user session.
   SetUserSessionOrder(array<uint32> user_session_ids);
 
+  // Runs the pre-lock animation to start locking ash. When the call returns,
+  // |locked| == true means that the ash post-lock animation is finished and ash
+  // is fully locked. Otherwise |locked| is false, which means something is
+  // wrong for the lock and ash is not locked. When the call returns with a true
+  // |locked|, screen locker runs the post lock jobs such as a11y announcement
+  // etc. Invoked by the screen locker during initialization.
+  StartLock() => (bool locked);
+
+  // Notifies ash that chrome lock animations are finished. This is the last
+  // event for locking. SessionController forwards it to PowerEventObserver.
+  NotifyChromeLockAnimationsComplete();
+
   // Runs the pre-unlock animation. Invoked by the screen locker before
   // dismissing. When the mojo call returns, screen locker takes that as a
   // signal of finished unlock animation and dismisses itself.
   RunUnlockAnimation() => ();
+
+  // Notifies that chrome is terminating.
+  NotifyChromeTerminating();
 };
 
 // Interface for ash to request session service from its client (e.g. Chrome).
diff --git a/chromium/ash/public/interfaces/shelf.mojom b/chromium/ash/public/interfaces/shelf.mojom
index 19e0c2213a1..faaeddf3bd8 100644
--- a/chromium/ash/public/interfaces/shelf.mojom
+++ b/chromium/ash/public/interfaces/shelf.mojom
@@ -61,7 +61,7 @@ interface ShelfController {
   // Observers are immediately notified of the current shelf states when added.
   AddObserver(associated ShelfObserver observer);
 
-  // Set the shelf alignment and auto-hide behavior. See WmShelf for details.
+  // Set the shelf alignment and auto-hide behavior. See Shelf for details.
   SetAlignment(ShelfAlignment alignment, int64 display_id);
   SetAutoHideBehavior(ShelfAutoHideBehavior auto_hide, int64 display_id);
 
@@ -73,7 +73,9 @@ interface ShelfController {
 
 // ShelfObserver is notified on shelf changes; used to persist profile settings.
 interface ShelfObserver {
-  OnShelfCreated(int64 display_id);
+  // 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);
 };
@@ -115,16 +117,22 @@ struct MenuItem {
   uint32 radio_group_id;             // The radio group id.
 };
 
+// Identifier for shelf items and their windows.
+// This structure matches ash::ShelfID.
+struct ShelfID {
+  string app_id;            // An app id string, used to match app windows.
+                            // (eg. extension ids, arc ids, "AppList", etc.)
+  string launch_id;         // A string used to support multiple items per app.
+                            // (eg. Citrix may use 'Word' or 'Excel' launch ids)
+};
+
 // ShelfItems are used to populate the shelf.
 // This structure matches ash::ShelfItem.
 struct ShelfItem {
   ShelfItemType type;       // The type of the shelf item.
   skia.mojom.Bitmap image;  // An icon image Bitmap, shown on the shelf.
-  int64 shelf_id;           // A shelf model ID used by the shelf and clients.
   ShelfItemStatus status;   // The running/closed/etc. status of the item.
-  string app_id;            // An app id string, used to match app windows.
-  string launch_id;         // A string used to support multiple items per app.
-                            // (eg. Citrix may use 'Word' or 'Excel' launch ids)
+  ShelfID shelf_id;         // The id for the shelf item and its windows.
   mojo.common.mojom.String16 title;  // The title to display for tooltips, etc.
   bool shows_tooltip;       // Whether the tooltip should be shown on hover.
   bool pinned_by_policy;    // Whether the item is pinned by policy preferences,
diff --git a/chromium/ash/public/interfaces/system_tray.mojom b/chromium/ash/public/interfaces/system_tray.mojom
index fc980e88c20..28aafae0092 100644
--- a/chromium/ash/public/interfaces/system_tray.mojom
+++ b/chromium/ash/public/interfaces/system_tray.mojom
@@ -23,12 +23,22 @@ interface SystemTray {
   // Otherwise sets 12 hour time formatting.
   SetUse24HourClock(bool use_24_hour);
 
+  // Creates or updates an item in the system tray menu with information about
+  // enterprise management. The item appears if |enterprise_domain| is not empty
+  // or |active_directory_managed| is true.
+  SetEnterpriseDomain(string enterprise_domain, bool active_directory_managed);
+
   // Shows an icon in the system tray indicating that a software update is
   // available. Once shown the icon persists until reboot. |severity| and
   // |factory_reset_required| are used to set the icon, color, and tooltip.
   ShowUpdateIcon(UpdateSeverity severity,
                  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();
 };
 
 // Allows ash system tray to control a client (e.g. Chrome browser). Requests
@@ -67,13 +77,17 @@ interface SystemTrayClient {
   // Shows settings related to input methods.
   ShowIMESettings();
 
-  // Shows help.
+  // Shows the about chrome OS page and checks for updates after the page is
+  // loaded.
+  ShowAboutChromeOS();
+
+  // Shows the Chromebook help app.
   ShowHelp();
 
-  // Show accessibility help.
+  // Shows accessibility help.
   ShowAccessibilityHelp();
 
-  // Show the settings related to accessibility.
+  // Shows the settings related to accessibility.
   ShowAccessibilitySettings();
 
   // Shows the help center article for the stylus tool palette.
@@ -85,7 +99,8 @@ interface SystemTrayClient {
   // Shows information about public account mode.
   ShowPublicAccountInfo();
 
-  // TODO(crbug.com/647412): ShowEnterpriseInfo();
+  // Shows information about enterprise enrolled devices.
+  ShowEnterpriseInfo();
 
   // Shows UI to configure or activate the network specified by |network_id|,
   // which may include showing payment or captive portal UI when appropriate.
diff --git a/chromium/ash/public/interfaces/tray_action.mojom b/chromium/ash/public/interfaces/tray_action.mojom
new file mode 100644
index 00000000000..63c5f691a60
--- /dev/null
+++ b/chromium/ash/public/interfaces/tray_action.mojom
@@ -0,0 +1,51 @@
+// 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;
+
+// An action handler state.
+enum TrayActionState {
+  // The action cannot be handled - due to no client being set, the client not
+  // supporting the action, user session not being locked etc.
+  kNotAvailable,
+  
+  // The client supports the action and is not currently handling the action.
+  kAvailable,
+
+  // The client received the request for the action and it is launching the
+  // flow to handle it.
+  kLaunching,
+
+  // The client is currently handling the action.
+  kActive,
+
+  // The client is currently handling the action, but in background (e.g. the
+  // handler window for the lock screen action was moved to the background and
+  // appears underneath the login user pods).
+  kBackground,
+};
+
+// Used by a client (e.g. Chrome) to set up a handler for a tray action, and
+// notify ash on the action handler's state changes. A tray action is one of
+// predefined actions (currently only the "new note on lock screen" action is
+// supported) that appear as an ash status area button if the client declares
+// the action as available. Clicking the button invokes a client method that
+// requests the action associated with the button to be handled.
+interface TrayAction {
+  // Sets the client to be used to handle action requests.
+  // |lock_screen_note_state|: The current lock screen note action state
+  //     associated with the client.
+  SetClient(TrayActionClient client, TrayActionState lock_screen_note_state);
+
+  // Updates action state for the lock screen note action. If called with no
+  // client set, the state change will not take effect until a client is set.
+  // Null client is equivalent to kNotAvailable state.
+  UpdateLockScreenNoteState(TrayActionState state);
+};
+
+// Used by ash to request Chrome to handle an action.
+interface TrayActionClient {
+  // Requests a lock screen note action to be handled.
+  RequestNewLockScreenNote();
+};
diff --git a/chromium/ash/resources/vector_icons/BUILD.gn b/chromium/ash/resources/vector_icons/BUILD.gn
index 622ffc4a9c9..73f4b32595e 100644
--- a/chromium/ash/resources/vector_icons/BUILD.gn
+++ b/chromium/ash/resources/vector_icons/BUILD.gn
@@ -56,6 +56,7 @@ aggregate_vector_icons("ash_vector_icons") {
     "network_ethernet.icon",
     "network_vpn.1x.icon",
     "network_vpn.icon",
+    "notification_accessibility_braille.icon",
     "notification_display_error.icon",
     "notification_feedback_button.1x.icon",
     "notification_feedback_button.icon",
@@ -176,6 +177,10 @@ aggregate_vector_icons("ash_vector_icons") {
     "system_menu_update.icon",
     "system_menu_new_user.1x.icon",
     "system_menu_new_user.icon",
+    "system_menu_night_light_off.1x.icon",
+    "system_menu_night_light_off.icon",
+    "system_menu_night_light_on.1x.icon",
+    "system_menu_night_light_on.icon",
     "system_menu_usb.1x.icon",
     "system_menu_usb.icon",
     "system_menu_videocam.1x.icon",
@@ -204,14 +209,14 @@ aggregate_vector_icons("ash_vector_icons") {
     "system_tray_caps_lock.icon",
     "system_tray_cast.1x.icon",
     "system_tray_cast.icon",
+    "system_tray_night_light.1x.icon",
+    "system_tray_night_light.icon",
     "system_tray_recording.1x.icon",
     "system_tray_recording.icon",
     "system_tray_rotation_lock_auto.1x.icon",
     "system_tray_rotation_lock_auto.icon",
     "system_tray_rotation_lock_locked.1x.icon",
     "system_tray_rotation_lock_locked.icon",
-    "system_tray_screen_share.1x.icon",
-    "system_tray_screen_share.icon",
     "system_tray_tracing.1x.icon",
     "system_tray_tracing.icon",
     "system_tray_update.1x.icon",
@@ -240,11 +245,11 @@ aggregate_vector_icons("ash_vector_icons") {
 
 source_set("vector_icons") {
   sources = get_target_outputs(":ash_vector_icons")
-  sources += [ "//ui/gfx/vector_icon_types.h" ]
 
   deps = [
     ":ash_vector_icons",
     "//base",
     "//skia",
+    "//ui/gfx",
   ]
 }
diff --git a/chromium/ash/test/BUILD.gn b/chromium/ash/test/BUILD.gn
index c8e5c50e460..caa015f49f8 100644
--- a/chromium/ash/test/BUILD.gn
+++ b/chromium/ash/test/BUILD.gn
@@ -54,26 +54,15 @@ static_library("test_support_common") {
     "../laser/laser_pointer_controller_test_api.h",
     "../laser/laser_pointer_points_test_api.cc",
     "../laser/laser_pointer_points_test_api.h",
-    "../mus/test/ash_test_impl_mus.cc",
-    "../mus/test/ash_test_impl_mus.h",
-    "../mus/test/wm_test_base.cc",
-    "../mus/test/wm_test_base.h",
-    "../mus/test/wm_test_helper.cc",
-    "../mus/test/wm_test_helper.h",
     "../rotator/test/screen_rotation_animator_test_api.cc",
     "../rotator/test/screen_rotation_animator_test_api.h",
     "../shell/toplevel_window.cc",
     "../shell/toplevel_window.h",
-    "ash_test.cc",
-    "ash_test.h",
     "ash_test_base.cc",
     "ash_test_base.h",
     "ash_test_environment.h",
     "ash_test_helper.cc",
     "ash_test_helper.h",
-    "ash_test_impl.h",
-    "ash_test_impl_aura.cc",
-    "ash_test_impl_aura.h",
     "ash_test_views_delegate.cc",
     "ash_test_views_delegate.h",
     "child_modal_window.cc",
@@ -104,6 +93,8 @@ static_library("test_support_common") {
     "status_area_widget_test_helper.h",
     "task_switch_time_tracker_test_api.cc",
     "task_switch_time_tracker_test_api.h",
+    "test_accessibility_delegate.cc",
+    "test_accessibility_delegate.h",
     "test_activation_delegate.cc",
     "test_activation_delegate.h",
     "test_app_list_view_presenter_impl.cc",
@@ -122,10 +113,6 @@ static_library("test_support_common") {
     "test_session_state_animator.h",
     "test_session_state_delegate.cc",
     "test_session_state_delegate.h",
-    "test_shelf_delegate.cc",
-    "test_shelf_delegate.h",
-    "test_shelf_item_delegate.cc",
-    "test_shelf_item_delegate.h",
     "test_shell_delegate.cc",
     "test_shell_delegate.h",
     "test_system_tray_delegate.cc",
@@ -142,8 +129,8 @@ static_library("test_support_common") {
     "user_metrics_recorder_test_api.h",
     "wallpaper_controller_test_api.cc",
     "wallpaper_controller_test_api.h",
-    "wm_window_test_api.cc",
-    "wm_window_test_api.h",
+    "workspace_controller_test_api.cc",
+    "workspace_controller_test_api.h",
     "workspace_event_handler_test_helper.cc",
     "workspace_event_handler_test_helper.h",
   ]
@@ -164,9 +151,11 @@ static_library("test_support_common") {
     "//base:i18n",
     "//base/test:test_support",
     "//chromeos",
+    "//components/prefs:test_support",
     "//components/signin/core/account_id",
     "//components/user_manager:user_manager",
     "//device/bluetooth",
+    "//services/ui/public/cpp/input_devices",
     "//services/ui/public/interfaces",
     "//skia",
     "//testing/gtest",
diff --git a/chromium/ash/touch_hud/mus/BUILD.gn b/chromium/ash/touch_hud/mus/BUILD.gn
index c8e4745984d..8c82e8df51b 100644
--- a/chromium/ash/touch_hud/mus/BUILD.gn
+++ b/chromium/ash/touch_hud/mus/BUILD.gn
@@ -21,7 +21,6 @@ source_set("lib") {
     "//mojo/common",
     "//mojo/public/cpp/bindings",
     "//services/service_manager/public/cpp",
-    "//services/service_manager/public/cpp:sources",
     "//services/ui/public/cpp",
     "//services/ui/public/interfaces",
     "//ui/views",
@@ -43,7 +42,6 @@ service("touch_hud") {
     "//base",
     "//mojo/public/cpp/bindings",
     "//services/service_manager/public/cpp",
-    "//services/service_manager/public/cpp:sources",
     "//ui/views/mus:for_mojo_application",
   ]