BASELINE: Update Chromium to 59.0.3071.134

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

1 files changed, 675 insertions, 660 deletions

diff --git a/chromium/ash/BUILD.gn b/chromium/ash/BUILD.gn
index b413405e443..7fd1372aa3b 100644
--- a/chromium/ash/BUILD.gn
+++ b/chromium/ash/BUILD.gn
@@ -15,18 +15,35 @@ assert(enable_hidpi)
 
 component("ash") {
   sources = [
+    "accelerators/accelerator_commands.cc",
+    "accelerators/accelerator_commands.h",
     "accelerators/accelerator_commands_aura.cc",
     "accelerators/accelerator_commands_aura.h",
+    "accelerators/accelerator_controller.cc",
+    "accelerators/accelerator_controller.h",
+    "accelerators/accelerator_controller_delegate.h",
     "accelerators/accelerator_controller_delegate_aura.cc",
     "accelerators/accelerator_controller_delegate_aura.h",
     "accelerators/accelerator_delegate.cc",
     "accelerators/accelerator_delegate.h",
+    "accelerators/accelerator_router.cc",
+    "accelerators/accelerator_router.h",
+    "accelerators/accelerator_table.cc",
+    "accelerators/accelerator_table.h",
+    "accelerators/ash_focus_manager_factory.cc",
+    "accelerators/ash_focus_manager_factory.h",
+    "accelerators/debug_commands.cc",
+    "accelerators/debug_commands.h",
+    "accelerators/exit_warning_handler.cc",
+    "accelerators/exit_warning_handler.h",
     "accelerators/key_hold_detector.cc",
     "accelerators/key_hold_detector.h",
     "accelerators/magnifier_key_scroller.cc",
     "accelerators/magnifier_key_scroller.h",
     "accelerators/spoken_feedback_toggler.cc",
     "accelerators/spoken_feedback_toggler.h",
+    "accessibility_delegate.h",
+    "accessibility_types.h",
     "animation/animation_change_type.h",
     "app_list/app_list_delegate_impl.cc",
     "app_list/app_list_delegate_impl.h",
@@ -34,569 +51,40 @@ component("ash") {
     "app_list/app_list_presenter_delegate.h",
     "app_list/app_list_presenter_delegate_factory.cc",
     "app_list/app_list_presenter_delegate_factory.h",
+    "ash_constants.cc",
+    "ash_constants.h",
     "ash_export.h",
+    "ash_layout_constants.cc",
+    "ash_layout_constants.h",
+    "ash_switches.cc",
+    "ash_switches.h",
     "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",
     "aura/pointer_watcher_adapter.h",
-    "aura/wm_lookup_aura.cc",
-    "aura/wm_lookup_aura.h",
-    "aura/wm_shell_aura.cc",
-    "aura/wm_shell_aura.h",
+    "aura/shell_port_classic.cc",
+    "aura/shell_port_classic.h",
     "autoclick/autoclick_controller.cc",
     "autoclick/autoclick_controller.h",
     "cancel_mode.cc",
     "cancel_mode.h",
-    "common/accelerators/accelerator_commands.cc",
-    "common/accelerators/accelerator_commands.h",
-    "common/accelerators/accelerator_controller.cc",
-    "common/accelerators/accelerator_controller.h",
-    "common/accelerators/accelerator_controller_delegate.h",
-    "common/accelerators/accelerator_router.cc",
-    "common/accelerators/accelerator_router.h",
-    "common/accelerators/accelerator_table.cc",
-    "common/accelerators/accelerator_table.h",
-    "common/accelerators/ash_focus_manager_factory.cc",
-    "common/accelerators/ash_focus_manager_factory.h",
-    "common/accelerators/debug_commands.cc",
-    "common/accelerators/debug_commands.h",
-    "common/accelerators/exit_warning_handler.cc",
-    "common/accelerators/exit_warning_handler.h",
-    "common/accessibility_delegate.h",
-    "common/accessibility_types.h",
-    "common/ash_constants.cc",
-    "common/ash_constants.h",
-    "common/ash_layout_constants.cc",
-    "common/ash_layout_constants.h",
-    "common/ash_switches.cc",
-    "common/ash_switches.h",
-    "common/cast_config_controller.cc",
-    "common/cast_config_controller.h",
-    "common/default_accessibility_delegate.cc",
-    "common/default_accessibility_delegate.h",
-    "common/devtools/ash_devtools_css_agent.cc",
-    "common/devtools/ash_devtools_css_agent.h",
-    "common/devtools/ash_devtools_dom_agent.cc",
-    "common/devtools/ash_devtools_dom_agent.h",
-    "common/drag_drop/drag_image_view.cc",
-    "common/drag_drop/drag_image_view.h",
-    "common/focus_cycler.cc",
-    "common/focus_cycler.h",
-    "common/frame/caption_buttons/caption_button_types.h",
-    "common/frame/caption_buttons/frame_caption_button.cc",
-    "common/frame/caption_buttons/frame_caption_button.h",
-    "common/frame/caption_buttons/frame_caption_button_container_view.cc",
-    "common/frame/caption_buttons/frame_caption_button_container_view.h",
-    "common/frame/caption_buttons/frame_size_button.cc",
-    "common/frame/caption_buttons/frame_size_button.h",
-    "common/frame/caption_buttons/frame_size_button_delegate.h",
-    "common/frame/custom_frame_view_ash.cc",
-    "common/frame/custom_frame_view_ash.h",
-    "common/frame/default_header_painter.cc",
-    "common/frame/default_header_painter.h",
-    "common/frame/frame_border_hit_test.cc",
-    "common/frame/frame_border_hit_test.h",
-    "common/frame/header_painter.h",
-    "common/frame/header_painter_util.cc",
-    "common/frame/header_painter_util.h",
-    "common/frame/header_view.cc",
-    "common/frame/header_view.h",
-    "common/gpu_support.h",
-    "common/gpu_support_stub.cc",
-    "common/gpu_support_stub.h",
-    "common/key_event_watcher.cc",
-    "common/key_event_watcher.h",
-    "common/keyboard/keyboard_ui.cc",
-    "common/keyboard/keyboard_ui.h",
-    "common/keyboard/keyboard_ui_observer.h",
-    "common/login_status.h",
-    "common/material_design/material_design_controller.cc",
-    "common/material_design/material_design_controller.h",
-    "common/media_controller.cc",
-    "common/media_controller.h",
-    "common/metrics/gesture_action_type.h",
-    "common/metrics/pointer_metrics_recorder.cc",
-    "common/metrics/pointer_metrics_recorder.h",
-    "common/metrics/user_metrics_action.h",
-    "common/mojo_interface_factory.cc",
-    "common/mojo_interface_factory.h",
-    "common/multi_profile_uma.cc",
-    "common/multi_profile_uma.h",
-    "common/new_window_controller.cc",
-    "common/new_window_controller.h",
-    "common/palette_delegate.h",
-    "common/scoped_root_window_for_new_windows.cc",
-    "common/scoped_root_window_for_new_windows.h",
-    "common/session/session_controller.cc",
-    "common/session/session_controller.h",
-    "common/session/session_state_delegate.cc",
-    "common/session/session_state_delegate.h",
-    "common/session/session_state_observer.cc",
-    "common/session/session_state_observer.h",
-    "common/shelf/app_list_button.cc",
-    "common/shelf/app_list_button.h",
-    "common/shelf/app_list_shelf_item_delegate.cc",
-    "common/shelf/app_list_shelf_item_delegate.h",
-    "common/shelf/ink_drop_button_listener.h",
-    "common/shelf/overflow_bubble.cc",
-    "common/shelf/overflow_bubble.h",
-    "common/shelf/overflow_bubble_view.cc",
-    "common/shelf/overflow_bubble_view.h",
-    "common/shelf/overflow_button.cc",
-    "common/shelf/overflow_button.h",
-    "common/shelf/shelf_alignment_menu.cc",
-    "common/shelf/shelf_alignment_menu.h",
-    "common/shelf/shelf_application_menu_model.cc",
-    "common/shelf/shelf_application_menu_model.h",
-    "common/shelf/shelf_background_animator.cc",
-    "common/shelf/shelf_background_animator.h",
-    "common/shelf/shelf_background_animator_observer.h",
-    "common/shelf/shelf_button.cc",
-    "common/shelf/shelf_button.h",
-    "common/shelf/shelf_button_pressed_metric_tracker.cc",
-    "common/shelf/shelf_button_pressed_metric_tracker.h",
-    "common/shelf/shelf_constants.cc",
-    "common/shelf/shelf_constants.h",
-    "common/shelf/shelf_controller.cc",
-    "common/shelf/shelf_controller.h",
-    "common/shelf/shelf_delegate.h",
-    "common/shelf/shelf_item_delegate.cc",
-    "common/shelf/shelf_item_delegate.h",
-    "common/shelf/shelf_item_types.cc",
-    "common/shelf/shelf_item_types.h",
-    "common/shelf/shelf_layout_manager.cc",
-    "common/shelf/shelf_layout_manager.h",
-    "common/shelf/shelf_layout_manager_observer.h",
-    "common/shelf/shelf_locking_manager.cc",
-    "common/shelf/shelf_locking_manager.h",
-    "common/shelf/shelf_model.cc",
-    "common/shelf/shelf_model.h",
-    "common/shelf/shelf_model_observer.h",
-    "common/shelf/shelf_tooltip_manager.cc",
-    "common/shelf/shelf_tooltip_manager.h",
-    "common/shelf/shelf_view.cc",
-    "common/shelf/shelf_view.h",
-    "common/shelf/shelf_widget.cc",
-    "common/shelf/shelf_widget.h",
-    "common/shelf/shelf_window_watcher.cc",
-    "common/shelf/shelf_window_watcher.h",
-    "common/shelf/shelf_window_watcher_item_delegate.cc",
-    "common/shelf/shelf_window_watcher_item_delegate.h",
-    "common/shelf/wm_shelf.cc",
-    "common/shelf/wm_shelf.h",
-    "common/shelf/wm_shelf_observer.h",
-    "common/shelf/wm_shelf_util.cc",
-    "common/shelf/wm_shelf_util.h",
-    "common/shell_delegate.h",
-    "common/shutdown_controller.cc",
-    "common/shutdown_controller.h",
-    "common/system/accessibility_observer.h",
-    "common/system/brightness_control_delegate.h",
-    "common/system/chromeos/audio/audio_detailed_view.cc",
-    "common/system/chromeos/audio/audio_detailed_view.h",
-    "common/system/chromeos/audio/tray_audio.cc",
-    "common/system/chromeos/audio/tray_audio.h",
-    "common/system/chromeos/audio/tray_audio_delegate.h",
-    "common/system/chromeos/audio/tray_audio_delegate_chromeos.cc",
-    "common/system/chromeos/audio/tray_audio_delegate_chromeos.h",
-    "common/system/chromeos/audio/volume_view.cc",
-    "common/system/chromeos/audio/volume_view.h",
-    "common/system/chromeos/bluetooth/bluetooth_notification_controller.cc",
-    "common/system/chromeos/bluetooth/bluetooth_notification_controller.h",
-    "common/system/chromeos/bluetooth/bluetooth_observer.h",
-    "common/system/chromeos/bluetooth/tray_bluetooth.cc",
-    "common/system/chromeos/bluetooth/tray_bluetooth.h",
-    "common/system/chromeos/brightness/brightness_controller_chromeos.cc",
-    "common/system/chromeos/brightness/brightness_controller_chromeos.h",
-    "common/system/chromeos/brightness/tray_brightness.cc",
-    "common/system/chromeos/brightness/tray_brightness.h",
-    "common/system/chromeos/cast/tray_cast.cc",
-    "common/system/chromeos/cast/tray_cast.h",
-    "common/system/chromeos/devicetype_utils.cc",
-    "common/system/chromeos/devicetype_utils.h",
-    "common/system/chromeos/enterprise/enterprise_domain_observer.h",
-    "common/system/chromeos/enterprise/tray_enterprise.cc",
-    "common/system/chromeos/enterprise/tray_enterprise.h",
-    "common/system/chromeos/ime_menu/ime_list_view.cc",
-    "common/system/chromeos/ime_menu/ime_list_view.h",
-    "common/system/chromeos/ime_menu/ime_menu_tray.cc",
-    "common/system/chromeos/ime_menu/ime_menu_tray.h",
-    "common/system/chromeos/keyboard_brightness_controller.cc",
-    "common/system/chromeos/keyboard_brightness_controller.h",
-    "common/system/chromeos/media_security/multi_profile_media_tray_item.cc",
-    "common/system/chromeos/media_security/multi_profile_media_tray_item.h",
-    "common/system/chromeos/network/network_detailed_view.h",
-    "common/system/chromeos/network/network_icon.cc",
-    "common/system/chromeos/network/network_icon.h",
-    "common/system/chromeos/network/network_icon_animation.cc",
-    "common/system/chromeos/network/network_icon_animation.h",
-    "common/system/chromeos/network/network_icon_animation_observer.h",
-    "common/system/chromeos/network/network_info.cc",
-    "common/system/chromeos/network/network_info.h",
-    "common/system/chromeos/network/network_list.cc",
-    "common/system/chromeos/network/network_list.h",
-    "common/system/chromeos/network/network_list_delegate.h",
-    "common/system/chromeos/network/network_list_md.cc",
-    "common/system/chromeos/network/network_list_md.h",
-    "common/system/chromeos/network/network_list_view_base.cc",
-    "common/system/chromeos/network/network_list_view_base.h",
-    "common/system/chromeos/network/network_observer.h",
-    "common/system/chromeos/network/network_portal_detector_observer.h",
-    "common/system/chromeos/network/network_state_list_detailed_view.cc",
-    "common/system/chromeos/network/network_state_list_detailed_view.h",
-    "common/system/chromeos/network/sms_observer.cc",
-    "common/system/chromeos/network/sms_observer.h",
-    "common/system/chromeos/network/tray_network.cc",
-    "common/system/chromeos/network/tray_network.h",
-    "common/system/chromeos/network/tray_network_state_observer.cc",
-    "common/system/chromeos/network/tray_network_state_observer.h",
-    "common/system/chromeos/network/tray_vpn.cc",
-    "common/system/chromeos/network/tray_vpn.h",
-    "common/system/chromeos/network/vpn_list.cc",
-    "common/system/chromeos/network/vpn_list.h",
-    "common/system/chromeos/network/vpn_list_view.cc",
-    "common/system/chromeos/network/vpn_list_view.h",
-    "common/system/chromeos/palette/common_palette_tool.cc",
-    "common/system/chromeos/palette/common_palette_tool.h",
-    "common/system/chromeos/palette/palette_ids.cc",
-    "common/system/chromeos/palette/palette_ids.h",
-    "common/system/chromeos/palette/palette_tool.cc",
-    "common/system/chromeos/palette/palette_tool.h",
-    "common/system/chromeos/palette/palette_tool_manager.cc",
-    "common/system/chromeos/palette/palette_tool_manager.h",
-    "common/system/chromeos/palette/palette_tray.cc",
-    "common/system/chromeos/palette/palette_tray.h",
-    "common/system/chromeos/palette/palette_utils.cc",
-    "common/system/chromeos/palette/palette_utils.h",
-    "common/system/chromeos/palette/tools/capture_region_mode.cc",
-    "common/system/chromeos/palette/tools/capture_region_mode.h",
-    "common/system/chromeos/palette/tools/capture_screen_action.cc",
-    "common/system/chromeos/palette/tools/capture_screen_action.h",
-    "common/system/chromeos/palette/tools/create_note_action.cc",
-    "common/system/chromeos/palette/tools/create_note_action.h",
-    "common/system/chromeos/palette/tools/laser_pointer_mode.cc",
-    "common/system/chromeos/palette/tools/laser_pointer_mode.h",
-    "common/system/chromeos/palette/tools/magnifier_mode.cc",
-    "common/system/chromeos/palette/tools/magnifier_mode.h",
-    "common/system/chromeos/power/battery_notification.cc",
-    "common/system/chromeos/power/battery_notification.h",
-    "common/system/chromeos/power/dual_role_notification.cc",
-    "common/system/chromeos/power/dual_role_notification.h",
-    "common/system/chromeos/power/power_status.cc",
-    "common/system/chromeos/power/power_status.h",
-    "common/system/chromeos/power/power_status_view.cc",
-    "common/system/chromeos/power/power_status_view.h",
-    "common/system/chromeos/power/tray_power.cc",
-    "common/system/chromeos/power/tray_power.h",
-    "common/system/chromeos/screen_security/screen_capture_observer.h",
-    "common/system/chromeos/screen_security/screen_capture_tray_item.cc",
-    "common/system/chromeos/screen_security/screen_capture_tray_item.h",
-    "common/system/chromeos/screen_security/screen_share_observer.h",
-    "common/system/chromeos/screen_security/screen_share_tray_item.cc",
-    "common/system/chromeos/screen_security/screen_share_tray_item.h",
-    "common/system/chromeos/screen_security/screen_tray_item.cc",
-    "common/system/chromeos/screen_security/screen_tray_item.h",
-    "common/system/chromeos/session/last_window_closed_observer.h",
-    "common/system/chromeos/session/logout_button_observer.h",
-    "common/system/chromeos/session/logout_button_tray.cc",
-    "common/system/chromeos/session/logout_button_tray.h",
-    "common/system/chromeos/session/logout_confirmation_controller.cc",
-    "common/system/chromeos/session/logout_confirmation_controller.h",
-    "common/system/chromeos/session/logout_confirmation_dialog.cc",
-    "common/system/chromeos/session/logout_confirmation_dialog.h",
-    "common/system/chromeos/session/session_length_limit_observer.h",
-    "common/system/chromeos/session/tray_session_length_limit.cc",
-    "common/system/chromeos/session/tray_session_length_limit.h",
-    "common/system/chromeos/settings/tray_settings.cc",
-    "common/system/chromeos/settings/tray_settings.h",
-    "common/system/chromeos/supervised/custodian_info_tray_observer.h",
-    "common/system/chromeos/supervised/tray_supervised_user.cc",
-    "common/system/chromeos/supervised/tray_supervised_user.h",
-    "common/system/chromeos/system_clock_observer.cc",
-    "common/system/chromeos/system_clock_observer.h",
-    "common/system/chromeos/tray_caps_lock.cc",
-    "common/system/chromeos/tray_caps_lock.h",
-    "common/system/chromeos/tray_tracing.cc",
-    "common/system/chromeos/tray_tracing.h",
-    "common/system/chromeos/virtual_keyboard/virtual_keyboard_observer.h",
-    "common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc",
-    "common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h",
-    "common/system/date/clock_observer.h",
-    "common/system/date/date_default_view.cc",
-    "common/system/date/date_default_view.h",
-    "common/system/date/date_view.cc",
-    "common/system/date/date_view.h",
-    "common/system/date/system_info_default_view.cc",
-    "common/system/date/system_info_default_view.h",
-    "common/system/date/tray_date.cc",
-    "common/system/date/tray_date.h",
-    "common/system/date/tray_system_info.cc",
-    "common/system/date/tray_system_info.h",
-    "common/system/ime/ime_observer.h",
-    "common/system/ime/tray_ime_chromeos.cc",
-    "common/system/ime/tray_ime_chromeos.h",
-    "common/system/keyboard_brightness_control_delegate.h",
-    "common/system/locale/locale_notification_controller.cc",
-    "common/system/locale/locale_notification_controller.h",
-    "common/system/networking_config_delegate.cc",
-    "common/system/networking_config_delegate.h",
-    "common/system/overview/overview_button_tray.cc",
-    "common/system/overview/overview_button_tray.h",
-    "common/system/status_area_layout_manager.cc",
-    "common/system/status_area_layout_manager.h",
-    "common/system/status_area_widget.cc",
-    "common/system/status_area_widget.h",
-    "common/system/status_area_widget_delegate.cc",
-    "common/system/status_area_widget_delegate.h",
-    "common/system/system_notifier.cc",
-    "common/system/system_notifier.h",
-    "common/system/tiles/tiles_default_view.cc",
-    "common/system/tiles/tiles_default_view.h",
-    "common/system/tiles/tray_tiles.cc",
-    "common/system/tiles/tray_tiles.h",
-    "common/system/toast/toast_data.cc",
-    "common/system/toast/toast_data.h",
-    "common/system/toast/toast_manager.cc",
-    "common/system/toast/toast_manager.h",
-    "common/system/toast/toast_overlay.cc",
-    "common/system/toast/toast_overlay.h",
-    "common/system/tray/actionable_view.cc",
-    "common/system/tray/actionable_view.h",
-    "common/system/tray/default_system_tray_delegate.cc",
-    "common/system/tray/default_system_tray_delegate.h",
-    "common/system/tray/fixed_sized_image_view.cc",
-    "common/system/tray/fixed_sized_image_view.h",
-    "common/system/tray/hover_highlight_view.cc",
-    "common/system/tray/hover_highlight_view.h",
-    "common/system/tray/ime_info.cc",
-    "common/system/tray/ime_info.h",
-    "common/system/tray/label_tray_view.cc",
-    "common/system/tray/label_tray_view.h",
-    "common/system/tray/size_range_layout.cc",
-    "common/system/tray/size_range_layout.h",
-    "common/system/tray/special_popup_row.cc",
-    "common/system/tray/special_popup_row.h",
-    "common/system/tray/system_menu_button.cc",
-    "common/system/tray/system_menu_button.h",
-    "common/system/tray/system_tray.cc",
-    "common/system/tray/system_tray.h",
-    "common/system/tray/system_tray_bubble.cc",
-    "common/system/tray/system_tray_bubble.h",
-    "common/system/tray/system_tray_controller.cc",
-    "common/system/tray/system_tray_controller.h",
-    "common/system/tray/system_tray_delegate.cc",
-    "common/system/tray/system_tray_delegate.h",
-    "common/system/tray/system_tray_item.cc",
-    "common/system/tray/system_tray_item.h",
-    "common/system/tray/system_tray_notifier.cc",
-    "common/system/tray/system_tray_notifier.h",
-    "common/system/tray/throbber_view.cc",
-    "common/system/tray/throbber_view.h",
-    "common/system/tray/tray_background_view.cc",
-    "common/system/tray/tray_background_view.h",
-    "common/system/tray/tray_bubble_wrapper.cc",
-    "common/system/tray/tray_bubble_wrapper.h",
-    "common/system/tray/tray_constants.cc",
-    "common/system/tray/tray_constants.h",
-    "common/system/tray/tray_details_view.cc",
-    "common/system/tray/tray_details_view.h",
-    "common/system/tray/tray_event_filter.cc",
-    "common/system/tray/tray_event_filter.h",
-    "common/system/tray/tray_image_item.cc",
-    "common/system/tray/tray_image_item.h",
-    "common/system/tray/tray_item_more.cc",
-    "common/system/tray/tray_item_more.h",
-    "common/system/tray/tray_item_view.cc",
-    "common/system/tray/tray_item_view.h",
-    "common/system/tray/tray_notification_view.cc",
-    "common/system/tray/tray_notification_view.h",
-    "common/system/tray/tray_popup_header_button.cc",
-    "common/system/tray/tray_popup_header_button.h",
-    "common/system/tray/tray_popup_ink_drop_style.h",
-    "common/system/tray/tray_popup_item_container.cc",
-    "common/system/tray/tray_popup_item_container.h",
-    "common/system/tray/tray_popup_item_style.cc",
-    "common/system/tray/tray_popup_item_style.h",
-    "common/system/tray/tray_popup_utils.cc",
-    "common/system/tray/tray_popup_utils.h",
-    "common/system/tray/tray_utils.cc",
-    "common/system/tray/tray_utils.h",
-    "common/system/tray/tri_view.cc",
-    "common/system/tray/tri_view.h",
-    "common/system/tray/view_click_listener.h",
-    "common/system/tray_accessibility.cc",
-    "common/system/tray_accessibility.h",
-    "common/system/update/tray_update.cc",
-    "common/system/update/tray_update.h",
-    "common/system/user/button_from_view.cc",
-    "common/system/user/button_from_view.h",
-    "common/system/user/login_status.cc",
-    "common/system/user/login_status.h",
-    "common/system/user/rounded_image_view.cc",
-    "common/system/user/rounded_image_view.h",
-    "common/system/user/tray_user.cc",
-    "common/system/user/tray_user.h",
-    "common/system/user/user_card_view.cc",
-    "common/system/user/user_card_view.h",
-    "common/system/user/user_observer.h",
-    "common/system/user/user_view.cc",
-    "common/system/user/user_view.h",
-    "common/system/web_notification/ash_popup_alignment_delegate.cc",
-    "common/system/web_notification/ash_popup_alignment_delegate.h",
-    "common/system/web_notification/web_notification_tray.cc",
-    "common/system/web_notification/web_notification_tray.h",
-    "common/wallpaper/wallpaper_controller.cc",
-    "common/wallpaper/wallpaper_controller.h",
-    "common/wallpaper/wallpaper_controller_observer.h",
-    "common/wallpaper/wallpaper_delegate.h",
-    "common/wallpaper/wallpaper_view.cc",
-    "common/wallpaper/wallpaper_view.h",
-    "common/wallpaper/wallpaper_widget_controller.cc",
-    "common/wallpaper/wallpaper_widget_controller.h",
-    "common/wm/always_on_top_controller.cc",
-    "common/wm/always_on_top_controller.h",
-    "common/wm/container_finder.cc",
-    "common/wm/container_finder.h",
-    "common/wm/default_state.cc",
-    "common/wm/default_state.h",
-    "common/wm/default_window_resizer.cc",
-    "common/wm/default_window_resizer.h",
-    "common/wm/dock/docked_window_layout_manager.cc",
-    "common/wm/dock/docked_window_layout_manager.h",
-    "common/wm/dock/docked_window_layout_manager_observer.h",
-    "common/wm/dock/docked_window_resizer.cc",
-    "common/wm/dock/docked_window_resizer.h",
-    "common/wm/drag_details.cc",
-    "common/wm/drag_details.h",
-    "common/wm/focus_rules.cc",
-    "common/wm/focus_rules.h",
-    "common/wm/fullscreen_window_finder.cc",
-    "common/wm/fullscreen_window_finder.h",
-    "common/wm/immersive_context_ash.cc",
-    "common/wm/immersive_context_ash.h",
-    "common/wm/lock_layout_manager.cc",
-    "common/wm/lock_layout_manager.h",
-    "common/wm/lock_state_observer.h",
-    "common/wm/lock_window_state.cc",
-    "common/wm/lock_window_state.h",
-    "common/wm/maximize_mode/maximize_mode_controller.cc",
-    "common/wm/maximize_mode/maximize_mode_controller.h",
-    "common/wm/maximize_mode/maximize_mode_event_handler.cc",
-    "common/wm/maximize_mode/maximize_mode_event_handler.h",
-    "common/wm/maximize_mode/maximize_mode_window_manager.cc",
-    "common/wm/maximize_mode/maximize_mode_window_manager.h",
-    "common/wm/maximize_mode/maximize_mode_window_state.cc",
-    "common/wm/maximize_mode/maximize_mode_window_state.h",
-    "common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h",
-    "common/wm/maximize_mode/workspace_backdrop_delegate.cc",
-    "common/wm/maximize_mode/workspace_backdrop_delegate.h",
-    "common/wm/mru_window_tracker.cc",
-    "common/wm/mru_window_tracker.h",
-    "common/wm/overview/cleanup_animation_observer.cc",
-    "common/wm/overview/cleanup_animation_observer.h",
-    "common/wm/overview/overview_animation_type.h",
-    "common/wm/overview/scoped_overview_animation_settings.h",
-    "common/wm/overview/scoped_overview_animation_settings_factory.cc",
-    "common/wm/overview/scoped_overview_animation_settings_factory.h",
-    "common/wm/overview/scoped_transform_overview_window.cc",
-    "common/wm/overview/scoped_transform_overview_window.h",
-    "common/wm/overview/window_grid.cc",
-    "common/wm/overview/window_grid.h",
-    "common/wm/overview/window_selector.cc",
-    "common/wm/overview/window_selector.h",
-    "common/wm/overview/window_selector_controller.cc",
-    "common/wm/overview/window_selector_controller.h",
-    "common/wm/overview/window_selector_item.cc",
-    "common/wm/overview/window_selector_item.h",
-    "common/wm/panels/panel_frame_view.cc",
-    "common/wm/panels/panel_frame_view.h",
-    "common/wm/panels/panel_layout_manager.cc",
-    "common/wm/panels/panel_layout_manager.h",
-    "common/wm/panels/panel_window_resizer.cc",
-    "common/wm/panels/panel_window_resizer.h",
-    "common/wm/root_window_finder.cc",
-    "common/wm/root_window_finder.h",
-    "common/wm/root_window_layout_manager.cc",
-    "common/wm/root_window_layout_manager.h",
-    "common/wm/screen_dimmer.cc",
-    "common/wm/screen_dimmer.h",
-    "common/wm/switchable_windows.cc",
-    "common/wm/switchable_windows.h",
-    "common/wm/system_modal_container_layout_manager.cc",
-    "common/wm/system_modal_container_layout_manager.h",
-    "common/wm/window_animation_types.h",
-    "common/wm/window_cycle_controller.cc",
-    "common/wm/window_cycle_controller.h",
-    "common/wm/window_cycle_event_filter.h",
-    "common/wm/window_cycle_list.cc",
-    "common/wm/window_cycle_list.h",
-    "common/wm/window_dimmer.cc",
-    "common/wm/window_dimmer.h",
-    "common/wm/window_parenting_utils.cc",
-    "common/wm/window_parenting_utils.h",
-    "common/wm/window_positioner.cc",
-    "common/wm/window_positioner.h",
-    "common/wm/window_positioning_utils.cc",
-    "common/wm/window_positioning_utils.h",
-    "common/wm/window_resizer.cc",
-    "common/wm/window_resizer.h",
-    "common/wm/window_state.cc",
-    "common/wm/window_state.h",
-    "common/wm/window_state_delegate.cc",
-    "common/wm/window_state_delegate.h",
-    "common/wm/window_state_observer.h",
-    "common/wm/window_state_util.cc",
-    "common/wm/window_state_util.h",
-    "common/wm/wm_event.cc",
-    "common/wm/wm_event.h",
-    "common/wm/wm_screen_util.cc",
-    "common/wm/wm_screen_util.h",
-    "common/wm/wm_snap_to_pixel_layout_manager.cc",
-    "common/wm/wm_snap_to_pixel_layout_manager.h",
-    "common/wm/wm_toplevel_window_event_handler.cc",
-    "common/wm/wm_toplevel_window_event_handler.h",
-    "common/wm/wm_types.cc",
-    "common/wm/wm_types.h",
-    "common/wm/wm_window_animations.cc",
-    "common/wm/wm_window_animations.h",
-    "common/wm/workspace/magnetism_matcher.cc",
-    "common/wm/workspace/magnetism_matcher.h",
-    "common/wm/workspace/multi_window_resize_controller.cc",
-    "common/wm/workspace/multi_window_resize_controller.h",
-    "common/wm/workspace/phantom_window_controller.cc",
-    "common/wm/workspace/phantom_window_controller.h",
-    "common/wm/workspace/two_step_edge_cycler.cc",
-    "common/wm/workspace/two_step_edge_cycler.h",
-    "common/wm/workspace/workspace_event_handler.cc",
-    "common/wm/workspace/workspace_event_handler.h",
-    "common/wm/workspace/workspace_layout_manager.cc",
-    "common/wm/workspace/workspace_layout_manager.h",
-    "common/wm/workspace/workspace_layout_manager_backdrop_delegate.h",
-    "common/wm/workspace/workspace_types.h",
-    "common/wm/workspace/workspace_window_resizer.cc",
-    "common/wm/workspace/workspace_window_resizer.h",
-    "common/wm/workspace_controller.cc",
-    "common/wm/workspace_controller.h",
-    "common/wm_activation_observer.h",
-    "common/wm_display_observer.h",
-    "common/wm_layout_manager.h",
-    "common/wm_lookup.cc",
-    "common/wm_lookup.h",
-    "common/wm_shell.cc",
-    "common/wm_shell.h",
-    "common/wm_transient_window_observer.h",
-    "common/wm_window.cc",
-    "common/wm_window.h",
-    "common/wm_window_property.h",
-    "common/wm_window_user_data.h",
+    "cast_config_controller.cc",
+    "cast_config_controller.h",
     "debug.cc",
     "debug.h",
+    "default_accessibility_delegate.cc",
+    "default_accessibility_delegate.h",
     "default_wallpaper_delegate.cc",
     "default_wallpaper_delegate.h",
+    "devtools/ash_devtools_css_agent.cc",
+    "devtools/ash_devtools_css_agent.h",
+    "devtools/ash_devtools_dom_agent.cc",
+    "devtools/ash_devtools_dom_agent.h",
     "display/cursor_window_controller.cc",
     "display/cursor_window_controller.h",
     "display/display_animator.h",
@@ -608,15 +96,12 @@ component("ash") {
     "display/display_configuration_controller.h",
     "display/display_error_observer_chromeos.cc",
     "display/display_error_observer_chromeos.h",
-    "display/display_pref_util.h",
     "display/display_util.cc",
     "display/display_util.h",
     "display/event_transformation_handler.cc",
     "display/event_transformation_handler.h",
     "display/extended_mouse_warp_controller.cc",
     "display/extended_mouse_warp_controller.h",
-    "display/json_converter.cc",
-    "display/json_converter.h",
     "display/mirror_window_controller.cc",
     "display/mirror_window_controller.h",
     "display/mouse_cursor_event_filter.cc",
@@ -648,12 +133,38 @@ component("ash") {
     "drag_drop/drag_drop_controller.h",
     "drag_drop/drag_drop_tracker.cc",
     "drag_drop/drag_drop_tracker.h",
+    "drag_drop/drag_image_view.cc",
+    "drag_drop/drag_image_view.h",
     "first_run/desktop_cleaner.cc",
     "first_run/desktop_cleaner.h",
     "first_run/first_run_helper.cc",
     "first_run/first_run_helper.h",
     "first_run/first_run_helper_impl.cc",
     "first_run/first_run_helper_impl.h",
+    "focus_cycler.cc",
+    "focus_cycler.h",
+    "frame/caption_buttons/caption_button_types.h",
+    "frame/caption_buttons/frame_caption_button.cc",
+    "frame/caption_buttons/frame_caption_button.h",
+    "frame/caption_buttons/frame_caption_button_container_view.cc",
+    "frame/caption_buttons/frame_caption_button_container_view.h",
+    "frame/caption_buttons/frame_size_button.cc",
+    "frame/caption_buttons/frame_size_button.h",
+    "frame/caption_buttons/frame_size_button_delegate.h",
+    "frame/custom_frame_view_ash.cc",
+    "frame/custom_frame_view_ash.h",
+    "frame/default_header_painter.cc",
+    "frame/default_header_painter.h",
+    "frame/frame_border_hit_test.cc",
+    "frame/frame_border_hit_test.h",
+    "frame/header_painter.h",
+    "frame/header_painter_util.cc",
+    "frame/header_painter_util.h",
+    "frame/header_view.cc",
+    "frame/header_view.h",
+    "gpu_support.h",
+    "gpu_support_stub.cc",
+    "gpu_support_stub.h",
     "high_contrast/high_contrast_controller.cc",
     "high_contrast/high_contrast_controller.h",
     "host/ash_window_tree_host.cc",
@@ -670,6 +181,14 @@ component("ash") {
     "host/transformer_helper.h",
     "ime/input_method_event_handler.cc",
     "ime/input_method_event_handler.h",
+    "ime_control_delegate.h",
+    "key_event_watcher.cc",
+    "key_event_watcher.h",
+    "keyboard/keyboard_observer_register.cc",
+    "keyboard/keyboard_observer_register.h",
+    "keyboard/keyboard_ui.cc",
+    "keyboard/keyboard_ui.h",
+    "keyboard/keyboard_ui_observer.h",
     "laser/laser_pointer_controller.cc",
     "laser/laser_pointer_controller.h",
     "laser/laser_pointer_points.cc",
@@ -682,18 +201,35 @@ component("ash") {
     "link_handler_model.h",
     "link_handler_model_factory.cc",
     "link_handler_model_factory.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",
     "metrics/desktop_task_switch_metric_recorder.h",
+    "metrics/gesture_action_type.h",
+    "metrics/pointer_metrics_recorder.cc",
+    "metrics/pointer_metrics_recorder.h",
     "metrics/task_switch_metrics_recorder.cc",
     "metrics/task_switch_metrics_recorder.h",
+    "metrics/task_switch_source.h",
     "metrics/task_switch_time_tracker.cc",
     "metrics/task_switch_time_tracker.h",
+    "metrics/user_metrics_action.h",
     "metrics/user_metrics_recorder.cc",
     "metrics/user_metrics_recorder.h",
+    "mojo_interface_factory.cc",
+    "mojo_interface_factory.h",
+    "multi_profile_uma.cc",
+    "multi_profile_uma.h",
+    "new_window_controller.cc",
+    "new_window_controller.h",
+    "palette_delegate.h",
     "root_window_controller.cc",
     "root_window_controller.h",
     "root_window_settings.cc",
@@ -702,11 +238,19 @@ component("ash") {
     "rotator/screen_rotation_animation.h",
     "rotator/screen_rotation_animator.cc",
     "rotator/screen_rotation_animator.h",
+    "rotator/screen_rotation_animator_observer.h",
     "rotator/window_rotation.cc",
     "rotator/window_rotation.h",
+    "scoped_root_window_for_new_windows.cc",
+    "scoped_root_window_for_new_windows.h",
     "screen_util.cc",
     "screen_util.h",
     "screenshot_delegate.h",
+    "session/session_controller.cc",
+    "session/session_controller.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",
@@ -718,28 +262,323 @@ component("ash") {
     "shared/immersive_handler_factory.h",
     "shared/immersive_revealed_lock.cc",
     "shared/immersive_revealed_lock.h",
+    "shelf/app_list_button.cc",
+    "shelf/app_list_button.h",
+    "shelf/app_list_shelf_item_delegate.cc",
+    "shelf/app_list_shelf_item_delegate.h",
+    "shelf/ink_drop_button_listener.h",
+    "shelf/overflow_bubble.cc",
+    "shelf/overflow_bubble.h",
+    "shelf/overflow_bubble_view.cc",
+    "shelf/overflow_bubble_view.h",
+    "shelf/overflow_button.cc",
+    "shelf/overflow_button.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",
+    "shelf/shelf_background_animator.h",
+    "shelf/shelf_background_animator_observer.h",
     "shelf/shelf_bezel_event_handler.cc",
     "shelf/shelf_bezel_event_handler.h",
+    "shelf/shelf_button.cc",
+    "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",
+    "shelf/shelf_locking_manager.cc",
+    "shelf/shelf_locking_manager.h",
+    "shelf/shelf_model.cc",
+    "shelf/shelf_model.h",
+    "shelf/shelf_model_observer.h",
+    "shelf/shelf_tooltip_manager.cc",
+    "shelf/shelf_tooltip_manager.h",
+    "shelf/shelf_view.cc",
+    "shelf/shelf_view.h",
+    "shelf/shelf_widget.cc",
+    "shelf/shelf_widget.h",
     "shelf/shelf_window_targeter.cc",
     "shelf/shelf_window_targeter.h",
+    "shelf/shelf_window_watcher.cc",
+    "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",
     "shell_init_params.h",
+    "shell_observer.h",
+    "shell_port.cc",
+    "shell_port.h",
+    "shutdown_controller.cc",
+    "shutdown_controller.h",
     "sticky_keys/sticky_keys_controller.cc",
     "sticky_keys/sticky_keys_controller.h",
     "sticky_keys/sticky_keys_overlay.cc",
     "sticky_keys/sticky_keys_overlay.h",
     "sticky_keys/sticky_keys_state.h",
-    "system/chromeos/power/power_event_observer.cc",
-    "system/chromeos/power/power_event_observer.h",
-    "system/chromeos/power/tablet_power_button_controller.cc",
-    "system/chromeos/power/tablet_power_button_controller.h",
-    "system/chromeos/power/video_activity_notifier.cc",
-    "system/chromeos/power/video_activity_notifier.h",
-    "system/chromeos/rotation/tray_rotation_lock.cc",
-    "system/chromeos/rotation/tray_rotation_lock.h",
-    "system/chromeos/screen_layout_observer.cc",
-    "system/chromeos/screen_layout_observer.h",
+    "system/accessibility_observer.h",
+    "system/audio/audio_detailed_view.cc",
+    "system/audio/audio_detailed_view.h",
+    "system/audio/tray_audio.cc",
+    "system/audio/tray_audio.h",
+    "system/audio/volume_view.cc",
+    "system/audio/volume_view.h",
+    "system/bluetooth/bluetooth_notification_controller.cc",
+    "system/bluetooth/bluetooth_notification_controller.h",
+    "system/bluetooth/bluetooth_observer.h",
+    "system/bluetooth/tray_bluetooth.cc",
+    "system/bluetooth/tray_bluetooth.h",
+    "system/bluetooth/tray_bluetooth_helper.cc",
+    "system/bluetooth/tray_bluetooth_helper.h",
+    "system/brightness/brightness_controller_chromeos.cc",
+    "system/brightness/brightness_controller_chromeos.h",
+    "system/brightness/tray_brightness.cc",
+    "system/brightness/tray_brightness.h",
+    "system/brightness_control_delegate.h",
+    "system/cast/tray_cast.cc",
+    "system/cast/tray_cast.h",
+    "system/date/clock_observer.h",
+    "system/date/date_view.cc",
+    "system/date/date_view.h",
+    "system/date/system_info_default_view.cc",
+    "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/enterprise/enterprise_domain_observer.h",
+    "system/enterprise/tray_enterprise.cc",
+    "system/enterprise/tray_enterprise.h",
+    "system/ime/ime_observer.h",
+    "system/ime/tray_ime_chromeos.cc",
+    "system/ime/tray_ime_chromeos.h",
+    "system/ime_menu/ime_list_view.cc",
+    "system/ime_menu/ime_list_view.h",
+    "system/ime_menu/ime_menu_tray.cc",
+    "system/ime_menu/ime_menu_tray.h",
+    "system/keyboard_brightness_control_delegate.h",
+    "system/keyboard_brightness_controller.cc",
+    "system/keyboard_brightness_controller.h",
+    "system/locale/locale_notification_controller.cc",
+    "system/locale/locale_notification_controller.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",
+    "system/network/network_icon_animation.h",
+    "system/network/network_icon_animation_observer.h",
+    "system/network/network_info.cc",
+    "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",
+    "system/network/network_state_list_detailed_view.h",
+    "system/network/sms_observer.cc",
+    "system/network/sms_observer.h",
+    "system/network/tray_network.cc",
+    "system/network/tray_network.h",
+    "system/network/tray_network_state_observer.cc",
+    "system/network/tray_network_state_observer.h",
+    "system/network/tray_vpn.cc",
+    "system/network/tray_vpn.h",
+    "system/network/vpn_list.cc",
+    "system/network/vpn_list.h",
+    "system/network/vpn_list_view.cc",
+    "system/network/vpn_list_view.h",
+    "system/networking_config_delegate.cc",
+    "system/networking_config_delegate.h",
+    "system/overview/overview_button_tray.cc",
+    "system/overview/overview_button_tray.h",
+    "system/palette/common_palette_tool.cc",
+    "system/palette/common_palette_tool.h",
+    "system/palette/palette_ids.cc",
+    "system/palette/palette_ids.h",
+    "system/palette/palette_tool.cc",
+    "system/palette/palette_tool.h",
+    "system/palette/palette_tool_manager.cc",
+    "system/palette/palette_tool_manager.h",
+    "system/palette/palette_tray.cc",
+    "system/palette/palette_tray.h",
+    "system/palette/palette_utils.cc",
+    "system/palette/palette_utils.h",
+    "system/palette/tools/capture_region_mode.cc",
+    "system/palette/tools/capture_region_mode.h",
+    "system/palette/tools/capture_screen_action.cc",
+    "system/palette/tools/capture_screen_action.h",
+    "system/palette/tools/create_note_action.cc",
+    "system/palette/tools/create_note_action.h",
+    "system/palette/tools/laser_pointer_mode.cc",
+    "system/palette/tools/laser_pointer_mode.h",
+    "system/palette/tools/magnifier_mode.cc",
+    "system/palette/tools/magnifier_mode.h",
+    "system/power/battery_notification.cc",
+    "system/power/battery_notification.h",
+    "system/power/dual_role_notification.cc",
+    "system/power/dual_role_notification.h",
+    "system/power/power_event_observer.cc",
+    "system/power/power_event_observer.h",
+    "system/power/power_status.cc",
+    "system/power/power_status.h",
+    "system/power/power_status_view.cc",
+    "system/power/power_status_view.h",
+    "system/power/tablet_power_button_controller.cc",
+    "system/power/tablet_power_button_controller.h",
+    "system/power/tray_power.cc",
+    "system/power/tray_power.h",
+    "system/power/video_activity_notifier.cc",
+    "system/power/video_activity_notifier.h",
+    "system/rotation/tray_rotation_lock.cc",
+    "system/rotation/tray_rotation_lock.h",
+    "system/screen_layout_observer.cc",
+    "system/screen_layout_observer.h",
+    "system/screen_security/screen_capture_observer.h",
+    "system/screen_security/screen_capture_tray_item.cc",
+    "system/screen_security/screen_capture_tray_item.h",
+    "system/screen_security/screen_share_observer.h",
+    "system/screen_security/screen_share_tray_item.cc",
+    "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",
+    "system/session/logout_confirmation_controller.h",
+    "system/session/logout_confirmation_dialog.cc",
+    "system/session/logout_confirmation_dialog.h",
+    "system/session/session_length_limit_observer.h",
+    "system/session/tray_session_length_limit.cc",
+    "system/session/tray_session_length_limit.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",
+    "system/system_clock_observer.h",
+    "system/system_notifier.cc",
+    "system/system_notifier.h",
+    "system/tiles/tiles_default_view.cc",
+    "system/tiles/tiles_default_view.h",
+    "system/tiles/tray_tiles.cc",
+    "system/tiles/tray_tiles.h",
+    "system/toast/toast_data.cc",
+    "system/toast/toast_data.h",
+    "system/toast/toast_manager.cc",
+    "system/toast/toast_manager.h",
+    "system/toast/toast_overlay.cc",
+    "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",
+    "system/tray/ime_info.h",
+    "system/tray/label_tray_view.cc",
+    "system/tray/label_tray_view.h",
+    "system/tray/size_range_layout.cc",
+    "system/tray/size_range_layout.h",
+    "system/tray/system_menu_button.cc",
+    "system/tray/system_menu_button.h",
+    "system/tray/system_tray.cc",
+    "system/tray/system_tray.h",
+    "system/tray/system_tray_bubble.cc",
+    "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",
+    "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_details_view.cc",
+    "system/tray/tray_details_view.h",
+    "system/tray/tray_event_filter.cc",
+    "system/tray/tray_event_filter.h",
+    "system/tray/tray_image_item.cc",
+    "system/tray/tray_image_item.h",
+    "system/tray/tray_item_more.cc",
+    "system/tray/tray_item_more.h",
+    "system/tray/tray_item_view.cc",
+    "system/tray/tray_item_view.h",
+    "system/tray/tray_popup_header_button.cc",
+    "system/tray/tray_popup_header_button.h",
+    "system/tray/tray_popup_ink_drop_style.h",
+    "system/tray/tray_popup_item_style.cc",
+    "system/tray/tray_popup_item_style.h",
+    "system/tray/tray_popup_utils.cc",
+    "system/tray/tray_popup_utils.h",
+    "system/tray/tray_utils.cc",
+    "system/tray/tray_utils.h",
+    "system/tray/tri_view.cc",
+    "system/tray/tri_view.h",
+    "system/tray/view_click_listener.h",
+    "system/tray_accessibility.cc",
+    "system/tray_accessibility.h",
+    "system/tray_caps_lock.cc",
+    "system/tray_caps_lock.h",
+    "system/tray_tracing.cc",
+    "system/tray_tracing.h",
+    "system/update/tray_update.cc",
+    "system/update/tray_update.h",
+    "system/user/button_from_view.cc",
+    "system/user/button_from_view.h",
+    "system/user/login_status.cc",
+    "system/user/login_status.h",
+    "system/user/rounded_image_view.cc",
+    "system/user/rounded_image_view.h",
+    "system/user/tray_user.cc",
+    "system/user/tray_user.h",
+    "system/user/user_card_view.cc",
+    "system/user/user_card_view.h",
+    "system/user/user_view.cc",
+    "system/user/user_view.h",
+    "system/virtual_keyboard/virtual_keyboard_observer.h",
+    "system/virtual_keyboard/virtual_keyboard_tray.cc",
+    "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/web_notification_tray.cc",
+    "system/web_notification/web_notification_tray.h",
     "touch/ash_touch_transform_controller.cc",
     "touch/ash_touch_transform_controller.h",
     "touch/touch_hud_debug.cc",
@@ -754,46 +593,112 @@ component("ash") {
     "utility/screenshot_controller.h",
     "virtual_keyboard_controller.cc",
     "virtual_keyboard_controller.h",
+    "wallpaper/wallpaper_controller.cc",
+    "wallpaper/wallpaper_controller.h",
+    "wallpaper/wallpaper_controller_observer.h",
+    "wallpaper/wallpaper_delegate.h",
+    "wallpaper/wallpaper_view.cc",
+    "wallpaper/wallpaper_view.h",
+    "wallpaper/wallpaper_widget_controller.cc",
+    "wallpaper/wallpaper_widget_controller.h",
+    "window_user_data.h",
+    "wm/always_on_top_controller.cc",
+    "wm/always_on_top_controller.h",
     "wm/ash_focus_rules.cc",
     "wm/ash_focus_rules.h",
     "wm/ash_native_cursor_manager.cc",
     "wm/ash_native_cursor_manager.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",
     "wm/cursor_manager_chromeos.h",
+    "wm/default_state.cc",
+    "wm/default_state.h",
+    "wm/default_window_resizer.cc",
+    "wm/default_window_resizer.h",
+    "wm/drag_details.cc",
+    "wm/drag_details.h",
     "wm/drag_window_controller.cc",
     "wm/drag_window_controller.h",
     "wm/drag_window_resizer.cc",
     "wm/drag_window_resizer.h",
     "wm/event_client_impl.cc",
     "wm/event_client_impl.h",
+    "wm/focus_rules.cc",
+    "wm/focus_rules.h",
+    "wm/fullscreen_window_finder.cc",
+    "wm/fullscreen_window_finder.h",
     "wm/gestures/overview_gesture_handler.cc",
     "wm/gestures/overview_gesture_handler.h",
+    "wm/immersive_context_ash.cc",
+    "wm/immersive_context_ash.h",
     "wm/immersive_focus_watcher_aura.cc",
     "wm/immersive_focus_watcher_aura.h",
     "wm/immersive_gesture_handler_aura.cc",
     "wm/immersive_gesture_handler_aura.h",
     "wm/immersive_handler_factory_ash.cc",
     "wm/immersive_handler_factory_ash.h",
+    "wm/lock_layout_manager.cc",
+    "wm/lock_layout_manager.h",
     "wm/lock_state_controller.cc",
     "wm/lock_state_controller.h",
+    "wm/lock_state_observer.h",
+    "wm/lock_window_state.cc",
+    "wm/lock_window_state.h",
+    "wm/maximize_mode/maximize_mode_controller.cc",
+    "wm/maximize_mode/maximize_mode_controller.h",
+    "wm/maximize_mode/maximize_mode_event_handler.cc",
+    "wm/maximize_mode/maximize_mode_event_handler.h",
     "wm/maximize_mode/maximize_mode_event_handler_aura.cc",
     "wm/maximize_mode/maximize_mode_event_handler_aura.h",
+    "wm/maximize_mode/maximize_mode_window_manager.cc",
+    "wm/maximize_mode/maximize_mode_window_manager.h",
+    "wm/maximize_mode/maximize_mode_window_state.cc",
+    "wm/maximize_mode/maximize_mode_window_state.h",
+    "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h",
     "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.cc",
     "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",
     "wm/overlay_event_filter.h",
+    "wm/overview/cleanup_animation_observer.cc",
+    "wm/overview/cleanup_animation_observer.h",
+    "wm/overview/overview_animation_type.h",
+    "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",
+    "wm/overview/window_grid.h",
+    "wm/overview/window_selector.cc",
+    "wm/overview/window_selector.h",
+    "wm/overview/window_selector_controller.cc",
+    "wm/overview/window_selector_controller.h",
+    "wm/overview/window_selector_delegate.h",
+    "wm/overview/window_selector_item.cc",
+    "wm/overview/window_selector_item.h",
     "wm/panels/attached_panel_window_targeter.cc",
     "wm/panels/attached_panel_window_targeter.h",
+    "wm/panels/panel_frame_view.cc",
+    "wm/panels/panel_frame_view.h",
+    "wm/panels/panel_layout_manager.cc",
+    "wm/panels/panel_layout_manager.h",
     "wm/panels/panel_window_event_handler.cc",
     "wm/panels/panel_window_event_handler.h",
+    "wm/panels/panel_window_resizer.cc",
+    "wm/panels/panel_window_resizer.h",
     "wm/power_button_controller.cc",
     "wm/power_button_controller.h",
     "wm/resize_handle_window_targeter.cc",
@@ -802,6 +707,12 @@ component("ash") {
     "wm/resize_shadow.h",
     "wm/resize_shadow_controller.cc",
     "wm/resize_shadow_controller.h",
+    "wm/root_window_finder.cc",
+    "wm/root_window_finder.h",
+    "wm/root_window_layout_manager.cc",
+    "wm/root_window_layout_manager.h",
+    "wm/screen_dimmer.cc",
+    "wm/screen_dimmer.h",
     "wm/screen_pinning_controller.cc",
     "wm/screen_pinning_controller.h",
     "wm/session_state_animator.cc",
@@ -810,31 +721,95 @@ component("ash") {
     "wm/session_state_animator_impl.h",
     "wm/stacking_controller.cc",
     "wm/stacking_controller.h",
+    "wm/switchable_windows.cc",
+    "wm/switchable_windows.h",
     "wm/system_gesture_event_filter.cc",
     "wm/system_gesture_event_filter.h",
     "wm/system_modal_container_event_filter.cc",
     "wm/system_modal_container_event_filter.h",
     "wm/system_modal_container_event_filter_delegate.h",
+    "wm/system_modal_container_layout_manager.cc",
+    "wm/system_modal_container_layout_manager.h",
     "wm/system_wallpaper_controller.cc",
     "wm/system_wallpaper_controller.h",
     "wm/toplevel_window_event_handler.cc",
     "wm/toplevel_window_event_handler.h",
     "wm/video_detector.cc",
     "wm/video_detector.h",
+    "wm/widget_finder.cc",
+    "wm/widget_finder.h",
+    "wm/window_animation_types.h",
     "wm/window_animations.cc",
     "wm/window_animations.h",
+    "wm/window_cycle_controller.cc",
+    "wm/window_cycle_controller.h",
+    "wm/window_cycle_event_filter.h",
     "wm/window_cycle_event_filter_aura.cc",
     "wm/window_cycle_event_filter_aura.h",
+    "wm/window_cycle_list.cc",
+    "wm/window_cycle_list.h",
+    "wm/window_dimmer.cc",
+    "wm/window_dimmer.h",
     "wm/window_mirror_view.cc",
     "wm/window_mirror_view.h",
+    "wm/window_parenting_utils.cc",
+    "wm/window_parenting_utils.h",
+    "wm/window_positioner.cc",
+    "wm/window_positioner.h",
+    "wm/window_positioning_utils.cc",
+    "wm/window_positioning_utils.h",
     "wm/window_properties.cc",
     "wm/window_properties.h",
+    "wm/window_resizer.cc",
+    "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",
+    "wm/window_state_util.cc",
+    "wm/window_state_util.h",
     "wm/window_util.cc",
     "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",
+    "wm/wm_toplevel_window_event_handler.h",
+    "wm/wm_types.cc",
+    "wm/wm_types.h",
+    "wm/wm_window_animations.cc",
+    "wm/wm_window_animations.h",
+    "wm/workspace/magnetism_matcher.cc",
+    "wm/workspace/magnetism_matcher.h",
+    "wm/workspace/multi_window_resize_controller.cc",
+    "wm/workspace/multi_window_resize_controller.h",
+    "wm/workspace/phantom_window_controller.cc",
+    "wm/workspace/phantom_window_controller.h",
+    "wm/workspace/two_step_edge_cycler.cc",
+    "wm/workspace/two_step_edge_cycler.h",
+    "wm/workspace/workspace_event_handler.cc",
+    "wm/workspace/workspace_event_handler.h",
     "wm/workspace/workspace_event_handler_aura.cc",
     "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",
   ]
 
   configs += [ "//build/config:precompiled_headers" ]
@@ -854,6 +829,7 @@ component("ash") {
     "//base:i18n",
     "//base/third_party/dynamic_annotations",
     "//cc",
+    "//cc/debug",
     "//cc/surfaces",
     "//chromeos",
     "//chromeos:power_manager_proto",
@@ -906,6 +882,7 @@ component("ash") {
     "//ui/platform_window/stub",
     "//ui/resources",
     "//ui/strings",
+    "//ui/vector_icons",
     "//ui/views",
     "//ui/wm",
     "//url",
@@ -1010,6 +987,8 @@ static_library("ash_shell_lib") {
     "shell/example_app_list_presenter.cc",
     "shell/example_app_list_presenter.h",
     "shell/example_factory.h",
+    "shell/example_session_controller_client.cc",
+    "shell/example_session_controller_client.h",
     "shell/lock_view.cc",
     "shell/panel_window.cc",
     "shell/panel_window.h",
@@ -1113,7 +1092,6 @@ test("ash_content_unittests") {
     ":ash",
     ":ash_with_content",
     "//ash/public/cpp:ash_public_cpp",
-    "//ash/test:ash_with_aura_test_support",
     "//ash/test:test_support_with_content",
     "//base",
     "//base/test:test_support",
@@ -1133,6 +1111,7 @@ test("ash_content_unittests") {
     "//ui/aura",
     "//ui/aura:test_support",
     "//ui/chromeos",
+    "//ui/compositor:test_support",
     "//ui/display",
     "//ui/display:test_support",
     "//ui/gl:test_support",
@@ -1156,89 +1135,132 @@ test("ash_content_unittests") {
 source_set("common_unittests") {
   testonly = true
   sources = [
+    "accelerators/accelerator_commands_unittest.cc",
     "accelerators/accelerator_controller_unittest.cc",
     "accelerators/accelerator_filter_unittest.cc",
+    "accelerators/accelerator_table_unittest.cc",
     "accelerators/spoken_feedback_toggler_unittest.cc",
     "ash_touch_exploration_manager_chromeos_unittest.cc",
     "autoclick/autoclick_unittest.cc",
-    "common/accelerators/accelerator_table_unittest.cc",
-    "common/devtools/ash_devtools_unittest.cc",
-    "common/drag_drop/drag_image_view_unittest.cc",
-    "common/frame/caption_buttons/frame_caption_button_container_view_unittest.cc",
-    "common/frame/custom_frame_view_ash_unittest.cc",
-    "common/frame/default_header_painter_unittest.cc",
-    "common/metrics/pointer_metrics_recorder_unittest.cc",
-    "common/mus_property_mirror_ash_unittest.cc",
-    "common/session/session_controller_unittest.cc",
-    "common/shelf/shelf_application_menu_model_unittest.cc",
-    "common/shelf/shelf_background_animator_unittest.cc",
-    "common/shelf/shelf_button_pressed_metric_tracker_unittest.cc",
-    "common/shelf/shelf_locking_manager_unittest.cc",
-    "common/shelf/shelf_model_unittest.cc",
-    "common/shelf/shelf_tooltip_manager_unittest.cc",
-    "common/shelf/shelf_window_watcher_unittest.cc",
-    "common/system/chromeos/audio/tray_audio_unittest.cc",
-    "common/system/chromeos/brightness/tray_brightness_unittest.cc",
-    "common/system/chromeos/ime_menu/ime_menu_tray_unittest.cc",
-    "common/system/chromeos/media_security/multi_profile_media_tray_item_unittest.cc",
-    "common/system/chromeos/network/sms_observer_unittest.cc",
-    "common/system/chromeos/network/vpn_list_unittest.cc",
-    "common/system/chromeos/palette/mock_palette_tool_delegate.cc",
-    "common/system/chromeos/palette/mock_palette_tool_delegate.h",
-    "common/system/chromeos/palette/palette_tool_manager_unittest.cc",
-    "common/system/chromeos/palette/tools/create_note_unittest.cc",
-    "common/system/chromeos/palette/tools/screenshot_unittest.cc",
-    "common/system/chromeos/power/power_status_unittest.cc",
-    "common/system/chromeos/power/power_status_view_unittest.cc",
-    "common/system/chromeos/power/tray_power_unittest.cc",
-    "common/system/chromeos/screen_security/screen_tray_item_unittest.cc",
-    "common/system/chromeos/session/logout_confirmation_controller_unittest.cc",
-    "common/system/chromeos/session/tray_session_length_limit_unittest.cc",
-    "common/system/chromeos/supervised/tray_supervised_user_unittest.cc",
-    "common/system/date/date_view_unittest.cc",
-    "common/system/date/system_info_default_view_unittest.cc",
-    "common/system/ime/tray_ime_chromeos_unittest.cc",
-    "common/system/tiles/tray_tiles_unittest.cc",
-    "common/system/tray/size_range_layout_unittest.cc",
-    "common/system/tray/system_tray_unittest.cc",
-    "common/system/tray/tray_details_view_unittest.cc",
-    "common/system/tray/tri_view_unittest.cc",
-    "common/system/update/tray_update_unittest.cc",
-    "common/system/user/tray_user_unittest.cc",
-    "common/wallpaper/wallpaper_controller_unittest.cc",
-    "common/wm/container_finder_unittest.cc",
-    "common/wm/mru_window_tracker_unittest.cc",
-    "common/wm/overview/cleanup_animation_observer_unittest.cc",
-    "common/wm/workspace/workspace_layout_manager_unittest.cc",
-    "common/wm_window_unittest.cc",
-    "common/wm_window_user_data_unittest.cc",
+    "devtools/ash_devtools_unittest.cc",
+    "display/display_configuration_controller_unittest.cc",
+    "drag_drop/drag_image_view_unittest.cc",
     "first_run/first_run_helper_unittest.cc",
     "focus_cycler_unittest.cc",
+    "frame/caption_buttons/frame_caption_button_container_view_unittest.cc",
     "frame/caption_buttons/frame_size_button_unittest.cc",
+    "frame/custom_frame_view_ash_unittest.cc",
+    "frame/default_header_painter_unittest.cc",
     "laser/laser_pointer_controller_unittest.cc",
     "laser/laser_pointer_points_unittest.cc",
     "laser/laser_segment_utils_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_property_mirror_ash_unittest.cc",
     "root_window_controller_unittest.cc",
     "rotator/screen_rotation_animation_unittest.cc",
+    "rotator/screen_rotation_animator_unittest.cc",
     "screen_util_unittest.cc",
+    "session/session_controller_unittest.cc",
+    "shelf/app_list_button_unittest.cc",
+    "shelf/shelf_application_menu_model_unittest.cc",
+    "shelf/shelf_background_animator_unittest.cc",
+    "shelf/shelf_button_pressed_metric_tracker_unittest.cc",
     "shelf/shelf_layout_manager_unittest.cc",
+    "shelf/shelf_locking_manager_unittest.cc",
+    "shelf/shelf_model_unittest.cc",
+    "shelf/shelf_tooltip_manager_unittest.cc",
     "shelf/shelf_unittest.cc",
     "shelf/shelf_view_unittest.cc",
     "shelf/shelf_widget_unittest.cc",
+    "shelf/shelf_window_watcher_unittest.cc",
     "shell_unittest.cc",
     "sticky_keys/sticky_keys_overlay_unittest.cc",
     "sticky_keys/sticky_keys_unittest.cc",
-    "system/chromeos/power/power_event_observer_unittest.cc",
-    "system/chromeos/power/tablet_power_button_controller_unittest.cc",
-    "system/chromeos/power/video_activity_notifier_unittest.cc",
+    "system/audio/tray_audio_unittest.cc",
+    "system/bluetooth/tray_bluetooth_helper_unittest.cc",
+    "system/brightness/tray_brightness_unittest.cc",
+    "system/date/date_view_unittest.cc",
+    "system/date/system_info_default_view_unittest.cc",
+    "system/ime/tray_ime_chromeos_unittest.cc",
+    "system/ime_menu/ime_menu_tray_unittest.cc",
+    "system/media_security/multi_profile_media_tray_item_unittest.cc",
+    "system/network/sms_observer_unittest.cc",
+    "system/network/vpn_list_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/screenshot_unittest.cc",
+    "system/power/power_event_observer_unittest.cc",
+    "system/power/power_status_unittest.cc",
+    "system/power/power_status_view_unittest.cc",
+    "system/power/tablet_power_button_controller_unittest.cc",
+    "system/power/tray_power_unittest.cc",
+    "system/power/video_activity_notifier_unittest.cc",
+    "system/screen_security/screen_tray_item_unittest.cc",
+    "system/session/logout_confirmation_controller_unittest.cc",
+    "system/session/tray_session_length_limit_unittest.cc",
+    "system/status_area_widget_unittest.cc",
+    "system/supervised/tray_supervised_user_unittest.cc",
+    "system/tiles/tray_tiles_unittest.cc",
+    "system/toast/toast_manager_unittest.cc",
+    "system/tray/size_range_layout_unittest.cc",
+    "system/tray/system_tray_unittest.cc",
+    "system/tray/tray_details_view_unittest.cc",
+    "system/tray/tri_view_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/web_notification_tray_unittest.cc",
+    "test/ash_test_helper_unittest.cc",
+    "tooltips/tooltip_controller_unittest.cc",
+    "wallpaper/wallpaper_controller_unittest.cc",
+    "window_user_data_unittest.cc",
+    "wm/ash_focus_rules_unittest.cc",
+    "wm/container_finder_unittest.cc",
+    "wm/immersive_fullscreen_controller_unittest.cc",
+    "wm/lock_state_controller_unittest.cc",
+    "wm/maximize_mode/accelerometer_test_data_literals.cc",
+    "wm/maximize_mode/maximize_mode_window_manager_unittest.cc",
+    "wm/mru_window_tracker_unittest.cc",
+    "wm/overlay_event_filter_unittest.cc",
+    "wm/overview/cleanup_animation_observer_unittest.cc",
+    "wm/overview/window_selector_unittest.cc",
+    "wm/panels/panel_layout_manager_unittest.cc",
+    "wm/panels/panel_window_resizer_unittest.cc",
+    "wm/root_window_layout_manager_unittest.cc",
+    "wm/screen_dimmer_unittest.cc",
+    "wm/screen_pinning_controller_unittest.cc",
+    "wm/session_state_animator_impl_unittest.cc",
+    "wm/stacking_controller_unittest.cc",
+    "wm/system_modal_container_layout_manager_unittest.cc",
+    "wm/toplevel_window_event_handler_unittest.cc",
+    "wm/video_detector_unittest.cc",
+    "wm/window_animations_unittest.cc",
+    "wm/window_cycle_controller_unittest.cc",
+    "wm/window_manager_unittest.cc",
+    "wm/window_modality_controller_unittest.cc",
+    "wm/window_positioner_unittest.cc",
+    "wm/window_state_unittest.cc",
+    "wm/window_util_unittest.cc",
+    "wm/workspace/magnetism_matcher_unittest.cc",
+    "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/public/cpp:ash_public_cpp",
+    "//ash/public/cpp:unit_tests",
     "//ash/resources/vector_icons",
     "//ash/test:test_support_without_content",
     "//base",
@@ -1246,6 +1268,7 @@ source_set("common_unittests") {
     "//chromeos",
     "//chromeos:power_manager_proto",
     "//chromeos:test_support_without_gmock",
+    "//device/bluetooth",
     "//services/ui/public/interfaces",
     "//testing/gmock",
     "//ui/accessibility",
@@ -1265,6 +1288,7 @@ source_set("common_unittests") {
     "//ui/views",
     "//ui/views:test_support",
     "//ui/wm",
+    "//ui/wm:test_support",
   ]
   public_deps = [
     "//ash/test:test_support_without_content",
@@ -1273,9 +1297,6 @@ source_set("common_unittests") {
 
 test("ash_unittests") {
   sources = [
-    # TODO: move to common_unittests. Fails because of http://crbug.com/622486.
-    "accelerators/accelerator_commands_unittest.cc",
-
     # TODO: move to common_unittests. Fails because of http://crbug.com/557401.
     "accelerators/magnifier_key_scroller_unittest.cc",
 
@@ -1297,7 +1318,6 @@ test("ash_unittests") {
     "display/display_manager_unittest.cc",
     "display/display_util_unittest.cc",
     "display/extended_mouse_warp_controller_unittest.cc",
-    "display/json_converter_unittest.cc",
     "display/mirror_window_controller_unittest.cc",
     "display/mouse_cursor_event_filter_unittest.cc",
     "display/projecting_observer_chromeos_unittest.cc",
@@ -1323,62 +1343,58 @@ test("ash_unittests") {
     "magnifier/partial_magnification_controller_unittest.cc",
 
     # TODO: investigate failure in mash, http://crbug.com/695887.
-    "system/chromeos/rotation/tray_rotation_lock_unittest.cc",
-    "system/chromeos/screen_layout_observer_unittest.cc",
-    "system/overview/overview_button_tray_unittest.cc",
-    "system/toast/toast_manager_unittest.cc",
-    "system/web_notification/ash_popup_alignment_delegate_unittest.cc",
-    "system/web_notification/web_notification_tray_unittest.cc",
-    "test/ash_test_helper_unittest.cc",
+    "system/rotation/tray_rotation_lock_unittest.cc",
+
+    # 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",
-    "tooltips/tooltip_controller_unittest.cc",
+
+    # TODO(riajiang): port to work with mash. http://crbug.com/698032.
     "touch/touch_observer_hud_unittest.cc",
+
+    # TODO(moshayedi): port to work with mash. http://crbug.com/698033.
     "utility/screenshot_controller_unittest.cc",
+
+    # TODO: keyboard is not enabled in mash. http://crbug.com/648733.
     "virtual_keyboard_controller_unittest.cc",
+
+    # TODO: keyboard is not enabled in mash. http://crbug.com/648733.
     "wm/always_on_top_controller_unittest.cc",
-    "wm/ash_focus_rules_unittest.cc",
+
+    # TODO: mash doesn't support CursorManager. http://crbug.com/631103.
     "wm/ash_native_cursor_manager_unittest.cc",
-    "wm/dock/docked_window_layout_manager_unittest.cc",
-    "wm/dock/docked_window_resizer_unittest.cc",
+
+    # TODO: mash doesn't support DragWindowResizer. http://crbug.com/633782.
     "wm/drag_window_resizer_unittest.cc",
+
+    # TODO: mash doesn't support OverviewGestureHandler.
+    # http://crbug.com/634994.
     "wm/gestures/overview_gesture_handler_unittest.cc",
-    "wm/immersive_fullscreen_controller_unittest.cc",
+
+    # TODO: fails because keyboard is not enabled in mash.
+    # http://crbug.com/648733.
     "wm/lock_layout_manager_unittest.cc",
-    "wm/lock_state_controller_unittest.cc",
-    "wm/maximize_mode/accelerometer_test_data_literals.cc",
+
+    # TODO: investigate failures in mash. http://crbug.com/698092.
     "wm/maximize_mode/maximize_mode_controller_unittest.cc",
-    "wm/maximize_mode/maximize_mode_window_manager_unittest.cc",
-    "wm/overlay_event_filter_unittest.cc",
-    "wm/overview/window_selector_unittest.cc",
-    "wm/panels/panel_layout_manager_unittest.cc",
-    "wm/panels/panel_window_resizer_unittest.cc",
+
+    # TODO: mash doesn't support CursorManager. http://crbug.com/631103.
     "wm/resize_shadow_and_cursor_unittest.cc",
-    "wm/root_window_layout_manager_unittest.cc",
-    "wm/screen_dimmer_unittest.cc",
-    "wm/screen_pinning_controller_unittest.cc",
-    "wm/session_state_animator_impl_unittest.cc",
-    "wm/stacking_controller_unittest.cc",
+
+    # TODO: mash doesn't support SetFirstDisplayAsInternalDisplay(), which all
+    # the tests in this file use. http://crbug.com/698091.
     "wm/system_gesture_event_filter_unittest.cc",
-    "wm/system_modal_container_layout_manager_unittest.cc",
-    "wm/toplevel_window_event_handler_unittest.cc",
-    "wm/video_detector_unittest.cc",
-    "wm/window_animations_unittest.cc",
-    "wm/window_cycle_controller_unittest.cc",
-    "wm/window_manager_unittest.cc",
-    "wm/window_modality_controller_unittest.cc",
-    "wm/window_positioner_unittest.cc",
-    "wm/window_state_unittest.cc",
-    "wm/window_util_unittest.cc",
-    "wm/workspace/magnetism_matcher_unittest.cc",
+
+    # TODO: MultiWindowResizeControllerTests fail in mash.
+    # http://crbug.com/699172.
     "wm/workspace/multi_window_resize_controller_unittest.cc",
-    "wm/workspace/workspace_event_handler_unittest.cc",
+
+    # TODO: fails because the virtual keyboard is not enabled in mash.
+    # http://crbug.com/648733.
     "wm/workspace/workspace_layout_manager_keyboard_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",
   ]
   configs += [
     "//build/config:precompiled_headers",
@@ -1393,7 +1409,6 @@ test("ash_unittests") {
     "//ash/resources",
     "//ash/resources/vector_icons",
     "//ash/strings",
-    "//ash/test:ash_with_aura_test_support",
     "//ash/test:test_support_without_content",
     "//ash/touch_hud",
     "//base",
@@ -1440,7 +1455,6 @@ test("ash_unittests") {
     "//ui/views",
     "//ui/views:test_support",
     "//ui/wm",
-    "//ui/wm:test_support",
     "//url",
   ]
 
@@ -1448,6 +1462,7 @@ test("ash_unittests") {
     "//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) {