BASELINE: Update Chromium to 55.0.2883.105

And updates ninja to 1.7.2

Change-Id: I20d43c737f82764d857ada9a55586901b18b9243
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

28 files changed, 2012 insertions, 2088 deletions

diff --git a/chromium/ash/BUILD.gn b/chromium/ash/BUILD.gn
index 06507f24c5c..92e6f2f6e9d 100644
--- a/chromium/ash/BUILD.gn
+++ b/chromium/ash/BUILD.gn
@@ -10,22 +10,828 @@ import("//ui/base/ui_features.gni")
 assert(use_aura)
 assert(enable_hidpi)
 
-gypi_values = exec_script("//build/gypi_to_gn.py",
-                          [ rebase_path("ash.gyp") ],
-                          "scope",
-                          [ "ash.gyp" ])
-
 component("ash") {
-  sources = gypi_values.ash_sources
+  sources = [
+    "accelerators/accelerator_commands_aura.cc",
+    "accelerators/accelerator_commands_aura.h",
+    "accelerators/accelerator_controller_delegate_aura.cc",
+    "accelerators/accelerator_controller_delegate_aura.h",
+    "accelerators/accelerator_delegate.cc",
+    "accelerators/accelerator_delegate.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",
+    "app_list/app_list_presenter_delegate.cc",
+    "app_list/app_list_presenter_delegate.h",
+    "app_list/app_list_presenter_delegate_factory.cc",
+    "app_list/app_list_presenter_delegate_factory.h",
+    "ash_export.h",
+    "ash_touch_exploration_manager_chromeos.cc",
+    "ash_touch_exploration_manager_chromeos.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_root_window_controller_aura.cc",
+    "aura/wm_root_window_controller_aura.h",
+    "aura/wm_shelf_aura.cc",
+    "aura/wm_shelf_aura.h",
+    "aura/wm_shell_aura.cc",
+    "aura/wm_shell_aura.h",
+    "aura/wm_window_aura.cc",
+    "aura/wm_window_aura.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_delegate.cc",
+    "common/cast_config_delegate.h",
+    "common/default_accessibility_delegate.cc",
+    "common/default_accessibility_delegate.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/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/palette_delegate.h",
+    "common/popup_message.cc",
+    "common/popup_message.h",
+    "common/scoped_root_window_for_new_windows.cc",
+    "common/scoped_root_window_for_new_windows.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/session/session_types.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_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_delegate.h",
+    "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_menu_model.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/shell_window_ids.cc",
+    "common/shell_window_ids.h",
+    "common/system/accessibility_observer.h",
+    "common/system/audio/audio_observer.h",
+    "common/system/audio/tray_audio.cc",
+    "common/system/audio/tray_audio.h",
+    "common/system/audio/tray_audio_delegate.h",
+    "common/system/audio/volume_view.cc",
+    "common/system/audio/volume_view.h",
+    "common/system/brightness_control_delegate.h",
+    "common/system/cast/tray_cast.cc",
+    "common/system/cast/tray_cast.h",
+    "common/system/chromeos/audio/audio_detailed_view.cc",
+    "common/system/chromeos/audio/audio_detailed_view.h",
+    "common/system/chromeos/audio/tray_audio_chromeos.cc",
+    "common/system/chromeos/audio/tray_audio_chromeos.h",
+    "common/system/chromeos/audio/tray_audio_delegate_chromeos.cc",
+    "common/system/chromeos/audio/tray_audio_delegate_chromeos.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/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/media_capture_observer.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_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/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_sms.cc",
+    "common/system/chromeos/network/tray_sms.h",
+    "common/system/chromeos/network/tray_vpn.cc",
+    "common/system/chromeos/network/tray_vpn.h",
+    "common/system/chromeos/network/vpn_delegate.cc",
+    "common/system/chromeos/network/vpn_delegate.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/shutdown_policy_observer.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/tray_date.cc",
+    "common/system/date/tray_date.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/locale/locale_observer.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/fixed_sized_scroll_view.cc",
+    "common/system/tray/fixed_sized_scroll_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/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_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_label_button.cc",
+    "common/system/tray/tray_popup_label_button.h",
+    "common/system/tray/tray_popup_label_button_border.cc",
+    "common/system/tray/tray_popup_label_button_border.h",
+    "common/system/tray/tray_utils.cc",
+    "common/system/tray/tray_utils.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/update/update_observer.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/tray_user_separator.cc",
+    "common/system/user/tray_user_separator.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/volume_control_delegate.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/background_animator.cc",
+    "common/wm/background_animator.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_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_root_window_controller.cc",
+    "common/wm_root_window_controller.h",
+    "common/wm_shell.cc",
+    "common/wm_shell.h",
+    "common/wm_transient_window_observer.h",
+    "common/wm_window.h",
+    "common/wm_window_observer.h",
+    "common/wm_window_property.h",
+    "common/wm_window_tracker.h",
+    "common/wm_window_user_data.h",
+    "debug.cc",
+    "debug.h",
+    "default_wallpaper_delegate.cc",
+    "default_wallpaper_delegate.h",
+    "display/cursor_window_controller.cc",
+    "display/cursor_window_controller.h",
+    "display/display_animator.h",
+    "display/display_animator_chromeos.cc",
+    "display/display_animator_chromeos.h",
+    "display/display_change_observer_chromeos.cc",
+    "display/display_change_observer_chromeos.h",
+    "display/display_color_manager_chromeos.cc",
+    "display/display_color_manager_chromeos.h",
+    "display/display_configuration_controller.cc",
+    "display/display_configuration_controller.h",
+    "display/display_error_observer_chromeos.cc",
+    "display/display_error_observer_chromeos.h",
+    "display/display_manager.cc",
+    "display/display_manager.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",
+    "display/mouse_cursor_event_filter.h",
+    "display/mouse_warp_controller.h",
+    "display/null_mouse_warp_controller.cc",
+    "display/null_mouse_warp_controller.h",
+    "display/projecting_observer_chromeos.cc",
+    "display/projecting_observer_chromeos.h",
+    "display/resolution_notification_controller.cc",
+    "display/resolution_notification_controller.h",
+    "display/root_window_transformers.cc",
+    "display/root_window_transformers.h",
+    "display/screen_ash.cc",
+    "display/screen_ash.h",
+    "display/screen_orientation_controller_chromeos.cc",
+    "display/screen_orientation_controller_chromeos.h",
+    "display/screen_position_controller.cc",
+    "display/screen_position_controller.h",
+    "display/shared_display_edge_indicator.cc",
+    "display/shared_display_edge_indicator.h",
+    "display/unified_mouse_warp_controller.cc",
+    "display/unified_mouse_warp_controller.h",
+    "display/window_tree_host_manager.cc",
+    "display/window_tree_host_manager.h",
+    "drag_drop/drag_drop_controller.cc",
+    "drag_drop/drag_drop_controller.h",
+    "drag_drop/drag_drop_tracker.cc",
+    "drag_drop/drag_drop_tracker.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",
+    "high_contrast/high_contrast_controller.cc",
+    "high_contrast/high_contrast_controller.h",
+    "host/ash_window_tree_host.cc",
+    "host/ash_window_tree_host.h",
+    "host/ash_window_tree_host_init_params.h",
+    "host/ash_window_tree_host_platform.cc",
+    "host/ash_window_tree_host_platform.h",
+    "host/ash_window_tree_host_unified.cc",
+    "host/ash_window_tree_host_unified.h",
+    "host/ash_window_tree_host_win.cc",
+    "host/ash_window_tree_host_win.h",
+    "host/ash_window_tree_host_x11.cc",
+    "host/ash_window_tree_host_x11.h",
+    "host/root_window_transformer.h",
+    "host/transformer_helper.cc",
+    "host/transformer_helper.h",
+    "ime/input_method_event_handler.cc",
+    "ime/input_method_event_handler.h",
+    "link_handler_model.cc",
+    "link_handler_model.h",
+    "link_handler_model_factory.cc",
+    "link_handler_model_factory.h",
+    "magnifier/magnification_controller.cc",
+    "magnifier/magnification_controller.h",
+    "metrics/desktop_task_switch_metric_recorder.cc",
+    "metrics/desktop_task_switch_metric_recorder.h",
+    "metrics/task_switch_metrics_recorder.cc",
+    "metrics/task_switch_metrics_recorder.h",
+    "metrics/task_switch_time_tracker.cc",
+    "metrics/task_switch_time_tracker.h",
+    "metrics/user_metrics_recorder.cc",
+    "metrics/user_metrics_recorder.h",
+    "root_window_controller.cc",
+    "root_window_controller.h",
+    "root_window_settings.cc",
+    "root_window_settings.h",
+    "rotator/screen_rotation_animation.cc",
+    "rotator/screen_rotation_animation.h",
+    "rotator/screen_rotation_animator.cc",
+    "rotator/screen_rotation_animator.h",
+    "rotator/window_rotation.cc",
+    "rotator/window_rotation.h",
+    "screen_util.cc",
+    "screen_util.h",
+    "screenshot_delegate.h",
+    "shared/immersive_context.cc",
+    "shared/immersive_context.h",
+    "shared/immersive_focus_watcher.h",
+    "shared/immersive_fullscreen_controller.cc",
+    "shared/immersive_fullscreen_controller.h",
+    "shared/immersive_fullscreen_controller_delegate.h",
+    "shared/immersive_gesture_handler.h",
+    "shared/immersive_handler_factory.cc",
+    "shared/immersive_handler_factory.h",
+    "shared/immersive_revealed_lock.cc",
+    "shared/immersive_revealed_lock.h",
+    "shelf/dimmer_view.cc",
+    "shelf/dimmer_view.h",
+    "shelf/shelf_bezel_event_handler.cc",
+    "shelf/shelf_bezel_event_handler.h",
+    "shelf/shelf_window_targeter.cc",
+    "shelf/shelf_window_targeter.h",
+    "shell.cc",
+    "shell.h",
+    "shell_init_params.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/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",
+    "touch/touch_hud_debug.cc",
+    "touch/touch_hud_debug.h",
+    "touch/touch_hud_projection.cc",
+    "touch/touch_hud_projection.h",
+    "touch/touch_observer_hud.cc",
+    "touch/touch_observer_hud.h",
+    "touch/touch_transformer_controller.cc",
+    "touch/touch_transformer_controller.h",
+    "touch/touch_uma.cc",
+    "touch/touch_uma.h",
+    "touch/touchscreen_util.cc",
+    "touch/touchscreen_util.h",
+    "utility/screenshot_controller.cc",
+    "utility/screenshot_controller.h",
+    "virtual_keyboard_controller.cc",
+    "virtual_keyboard_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/cursor_manager_chromeos.cc",
+    "wm/cursor_manager_chromeos.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/gestures/overview_gesture_handler.cc",
+    "wm/gestures/overview_gesture_handler.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_state_controller.cc",
+    "wm/lock_state_controller.h",
+    "wm/maximize_mode/maximize_mode_event_handler_aura.cc",
+    "wm/maximize_mode/maximize_mode_event_handler_aura.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/overlay_event_filter.cc",
+    "wm/overlay_event_filter.h",
+    "wm/overview/scoped_overview_animation_settings_aura.cc",
+    "wm/overview/scoped_overview_animation_settings_aura.h",
+    "wm/overview/scoped_overview_animation_settings_factory_aura.cc",
+    "wm/overview/scoped_overview_animation_settings_factory_aura.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_window_event_handler.cc",
+    "wm/panels/panel_window_event_handler.h",
+    "wm/power_button_controller.cc",
+    "wm/power_button_controller.h",
+    "wm/resize_handle_window_targeter.cc",
+    "wm/resize_handle_window_targeter.h",
+    "wm/resize_shadow.cc",
+    "wm/resize_shadow.h",
+    "wm/resize_shadow_controller.cc",
+    "wm/resize_shadow_controller.h",
+    "wm/screen_pinning_controller.cc",
+    "wm/screen_pinning_controller.h",
+    "wm/session_state_animator.cc",
+    "wm/session_state_animator.h",
+    "wm/session_state_animator_impl.cc",
+    "wm/session_state_animator_impl.h",
+    "wm/stacking_controller.cc",
+    "wm/stacking_controller.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_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/window_animations.cc",
+    "wm/window_animations.h",
+    "wm/window_cycle_event_filter_aura.cc",
+    "wm/window_cycle_event_filter_aura.h",
+    "wm/window_mirror_view.cc",
+    "wm/window_mirror_view.h",
+    "wm/window_properties.cc",
+    "wm/window_properties.h",
+    "wm/window_state_aura.cc",
+    "wm/window_state_aura.h",
+    "wm/window_util.cc",
+    "wm/window_util.h",
+    "wm/workspace/workspace_event_handler_aura.cc",
+    "wm/workspace/workspace_event_handler_aura.h",
+  ]
 
   configs += [ "//build/config:precompiled_headers" ]
   defines = [ "ASH_IMPLEMENTATION" ]
 
   public_deps = [
+    "//ash/common/strings",
     "//ash/resources",
-    "//ash/strings",
+    "//ash/resources/vector_icons",
+    "//ash/shared:app_types",
   ]
   deps = [
+    "//ash/autoclick/common:autoclick",
+    "//ash/public/cpp",
+    "//ash/public/interfaces",
+    "//ash/touch_hud",
     "//base",
     "//base:i18n",
     "//base/third_party/dynamic_annotations",
@@ -37,6 +843,7 @@ component("ash") {
     "//components/wallpaper",
     "//media",
     "//net",
+    "//services/shell/public/cpp",
     "//skia",
     "//third_party/icu",
     "//ui/accessibility",
@@ -101,6 +908,11 @@ component("ash") {
       "//ui/events/ozone:events_ozone",
       "//ui/ozone",
     ]
+  } else {
+    sources -= [
+      "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.cc",
+      "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h",
+    ]
   }
 
   if (is_chromeos) {
@@ -113,7 +925,7 @@ component("ash") {
       # TODO(msw): Remove this; only ash_with_content should depend on webkit.
       "//third_party/WebKit/public:blink_headers",
       "//third_party/qcms",
-      "//ui/chromeos:ui_chromeos",
+      "//ui/chromeos",
       "//ui/chromeos/resources",
       "//ui/chromeos/strings",
       "//ui/display/util",
@@ -122,6 +934,17 @@ component("ash") {
     data = [
       "display/test_data/",
     ]
+
+    sources += [
+      "laser/laser_pointer_controller.cc",
+      "laser/laser_pointer_controller.h",
+      "laser/laser_pointer_points.cc",
+      "laser/laser_pointer_points.h",
+      "laser/laser_pointer_view.cc",
+      "laser/laser_pointer_view.h",
+      "magnifier/partial_magnification_controller.cc",
+      "magnifier/partial_magnification_controller.h",
+    ]
   } else {
     sources -= [
       "accelerators/key_hold_detector.cc",
@@ -141,16 +964,24 @@ component("ash") {
     ]
   }
 
-  if (!use_ozone) {
-    sources -= [
-      "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.cc",
-      "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h",
-    ]
-  }
+  # Usage of content should be in ash_content_unittests.
+  assert_no_deps = [ "//content/*" ]
 }
 
 component("ash_with_content") {
-  sources = gypi_values.ash_with_content_sources
+  sources = [
+    "content/ash_with_content_export.h",
+    "content/gpu_support_impl.cc",
+    "content/gpu_support_impl.h",
+    "content/keyboard_overlay/keyboard_overlay_delegate.cc",
+    "content/keyboard_overlay/keyboard_overlay_delegate.h",
+    "content/keyboard_overlay/keyboard_overlay_view.cc",
+    "content/keyboard_overlay/keyboard_overlay_view.h",
+    "content/screen_orientation_delegate_chromeos.cc",
+    "content/screen_orientation_delegate_chromeos.h",
+    "content/shell_content_state.cc",
+    "content/shell_content_state.h",
+  ]
 
   defines = [ "ASH_WITH_CONTENT_IMPLEMENTATION" ]
 
@@ -180,24 +1011,123 @@ component("ash_with_content") {
   ]
 }
 
-# TODO(msw): Move support code with content deps to test_support_with_content.
-source_set("test_support") {
+# Used to test ash with an aura backend.
+source_set("ash_with_aura_test_support") {
   testonly = true
-  sources = gypi_values.ash_test_support_sources
+  sources = [
+    "test/ash_test_impl_aura.cc",
+    "test/ash_test_impl_aura.h",
+  ]
+  deps = [
+    ":ash",
+    ":test_support_common",
+    "//base",
+    "//skia",
+    "//ui/aura:test_support",
+    "//ui/display",
+    "//ui/wm",
+  ]
+}
+
+# Internal target consumed by |test_support_with_content| and
+# |test_support_without_content|. This target contains all the test support
+# files, with the exception of an implementation of AshTestEnvironment.
+# Consumers of ash should use one of |test_support_with_content| or
+# |test_support_without_content|.
+static_library("test_support_common") {
+  testonly = true
+  visibility = [ ":*" ]
+  sources = [
+    "common/test/ash_test.cc",
+    "common/test/ash_test.h",
+    "common/test/ash_test_impl.h",
+    "common/test/material_design_controller_test_api.cc",
+    "common/test/material_design_controller_test_api.h",
+    "common/test/test_palette_delegate.cc",
+    "common/test/test_palette_delegate.h",
+    "common/test/test_volume_control_delegate.cc",
+    "common/test/test_volume_control_delegate.h",
+    "shell/toplevel_window.cc",
+    "shell/toplevel_window.h",
+    "test/ash_md_test_base.cc",
+    "test/ash_md_test_base.h",
+    "test/ash_test_base.cc",
+    "test/ash_test_base.h",
+    "test/ash_test_environment.h",
+    "test/ash_test_helper.cc",
+    "test/ash_test_helper.h",
+    "test/ash_test_views_delegate.cc",
+    "test/ash_test_views_delegate.h",
+    "test/child_modal_window.cc",
+    "test/child_modal_window.h",
+    "test/cursor_manager_test_api.cc",
+    "test/cursor_manager_test_api.h",
+    "test/display_manager_test_api.cc",
+    "test/display_manager_test_api.h",
+    "test/immersive_fullscreen_controller_test_api.cc",
+    "test/immersive_fullscreen_controller_test_api.h",
+    "test/mirror_window_test_api.cc",
+    "test/mirror_window_test_api.h",
+    "test/overflow_bubble_view_test_api.cc",
+    "test/overflow_bubble_view_test_api.h",
+    "test/shelf_button_pressed_metric_tracker_test_api.cc",
+    "test/shelf_button_pressed_metric_tracker_test_api.h",
+    "test/shelf_view_test_api.cc",
+    "test/shelf_view_test_api.h",
+    "test/shell_test_api.cc",
+    "test/shell_test_api.h",
+    "test/status_area_widget_test_helper.cc",
+    "test/status_area_widget_test_helper.h",
+    "test/task_switch_time_tracker_test_api.cc",
+    "test/task_switch_time_tracker_test_api.h",
+    "test/test_activation_delegate.cc",
+    "test/test_activation_delegate.h",
+    "test/test_keyboard_ui.cc",
+    "test/test_keyboard_ui.h",
+    "test/test_lock_state_controller_delegate.cc",
+    "test/test_lock_state_controller_delegate.h",
+    "test/test_overlay_delegate.cc",
+    "test/test_overlay_delegate.h",
+    "test/test_screenshot_delegate.cc",
+    "test/test_screenshot_delegate.h",
+    "test/test_session_state_animator.cc",
+    "test/test_session_state_animator.h",
+    "test/test_session_state_delegate.cc",
+    "test/test_session_state_delegate.h",
+    "test/test_shelf_delegate.cc",
+    "test/test_shelf_delegate.h",
+    "test/test_shelf_item_delegate.cc",
+    "test/test_shelf_item_delegate.h",
+    "test/test_shell_delegate.cc",
+    "test/test_shell_delegate.h",
+    "test/test_suite.cc",
+    "test/test_suite.h",
+    "test/test_suite_init.h",
+    "test/test_suite_init.mm",
+    "test/test_system_tray_delegate.cc",
+    "test/test_system_tray_delegate.h",
+    "test/test_system_tray_item.cc",
+    "test/test_system_tray_item.h",
+    "test/test_wallpaper_delegate.cc",
+    "test/test_wallpaper_delegate.h",
+    "test/tray_cast_test_api.cc",
+    "test/tray_cast_test_api.h",
+    "test/ui_controls_factory_ash.cc",
+    "test/ui_controls_factory_ash.h",
+    "test/user_metrics_recorder_test_api.cc",
+    "test/user_metrics_recorder_test_api.h",
+  ]
   configs += [ "//build/config:precompiled_headers" ]
 
   public_deps = [
     ":ash",
   ]
   deps = [
-    ":test_support_with_content",  # TODO(beng): reverse this direction.
     "//ash/resources",
     "//base:i18n",
     "//base/test:test_support",
     "//components/signin/core/account_id",
     "//components/user_manager:user_manager",
-    "//content/public/browser",
-    "//content/test:test_support",
     "//device/bluetooth",
     "//skia",
     "//testing/gtest",
@@ -234,27 +1164,58 @@ source_set("test_support") {
       "//chromeos",
       "//ui/display",
     ]
+
+    sources += [
+      "laser/laser_pointer_controller_test_api.cc",
+      "laser/laser_pointer_controller_test_api.h",
+      "laser/laser_pointer_points_test_api.cc",
+      "laser/laser_pointer_points_test_api.h",
+    ]
   }
 }
 
-source_set("test_support_with_content") {
+static_library("test_support_without_content") {
   testonly = true
-  sources = gypi_values.ash_test_support_with_content_sources
-  configs += [ "//build/config:precompiled_headers" ]
+  sources = [
+    "test/ash_test_environment_default.cc",
+  ]
+
+  public_deps = [
+    ":test_support_common",
+  ]
 
   deps = [
+    "//base",
+    "//base/test:test_support",
+    "//skia",
+  ]
+}
+
+static_library("test_support_with_content") {
+  testonly = true
+  sources = [
+    "test/ash_test_environment_content.cc",
+    "test/ash_test_environment_content.h",
+    "test/content/test_shell_content_state.cc",
+    "test/content/test_shell_content_state.h",
+  ]
+  configs += [ "//build/config:precompiled_headers" ]
+
+  public_deps = [
     ":ash_with_content",
+    ":test_support_common",
+    "//content/public/browser",
     "//content/test:test_support",
     "//skia",
   ]
 }
 
-source_set("interactive_ui_test_support") {
+static_library("interactive_ui_test_support") {
   testonly = true
   configs += [ "//build/config:precompiled_headers" ]
   public_deps = [
     ":ash",
-    ":test_support",
+    ":test_support_without_content",
   ]
   sources = [
     "test/ash_interactive_ui_test_base.cc",
@@ -262,7 +1223,7 @@ source_set("interactive_ui_test_support") {
   ]
   deps = [
     ":ash",
-    ":test_support",
+    ":test_support_with_content",
     "//base",
     "//skia",
     "//testing/gtest",
@@ -274,14 +1235,36 @@ source_set("interactive_ui_test_support") {
 
 static_library("ash_shell_lib") {
   testonly = true
-  sources = gypi_values.ash_shell_lib_sources
+  sources = [
+    "../ui/views/test/test_views_delegate_aura.cc",
+    "shell/app_list.cc",
+    "shell/bubble.cc",
+    "shell/context_menu.cc",
+    "shell/context_menu.h",
+    "shell/example_factory.h",
+    "shell/lock_view.cc",
+    "shell/panel_window.cc",
+    "shell/panel_window.h",
+    "shell/shell_delegate_impl.cc",
+    "shell/shell_delegate_impl.h",
+    "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",
+    "shell/window_watcher_shelf_item_delegate.h",
+  ]
 
   deps = [
     ":ash",
     ":ash_with_content",
-    ":test_support",
+    ":test_support_without_content",
+    "//ash/common/strings",
+    "//ash/public/cpp",
     "//ash/resources",
-    "//ash/strings",
     "//base",
     "//base:i18n",
     "//components/user_manager",
@@ -311,7 +1294,16 @@ static_library("ash_shell_lib") {
 
 static_library("ash_shell_lib_with_content") {
   testonly = true
-  sources = gypi_values.ash_shell_with_content_lib_sources
+  sources = [
+    "shell/content/client/shell_browser_main_parts.cc",
+    "shell/content/client/shell_browser_main_parts.h",
+    "shell/content/client/shell_content_browser_client.cc",
+    "shell/content/client/shell_content_browser_client.h",
+    "shell/content/client/shell_main_delegate.cc",
+    "shell/content/client/shell_main_delegate.h",
+    "shell/content/shell_content_state_impl.cc",
+    "shell/content/shell_content_state_impl.h",
+  ]
 
   deps = [
     ":ash_shell_lib",
@@ -338,17 +1330,26 @@ static_library("ash_shell_lib_with_content") {
   }
 }
 
-test("ash_unittests") {
-  sources = gypi_values.ash_unittests_sources
-  configs += [ "//build/config:precompiled_headers" ]
+# This target is intended for tests that use content. In general very few tests
+# need or use content and should be placed in |ash_unittests| instead.
+test("ash_content_unittests") {
+  sources = [
+    "content/display/screen_orientation_controller_chromeos_unittest.cc",
+    "content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc",
+    "content/keyboard_overlay/keyboard_overlay_view_unittest.cc",
+    "test/ash_unittests.cc",
+  ]
+  configs += [
+    "//build/config:precompiled_headers",
+    "//build/config/compiler:no_size_t_to_int_warning",
+  ]
 
   deps = [
     ":ash",
+    ":ash_with_aura_test_support",
     ":ash_with_content",
-    ":test_support",
     ":test_support_with_content",
-    "//ash/resources",
-    "//ash/strings",
+    "//ash/public/cpp",
     "//base",
     "//base/test:test_support",
     "//components/signin/core/account_id",
@@ -358,6 +1359,213 @@ test("ash_unittests") {
     "//mojo/edk/system",
     "//skia",
     "//testing/gtest",
+    "//ui/aura",
+    "//ui/aura:test_support",
+    "//ui/message_center",
+    "//ui/message_center:test_support",
+    "//ui/views",
+    "//ui/views:test_support",
+    "//ui/views/controls/webview:test_support",
+    "//ui/web_dialogs:test_support",
+  ]
+
+  data_deps = [
+    "//ash/common/strings:ash_test_strings",
+    "//ash/resources:ash_test_resources_with_content_100_percent",
+    "//ash/resources:ash_test_resources_200_percent",
+  ]
+
+  if (is_chromeos) {
+    deps += [
+      "//chromeos",
+      "//chromeos:power_manager_proto",
+      "//chromeos:test_support_without_gmock",
+      "//components/quirks",
+      "//device/bluetooth",
+      "//net:net",
+      "//ui/chromeos",
+      "//ui/display",
+      "//ui/display:test_support",
+      "//ui/display:test_util",
+    ]
+  }
+}
+
+test("ash_unittests") {
+  sources = [
+    "accelerators/accelerator_commands_unittest.cc",
+    "accelerators/accelerator_controller_unittest.cc",
+    "accelerators/accelerator_filter_unittest.cc",
+    "accelerators/magnifier_key_scroller_unittest.cc",
+    "accelerators/spoken_feedback_toggler_unittest.cc",
+    "app_list/app_list_presenter_delegate_unittest.cc",
+    "ash_touch_exploration_manager_chromeos_unittest.cc",
+    "aura/pointer_watcher_adapter_unittest.cc",
+    "autoclick/autoclick_unittest.cc",
+    "common/accelerators/accelerator_table_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/material_design/material_design_controller_unittest.cc",
+    "common/metrics/pointer_metrics_recorder_unittest.cc",
+    "common/popup_message_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/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/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/ime/tray_ime_chromeos_unittest.cc",
+    "common/system/tiles/tray_tiles_unittest.cc",
+    "common/system/tray/system_tray_unittest.cc",
+    "common/system/tray/tray_details_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/overview/cleanup_animation_observer_unittest.cc",
+    "common/wm/workspace/workspace_event_handler_test_helper.cc",
+    "common/wm/workspace/workspace_event_handler_test_helper.h",
+    "common/wm_window_unittest.cc",
+    "common/wm_window_user_data_unittest.cc",
+    "dip_unittest.cc",
+    "display/cursor_window_controller_unittest.cc",
+    "display/display_change_observer_chromeos_unittest.cc",
+    "display/display_color_manager_chromeos_unittest.cc",
+    "display/display_error_observer_chromeos_unittest.cc",
+    "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",
+    "display/resolution_notification_controller_unittest.cc",
+    "display/root_window_transformers_unittest.cc",
+    "display/screen_ash_unittest.cc",
+    "display/screen_position_controller_unittest.cc",
+    "display/unified_mouse_warp_controller_unittest.cc",
+    "display/window_tree_host_manager_unittest.cc",
+    "drag_drop/drag_drop_controller_unittest.cc",
+    "drag_drop/drag_drop_tracker_unittest.cc",
+    "extended_desktop_unittest.cc",
+    "focus_cycler_unittest.cc",
+    "frame/caption_buttons/frame_size_button_unittest.cc",
+    "host/ash_window_tree_host_x11_unittest.cc",
+    "magnifier/magnification_controller_unittest.cc",
+    "metrics/desktop_task_switch_metric_recorder_unittest.cc",
+    "metrics/task_switch_metrics_recorder_unittest.cc",
+    "metrics/task_switch_time_tracker_unittest.cc",
+    "metrics/user_metrics_recorder_unittest.cc",
+    "root_window_controller_unittest.cc",
+    "rotator/screen_rotation_animation_unittest.cc",
+    "screen_util_unittest.cc",
+    "shelf/shelf_layout_manager_unittest.cc",
+    "shelf/shelf_unittest.cc",
+    "shelf/shelf_view_unittest.cc",
+    "shelf/shelf_widget_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/video_activity_notifier_unittest.cc",
+    "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_environment_default.cc",
+    "test/ash_test_helper_unittest.cc",
+    "test/ash_unittests.cc",
+    "tooltips/tooltip_controller_unittest.cc",
+    "touch/touch_observer_hud_unittest.cc",
+    "touch/touch_transformer_controller_unittest.cc",
+    "touch/touchscreen_util_unittest.cc",
+    "utility/screenshot_controller_unittest.cc",
+    "virtual_keyboard_controller_unittest.cc",
+    "wm/always_on_top_controller_unittest.cc",
+    "wm/ash_focus_rules_unittest.cc",
+    "wm/ash_native_cursor_manager_unittest.cc",
+    "wm/dock/docked_window_layout_manager_unittest.cc",
+    "wm/dock/docked_window_resizer_unittest.cc",
+    "wm/drag_window_resizer_unittest.cc",
+    "wm/gestures/overview_gesture_handler_unittest.cc",
+    "wm/immersive_fullscreen_controller_unittest.cc",
+    "wm/lock_layout_manager_unittest.cc",
+    "wm/lock_state_controller_unittest.cc",
+    "wm/maximize_mode/accelerometer_test_data_literals.cc",
+    "wm/maximize_mode/maximize_mode_controller_unittest.cc",
+    "wm/maximize_mode/maximize_mode_window_manager_unittest.cc",
+    "wm/mru_window_tracker_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",
+    "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",
+    "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",
+    "wm/workspace/multi_window_resize_controller_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",
+  ]
+  configs += [
+    "//build/config:precompiled_headers",
+    "//build/config/compiler:no_size_t_to_int_warning",
+  ]
+
+  deps = [
+    ":ash",
+    ":ash_with_aura_test_support",
+    ":test_support_without_content",
+    "//ash/autoclick/common:autoclick",
+    "//ash/common/strings",
+    "//ash/public/cpp",
+    "//ash/resources",
+    "//ash/touch_hud",
+    "//base",
+    "//base/test:test_support",
+    "//components/signin/core/account_id",
+    "//components/user_manager",
+    "//mojo/edk/system",
+    "//skia",
+    "//testing/gmock",
+    "//testing/gtest",
     "//third_party/icu",
     "//ui/accessibility",
     "//ui/app_list/presenter",
@@ -376,54 +1584,33 @@ test("ash_unittests") {
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/keyboard",
-    "//ui/keyboard:keyboard_with_content",
     "//ui/message_center",
     "//ui/message_center:test_support",
     "//ui/resources",
     "//ui/strings",
     "//ui/views",
     "//ui/views:test_support",
-    "//ui/views/controls/webview:test_support",
-    "//ui/web_dialogs:test_support",
     "//ui/wm",
     "//ui/wm:test_support",
     "//url",
   ]
 
   data_deps = [
-    "//ash/strings:ash_test_strings",
+    "//ash/common/strings:ash_test_strings",
     "//ash/resources:ash_test_resources_100_percent",
     "//ash/resources:ash_test_resources_200_percent",
   ]
 
-  if (!is_chromeos) {
-    sources -= [
-      # TODO(zork): fix this test to build on Windows. See: crosbug.com/26906
-      "focus_cycler_unittest.cc",
-
-      # All tests for multiple displays: not supported on Windows Ash.
-      "wm/drag_window_resizer_unittest.cc",
-
-      # Maximize mode is only available on Chrome OS.
-      "wm/maximize_mode/maximize_mode_controller_unittest.cc",
-      "wm/maximize_mode/maximize_mode_window_manager_unittest.cc",
-
-      # Can't resize on Windows Ash. http://crbug.com/165962
-      "autoclick/autoclick_unittest.cc",
-      "magnifier/magnification_controller_unittest.cc",
-      "sticky_keys/sticky_keys_overlay_unittest.cc",
-      "virtual_keyboard_controller_unittest.cc",
-      "wm/workspace/workspace_window_resizer_unittest.cc",
-    ]
-  }
-
-  configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
-
   if (!use_x11) {
     sources -= [ "host/ash_window_tree_host_x11_unittest.cc" ]
   }
+
   if (is_chromeos) {
-    sources += [ "first_run/first_run_helper_unittest.cc" ]
+    sources += [
+      "first_run/first_run_helper_unittest.cc",
+      "laser/laser_pointer_controller_unittest.cc",
+      "magnifier/partial_magnification_controller_unittest.cc",
+    ]
     deps += [
       "//chromeos",
       "//chromeos:power_manager_proto",
@@ -431,7 +1618,7 @@ test("ash_unittests") {
       "//components/quirks",
       "//device/bluetooth",
       "//net:net",
-      "//ui/chromeos:ui_chromeos",
+      "//ui/chromeos",
       "//ui/display",
       "//ui/display:test_support",
       "//ui/display:test_util",
@@ -440,8 +1627,29 @@ test("ash_unittests") {
     sources -= [
       "accelerators/magnifier_key_scroller_unittest.cc",
       "accelerators/spoken_feedback_toggler_unittest.cc",
+
+      # Can't resize on Windows Ash. http://crbug.com/165962
+      "autoclick/autoclick_unittest.cc",
       "display/resolution_notification_controller_unittest.cc",
+
+      # TODO(zork): fix this test to build on Windows. See: crosbug.com/26906
+      "focus_cycler_unittest.cc",
+      "magnifier/magnification_controller_unittest.cc",
+      "sticky_keys/sticky_keys_overlay_unittest.cc",
+      "sticky_keys/sticky_keys_unittest.cc",
       "touch/touchscreen_util_unittest.cc",
+      "virtual_keyboard_controller_unittest.cc",
+
+      # All tests for multiple displays: not supported on Windows Ash.
+      "wm/drag_window_resizer_unittest.cc",
+
+      # Talks to ChromeOS system services.
+      "wm/lock_state_controller_unittest.cc",
+
+      # Maximize mode is only available on Chrome OS.
+      "wm/maximize_mode/maximize_mode_controller_unittest.cc",
+      "wm/maximize_mode/maximize_mode_window_manager_unittest.cc",
+      "wm/workspace/workspace_window_resizer_unittest.cc",
     ]
   }
 
@@ -449,9 +1657,8 @@ test("ash_unittests") {
     sources -= [ "touch/touch_transformer_controller_unittest.cc" ]
   }
 
-  if (!is_chromeos) {
-    sources -= [ "sticky_keys/sticky_keys_unittest.cc" ]
-  }
+  # Usage of content should be in ash_with_content.
+  assert_no_deps = [ "//content/*" ]
 }
 
 executable("ash_shell_with_content") {
@@ -471,8 +1678,8 @@ executable("ash_shell_with_content") {
   ]
 
   data_deps = [
-    "//ash/strings:ash_test_strings",
-    "//ash/resources:ash_test_resources_100_percent",
+    "//ash/common/strings:ash_test_strings",
+    "//ash/resources:ash_test_resources_with_content_100_percent",
     "//ash/resources:ash_test_resources_200_percent",
   ]
 
@@ -486,5 +1693,3 @@ executable("ash_shell_with_content") {
     deps += [ "//device/bluetooth" ]
   }
 }
-# When adding support for isolates, please have a look at run-time dependencies
-# in the ash_unittests_run target in ash.gyp.
diff --git a/chromium/ash/ash.gyp b/chromium/ash/ash.gyp
deleted file mode 100644
index e8046ab6a45..00000000000
--- a/chromium/ash/ash.gyp
+++ /dev/null
@@ -1,1462 +0,0 @@
-# Copyright (c) 2012 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.
-
-{
-  'variables': {
-    'chromium_code': 1,
-    # These files lists are shared with the GN build.
-    'ash_sources': [
-      'accelerators/accelerator_commands.cc',
-      'accelerators/accelerator_commands.h',
-      'accelerators/accelerator_controller.cc',
-      'accelerators/accelerator_controller.h',
-      'accelerators/accelerator_delegate.cc',
-      'accelerators/accelerator_delegate.h',
-      'accelerators/accelerator_table.cc',
-      'accelerators/accelerator_table.h',
-      'accelerators/debug_commands.cc',
-      'accelerators/debug_commands.h',
-      'accelerators/exit_warning_handler.cc',
-      'accelerators/exit_warning_handler.h',
-      'accelerators/focus_manager_factory.cc',
-      'accelerators/focus_manager_factory.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',
-      'app_list/app_list_presenter_delegate.cc',
-      'app_list/app_list_presenter_delegate.h',
-      'app_list/app_list_presenter_delegate_factory.cc',
-      'app_list/app_list_presenter_delegate_factory.h',
-      'ash_export.h',
-      'ash_touch_exploration_manager_chromeos.cc',
-      'ash_touch_exploration_manager_chromeos.h',
-      'audio/sounds.cc',
-      'audio/sounds.h',
-      'aura/aura_layout_manager_adapter.cc',
-      'aura/aura_layout_manager_adapter.h',
-      'aura/wm_lookup_aura.cc',
-      'aura/wm_lookup_aura.h',
-      'aura/wm_root_window_controller_aura.cc',
-      'aura/wm_root_window_controller_aura.h',
-      'aura/wm_shelf_aura.cc',
-      'aura/wm_shelf_aura.h',
-      'aura/wm_shell_aura.cc',
-      'aura/wm_shell_aura.h',
-      'aura/wm_window_aura.cc',
-      'aura/wm_window_aura.h',
-      'autoclick/autoclick_controller.cc',
-      'autoclick/autoclick_controller.h',
-      'cancel_mode.cc',
-      'cancel_mode.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_delegate.cc',
-      'common/cast_config_delegate.h',
-      'common/default_accessibility_delegate.cc',
-      'common/default_accessibility_delegate.h',
-      'common/display/display_info.cc',
-      'common/display/display_info.h',
-      'common/focus_cycler.cc',
-      'common/focus_cycler.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/metrics/user_metrics_action.h',
-      'common/root_window_controller_common.cc',
-      'common/root_window_controller_common.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/session/session_types.h',
-      'common/shelf/shelf_alignment_menu.cc',
-      'common/shelf/shelf_alignment_menu.h',
-      'common/shelf/shelf_constants.cc',
-      'common/shelf/shelf_constants.h',
-      'common/shelf/shelf_item_delegate.h',
-      'common/shelf/shelf_item_delegate_manager.cc',
-      'common/shelf/shelf_item_delegate_manager.h',
-      'common/shelf/shelf_item_types.cc',
-      'common/shelf/shelf_item_types.h',
-      'common/shelf/shelf_menu_model.h',
-      'common/shelf/shelf_model.cc',
-      'common/shelf/shelf_model.h',
-      'common/shelf/shelf_model_observer.h',
-      'common/shelf/shelf_types.h',
-      '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_window_ids.cc',
-      'common/shell_window_ids.h',
-      'common/system/accessibility_observer.h',
-      'common/system/audio/audio_observer.h',
-      'common/system/audio/tray_audio.cc',
-      'common/system/audio/tray_audio.h',
-      'common/system/audio/tray_audio_delegate.h',
-      'common/system/audio/volume_view.cc',
-      'common/system/audio/volume_view.h',
-      'common/system/cast/tray_cast.cc',
-      'common/system/cast/tray_cast.h',
-      'common/system/chromeos/audio/audio_detailed_view.cc',
-      'common/system/chromeos/audio/audio_detailed_view.h',
-      'common/system/chromeos/audio/tray_audio_chromeos.cc',
-      'common/system/chromeos/audio/tray_audio_chromeos.h',
-      'common/system/chromeos/audio/tray_audio_delegate_chromeos.cc',
-      'common/system/chromeos/audio/tray_audio_delegate_chromeos.h',
-      'common/system/chromeos/bluetooth/bluetooth_observer.h',
-      'common/system/chromeos/devicetype_utils.cc',
-      'common/system/chromeos/devicetype_utils.h',
-      'common/system/chromeos/enterprise/enterprise_domain_observer.h',
-      'common/system/chromeos/media_security/media_capture_observer.h',
-      'common/system/chromeos/network/network_detailed_view.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/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_sms.cc',
-      'common/system/chromeos/network/tray_sms.h',
-      'common/system/chromeos/network/tray_vpn.cc',
-      'common/system/chromeos/network/tray_vpn.h',
-      'common/system/chromeos/network/vpn_delegate.cc',
-      'common/system/chromeos/network/vpn_delegate.h',
-      'common/system/chromeos/network/vpn_list_view.cc',
-      'common/system/chromeos/network/vpn_list_view.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/shutdown_policy_observer.h',
-      'common/system/chromeos/system_clock_observer.cc',
-      'common/system/chromeos/system_clock_observer.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/tray_date.cc',
-      'common/system/date/tray_date.h',
-      'common/system/ime/ime_observer.h',
-      'common/system/ime/tray_ime_chromeos.cc',
-      'common/system/ime/tray_ime_chromeos.h',
-      'common/system/locale/locale_notification_controller.cc',
-      'common/system/locale/locale_notification_controller.h',
-      'common/system/locale/locale_observer.h',
-      'common/system/networking_config_delegate.cc',
-      'common/system/networking_config_delegate.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/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/fixed_sized_scroll_view.cc',
-      'common/system/tray/fixed_sized_scroll_view.h',
-      'common/system/tray/hover_highlight_view.cc',
-      'common/system/tray/hover_highlight_view.h',
-      'common/system/tray/label_tray_view.cc',
-      'common/system/tray/label_tray_view.h',
-      'common/system/tray/special_popup_row.cc',
-      'common/system/tray/special_popup_row.h',
-      'common/system/tray/system_tray_bubble.cc',
-      'common/system/tray/system_tray_bubble.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_bar_button_with_title.cc',
-      'common/system/tray/tray_bar_button_with_title.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_item_container.cc',
-      'common/system/tray/tray_popup_item_container.h',
-      'common/system/tray/tray_popup_label_button.cc',
-      'common/system/tray/tray_popup_label_button.h',
-      'common/system/tray/tray_popup_label_button_border.cc',
-      'common/system/tray/tray_popup_label_button_border.h',
-      'common/system/tray/tray_utils.cc',
-      'common/system/tray/tray_utils.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/update/update_observer.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_separator.cc',
-      'common/system/user/tray_user_separator.h',
-      'common/system/user/user_observer.h',
-      'common/system/volume_control_delegate.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/wm/always_on_top_controller.cc',
-      'common/wm/always_on_top_controller.h',
-      'common/wm/background_animator.cc',
-      'common/wm/background_animator.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/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/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_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/switchable_windows.cc',
-      'common/wm/switchable_windows.h',
-      'common/wm/window_animation_types.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/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_layout_manager.cc',
-      'common/wm/workspace/workspace_layout_manager.h',
-      'common/wm/workspace/workspace_layout_manager_backdrop_delegate.h',
-      'common/wm/workspace/workspace_layout_manager_delegate.h',
-      'common/wm/workspace/workspace_types.h',
-      'common/wm/workspace/workspace_window_resizer.cc',
-      'common/wm/workspace/workspace_window_resizer.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_root_window_controller.h',
-      'common/wm_root_window_controller_observer.h',
-      'common/wm_shell.cc',
-      'common/wm_shell.h',
-      'common/wm_window.h',
-      'common/wm_window_observer.h',
-      'common/wm_window_property.h',
-      'common/wm_window_tracker.h',
-      'debug.cc',
-      'debug.h',
-      'default_user_wallpaper_delegate.cc',
-      'default_user_wallpaper_delegate.h',
-      'desktop_background/desktop_background_controller.cc',
-      'desktop_background/desktop_background_controller.h',
-      'desktop_background/desktop_background_controller_observer.h',
-      'desktop_background/desktop_background_view.cc',
-      'desktop_background/desktop_background_view.h',
-      'desktop_background/desktop_background_widget_controller.cc',
-      'desktop_background/desktop_background_widget_controller.h',
-      'desktop_background/user_wallpaper_delegate.h',
-      'display/cursor_window_controller.cc',
-      'display/cursor_window_controller.h',
-      'display/display_animator.h',
-      'display/display_animator_chromeos.cc',
-      'display/display_animator_chromeos.h',
-      'display/display_change_observer_chromeos.cc',
-      'display/display_change_observer_chromeos.h',
-      'display/display_color_manager_chromeos.cc',
-      'display/display_color_manager_chromeos.h',
-      'display/display_configuration_controller.cc',
-      'display/display_configuration_controller.h',
-      'display/display_error_observer_chromeos.cc',
-      'display/display_error_observer_chromeos.h',
-      'display/display_layout_store.cc',
-      'display/display_layout_store.h',
-      'display/display_manager.cc',
-      'display/display_manager.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',
-      'display/mouse_cursor_event_filter.h',
-      'display/mouse_warp_controller.h',
-      'display/null_mouse_warp_controller.cc',
-      'display/null_mouse_warp_controller.h',
-      'display/projecting_observer_chromeos.cc',
-      'display/projecting_observer_chromeos.h',
-      'display/resolution_notification_controller.cc',
-      'display/resolution_notification_controller.h',
-      'display/root_window_transformers.cc',
-      'display/root_window_transformers.h',
-      'display/screen_ash.cc',
-      'display/screen_ash.h',
-      'display/screen_orientation_controller_chromeos.cc',
-      'display/screen_orientation_controller_chromeos.h',
-      'display/screen_position_controller.cc',
-      'display/screen_position_controller.h',
-      'display/shared_display_edge_indicator.cc',
-      'display/shared_display_edge_indicator.h',
-      'display/unified_mouse_warp_controller.cc',
-      'display/unified_mouse_warp_controller.h',
-      'display/window_tree_host_manager.cc',
-      'display/window_tree_host_manager.h',
-      'drag_drop/drag_drop_controller.cc',
-      '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',
-      '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_controller.cc',
-      'frame/frame_border_hit_test_controller.h',
-      'frame/header_painter.h',
-      'frame/header_painter_util.cc',
-      'frame/header_painter_util.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',
-      'host/ash_window_tree_host.h',
-      'host/ash_window_tree_host_init_params.cc',
-      'host/ash_window_tree_host_init_params.h',
-      'host/ash_window_tree_host_platform.cc',
-      'host/ash_window_tree_host_platform.h',
-      'host/ash_window_tree_host_unified.cc',
-      'host/ash_window_tree_host_unified.h',
-      'host/ash_window_tree_host_win.cc',
-      'host/ash_window_tree_host_win.h',
-      'host/ash_window_tree_host_x11.cc',
-      'host/ash_window_tree_host_x11.h',
-      'host/root_window_transformer.h',
-      'host/transformer_helper.cc',
-      'host/transformer_helper.h',
-      'ime/input_method_event_handler.cc',
-      'ime/input_method_event_handler.h',
-      'keyboard_uma_event_filter.cc',
-      'keyboard_uma_event_filter.h',
-      'link_handler_model.cc',
-      'link_handler_model.h',
-      'link_handler_model_factory.cc',
-      'link_handler_model_factory.h',
-      'magnifier/magnification_controller.cc',
-      'magnifier/magnification_controller.h',
-      'magnifier/partial_magnification_controller.cc',
-      'magnifier/partial_magnification_controller.h',
-      'metrics/desktop_task_switch_metric_recorder.cc',
-      'metrics/desktop_task_switch_metric_recorder.h',
-      'metrics/task_switch_metrics_recorder.cc',
-      'metrics/task_switch_metrics_recorder.h',
-      'metrics/task_switch_time_tracker.cc',
-      'metrics/task_switch_time_tracker.h',
-      'metrics/user_metrics_recorder.cc',
-      'metrics/user_metrics_recorder.h',
-      'multi_profile_uma.cc',
-      'multi_profile_uma.h',
-      'pointer_watcher_delegate.h',
-      'pointer_watcher_delegate_aura.cc',
-      'pointer_watcher_delegate_aura.h',
-      'popup_message.cc',
-      'popup_message.h',
-      'root_window_controller.cc',
-      'root_window_controller.h',
-      'root_window_settings.cc',
-      'root_window_settings.h',
-      'rotator/screen_rotation_animation.cc',
-      'rotator/screen_rotation_animation.h',
-      'rotator/screen_rotation_animator.cc',
-      'rotator/screen_rotation_animator.h',
-      'rotator/window_rotation.cc',
-      'rotator/window_rotation.h',
-      'scoped_target_root_window.cc',
-      'scoped_target_root_window.h',
-      'screen_util.cc',
-      'screen_util.h',
-      'screenshot_delegate.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/scoped_observer_with_duplicated_sources.h',
-      'shelf/shelf.cc',
-      'shelf/shelf.h',
-      'shelf/shelf_bezel_event_filter.cc',
-      'shelf/shelf_bezel_event_filter.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_delegate.h',
-      'shelf/shelf_icon_observer.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_navigator.cc',
-      'shelf/shelf_navigator.h',
-      'shelf/shelf_tooltip_manager.cc',
-      'shelf/shelf_tooltip_manager.h',
-      'shelf/shelf_util.cc',
-      'shelf/shelf_util.h',
-      'shelf/shelf_view.cc',
-      'shelf/shelf_view.h',
-      'shelf/shelf_widget.cc',
-      'shelf/shelf_widget.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',
-      'shell.cc',
-      'shell.h',
-      'shell_delegate.h',
-      'shell_factory.h',
-      'shell_init_params.cc',
-      'shell_init_params.h',
-      'snap_to_pixel_layout_manager.cc',
-      'snap_to_pixel_layout_manager.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/brightness_control_delegate.h',
-      'system/chromeos/bluetooth/bluetooth_notification_controller.cc',
-      'system/chromeos/bluetooth/bluetooth_notification_controller.h',
-      'system/chromeos/bluetooth/tray_bluetooth.cc',
-      'system/chromeos/bluetooth/tray_bluetooth.h',
-      'system/chromeos/brightness/brightness_controller_chromeos.cc',
-      'system/chromeos/brightness/brightness_controller_chromeos.h',
-      'system/chromeos/brightness/tray_brightness.cc',
-      'system/chromeos/brightness/tray_brightness.h',
-      'system/chromeos/enterprise/tray_enterprise.cc',
-      'system/chromeos/enterprise/tray_enterprise.h',
-      'system/chromeos/keyboard_brightness_controller.cc',
-      'system/chromeos/keyboard_brightness_controller.h',
-      'system/chromeos/media_security/multi_profile_media_tray_item.cc',
-      'system/chromeos/media_security/multi_profile_media_tray_item.h',
-      'system/chromeos/multi_user/user_switch_util.cc',
-      'system/chromeos/multi_user/user_switch_util.h',
-      'system/chromeos/power/power_event_observer.cc',
-      'system/chromeos/power/power_event_observer.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/supervised/custodian_info_tray_observer.h',
-      'system/chromeos/supervised/tray_supervised_user.cc',
-      'system/chromeos/supervised/tray_supervised_user.h',
-      'system/chromeos/tray_caps_lock.cc',
-      'system/chromeos/tray_caps_lock.h',
-      'system/chromeos/tray_display.cc',
-      'system/chromeos/tray_display.h',
-      'system/keyboard_brightness/keyboard_brightness_control_delegate.h',
-      'system/overview/overview_button_tray.cc',
-      'system/overview/overview_button_tray.h',
-      'system/status_area_widget.cc',
-      'system/status_area_widget.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/system_tray.cc',
-      'system/tray/system_tray.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',
-      'touch/touch_hud_debug.cc',
-      'touch/touch_hud_debug.h',
-      'touch/touch_hud_projection.cc',
-      'touch/touch_hud_projection.h',
-      'touch/touch_observer_hud.cc',
-      'touch/touch_observer_hud.h',
-      'touch/touch_transformer_controller.cc',
-      'touch/touch_transformer_controller.h',
-      'touch/touch_uma.cc',
-      'touch/touch_uma.h',
-      'touch/touchscreen_util.cc',
-      'touch/touchscreen_util.h',
-      'utility/screenshot_controller.cc',
-      'utility/screenshot_controller.h',
-      'virtual_keyboard_controller.cc',
-      'virtual_keyboard_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/cursor_manager_chromeos.cc',
-      'wm/cursor_manager_chromeos.h',
-      'wm/dim_window.cc',
-      'wm/dim_window.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/gestures/overview_gesture_handler.cc',
-      'wm/gestures/overview_gesture_handler.h',
-      'wm/gestures/shelf_gesture_handler.cc',
-      'wm/gestures/shelf_gesture_handler.h',
-      'wm/immersive_fullscreen_controller.cc',
-      'wm/immersive_fullscreen_controller.h',
-      'wm/immersive_revealed_lock.cc',
-      'wm/immersive_revealed_lock.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_aura.cc',
-      'wm/maximize_mode/maximize_mode_event_handler_aura.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/overlay_event_filter.cc',
-      'wm/overlay_event_filter.h',
-      'wm/overview/scoped_overview_animation_settings_aura.cc',
-      'wm/overview/scoped_overview_animation_settings_aura.h',
-      'wm/overview/scoped_overview_animation_settings_factory_aura.cc',
-      'wm/overview/scoped_overview_animation_settings_factory_aura.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_window_event_handler.cc',
-      'wm/panels/panel_window_event_handler.h',
-      'wm/power_button_controller.cc',
-      'wm/power_button_controller.h',
-      'wm/resize_handle_window_targeter.cc',
-      'wm/resize_handle_window_targeter.h',
-      'wm/resize_shadow.cc',
-      'wm/resize_shadow.h',
-      'wm/resize_shadow_controller.cc',
-      'wm/resize_shadow_controller.h',
-      'wm/screen_dimmer.cc',
-      'wm/screen_dimmer.h',
-      'wm/screen_pinning_controller.cc',
-      'wm/screen_pinning_controller.h',
-      'wm/session_state_animator.cc',
-      'wm/session_state_animator.h',
-      'wm/session_state_animator_impl.cc',
-      'wm/session_state_animator_impl.h',
-      'wm/stacking_controller.cc',
-      'wm/stacking_controller.h',
-      'wm/status_area_layout_manager.cc',
-      'wm/status_area_layout_manager.h',
-      'wm/system_background_controller.cc',
-      'wm/system_background_controller.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/toplevel_window_event_handler.cc',
-      'wm/toplevel_window_event_handler.h',
-      'wm/video_detector.cc',
-      'wm/video_detector.h',
-      'wm/window_animations.cc',
-      'wm/window_animations.h',
-      'wm/window_cycle_controller.cc',
-      'wm/window_cycle_controller.h',
-      'wm/window_cycle_list.cc',
-      'wm/window_cycle_list.h',
-      'wm/window_properties.cc',
-      'wm/window_properties.h',
-      'wm/window_state_aura.cc',
-      'wm/window_state_aura.h',
-      'wm/window_util.cc',
-      'wm/window_util.h',
-      'wm/workspace/workspace_event_handler.cc',
-      'wm/workspace/workspace_event_handler.h',
-      'wm/workspace_controller.cc',
-      'wm/workspace_controller.h',
-    ],
-    'ash_with_content_sources': [
-      'content/ash_with_content_export.h',
-      'content/gpu_support_impl.cc',
-      'content/gpu_support_impl.h',
-      'content/keyboard_overlay/keyboard_overlay_delegate.cc',
-      'content/keyboard_overlay/keyboard_overlay_delegate.h',
-      'content/keyboard_overlay/keyboard_overlay_view.cc',
-      'content/keyboard_overlay/keyboard_overlay_view.h',
-      'content/screen_orientation_delegate_chromeos.cc',
-      'content/screen_orientation_delegate_chromeos.h',
-      'content/shell_content_state.cc',
-      'content/shell_content_state.h',
-    ],
-    'ash_test_support_sources': [
-      'desktop_background/desktop_background_controller_test_api.cc',
-      'desktop_background/desktop_background_controller_test_api.h',
-      'shell/toplevel_window.cc',
-      'shell/toplevel_window.h',
-      'test/ash_md_test_base.cc',
-      'test/ash_md_test_base.h',
-      'test/ash_test_base.cc',
-      'test/ash_test_base.h',
-      'test/ash_test_helper.cc',
-      'test/ash_test_helper.h',
-      'test/ash_test_views_delegate.cc',
-      'test/ash_test_views_delegate.h',
-      'test/child_modal_window.cc',
-      'test/child_modal_window.h',
-      'test/cursor_manager_test_api.cc',
-      'test/cursor_manager_test_api.h',
-      'test/display_manager_test_api.cc',
-      'test/display_manager_test_api.h',
-      'test/material_design_controller_test_api.cc',
-      'test/material_design_controller_test_api.h',
-      'test/mirror_window_test_api.cc',
-      'test/mirror_window_test_api.h',
-      'test/overflow_bubble_view_test_api.cc',
-      'test/overflow_bubble_view_test_api.h',
-      'test/shelf_button_pressed_metric_tracker_test_api.cc',
-      'test/shelf_button_pressed_metric_tracker_test_api.h',
-      'test/shelf_item_delegate_manager_test_api.cc',
-      'test/shelf_item_delegate_manager_test_api.h',
-      'test/shelf_test_api.h',
-      'test/shelf_view_test_api.cc',
-      'test/shelf_view_test_api.h',
-      'test/shell_test_api.cc',
-      'test/shell_test_api.h',
-      'test/status_area_widget_test_helper.cc',
-      'test/status_area_widget_test_helper.h',
-      'test/task_switch_time_tracker_test_api.cc',
-      'test/task_switch_time_tracker_test_api.h',
-      'test/test_activation_delegate.cc',
-      'test/test_activation_delegate.h',
-      'test/test_keyboard_ui.cc',
-      'test/test_keyboard_ui.h',
-      'test/test_lock_state_controller_delegate.cc',
-      'test/test_lock_state_controller_delegate.h',
-      'test/test_overlay_delegate.cc',
-      'test/test_overlay_delegate.h',
-      'test/test_screenshot_delegate.cc',
-      'test/test_screenshot_delegate.h',
-      'test/test_session_state_animator.cc',
-      'test/test_session_state_animator.h',
-      'test/test_session_state_delegate.cc',
-      'test/test_session_state_delegate.h',
-      'test/test_shelf_delegate.cc',
-      'test/test_shelf_delegate.h',
-      'test/test_shelf_item_delegate.cc',
-      'test/test_shelf_item_delegate.h',
-      'test/test_shell_delegate.cc',
-      'test/test_shell_delegate.h',
-      'test/test_suite.cc',
-      'test/test_suite.h',
-      'test/test_suite_init.h',
-      'test/test_suite_init.mm',
-      'test/test_system_tray_delegate.cc',
-      'test/test_system_tray_delegate.h',
-      'test/test_system_tray_item.cc',
-      'test/test_system_tray_item.h',
-      'test/test_user_wallpaper_delegate.cc',
-      'test/test_user_wallpaper_delegate.h',
-      'test/test_volume_control_delegate.cc',
-      'test/test_volume_control_delegate.h',
-      'test/tray_cast_test_api.cc',
-      'test/tray_cast_test_api.h',
-      'test/ui_controls_factory_ash.cc',
-      'test/ui_controls_factory_ash.h',
-      'test/user_metrics_recorder_test_api.cc',
-      'test/user_metrics_recorder_test_api.h',
-      'test/virtual_keyboard_test_helper.cc',
-      'test/virtual_keyboard_test_helper.h',
-    ],
-    'ash_test_support_with_content_sources': [
-      'test/content/test_shell_content_state.cc',
-      'test/content/test_shell_content_state.h',
-    ],
-    'ash_shell_lib_sources': [
-      '../ui/views/test/test_views_delegate_aura.cc',
-      'shell/app_list.cc',
-      'shell/bubble.cc',
-      'shell/context_menu.cc',
-      'shell/context_menu.h',
-      'shell/example_factory.h',
-      'shell/lock_view.cc',
-      'shell/panel_window.cc',
-      'shell/panel_window.h',
-      'shell/shelf_delegate_impl.cc',
-      'shell/shelf_delegate_impl.h',
-      'shell/shell_delegate_impl.cc',
-      'shell/shell_delegate_impl.h',
-      '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',
-      'shell/window_watcher_shelf_item_delegate.h',
-    ],
-    'ash_shell_with_content_lib_sources': [
-      'shell/content/client/shell_browser_main_parts.cc',
-      'shell/content/client/shell_browser_main_parts.h',
-      'shell/content/client/shell_content_browser_client.cc',
-      'shell/content/client/shell_content_browser_client.h',
-      'shell/content/client/shell_main_delegate.cc',
-      'shell/content/client/shell_main_delegate.h',
-      'shell/content/shell_content_state_impl.cc',
-      'shell/content/shell_content_state_impl.h',
-    ],
-    'ash_unittests_sources': [
-      'accelerators/accelerator_commands_unittest.cc',
-      'accelerators/accelerator_controller_unittest.cc',
-      'accelerators/accelerator_filter_unittest.cc',
-      'accelerators/accelerator_table_unittest.cc',
-      'accelerators/magnifier_key_scroller_unittest.cc',
-      'accelerators/spoken_feedback_toggler_unittest.cc',
-      'app_list/app_list_presenter_delegate_unittest.cc',
-      'ash_touch_exploration_manager_chromeos_unittest.cc',
-      'autoclick/autoclick_unittest.cc',
-      'common/display/display_info_unittest.cc',
-      'common/material_design/material_design_controller_unittest.cc',
-      'common/shelf/shelf_model_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/date/date_view_unittest.cc',
-      'common/system/ime/tray_ime_chromeos_unittest.cc',
-      'common/system/tray/tray_details_view_unittest.cc',
-      'common/system/update/tray_update_unittest.cc',
-      'common/wm/overview/cleanup_animation_observer_unittest.cc',
-      'content/display/screen_orientation_controller_chromeos_unittest.cc',
-      'content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc',
-      'content/keyboard_overlay/keyboard_overlay_view_unittest.cc',
-      'desktop_background/desktop_background_controller_unittest.cc',
-      'dip_unittest.cc',
-      'display/cursor_window_controller_unittest.cc',
-      'display/display_change_observer_chromeos_unittest.cc',
-      'display/display_color_manager_chromeos_unittest.cc',
-      'display/display_error_observer_chromeos_unittest.cc',
-      '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',
-      'display/resolution_notification_controller_unittest.cc',
-      'display/root_window_transformers_unittest.cc',
-      'display/screen_ash_unittest.cc',
-      'display/screen_position_controller_unittest.cc',
-      'display/unified_mouse_warp_controller_unittest.cc',
-      'display/window_tree_host_manager_unittest.cc',
-      'drag_drop/drag_drop_controller_unittest.cc',
-      'drag_drop/drag_drop_tracker_unittest.cc',
-      'extended_desktop_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',
-      'host/ash_window_tree_host_x11_unittest.cc',
-      'magnifier/magnification_controller_unittest.cc',
-      'metrics/desktop_task_switch_metric_recorder_unittest.cc',
-      'metrics/task_switch_metrics_recorder_unittest.cc',
-      'metrics/task_switch_time_tracker_unittest.cc',
-      'metrics/user_metrics_recorder_unittest.cc',
-      'popup_message_unittest.cc',
-      'root_window_controller_unittest.cc',
-      'rotator/screen_rotation_animation_unittest.cc',
-      'screen_util_unittest.cc',
-      'shelf/scoped_observer_with_duplicated_sources_unittest.cc',
-      'shelf/shelf_button_pressed_metric_tracker_unittest.cc',
-      'shelf/shelf_layout_manager_unittest.cc',
-      'shelf/shelf_locking_manager_unittest.cc',
-      'shelf/shelf_navigator_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/brightness/tray_brightness_unittest.cc',
-      'system/chromeos/media_security/multi_profile_media_tray_item_unittest.cc',
-      'system/chromeos/multi_user/user_switch_util_unittest.cc',
-      'system/chromeos/power/power_event_observer_unittest.cc',
-      'system/chromeos/rotation/tray_rotation_lock_unittest.cc',
-      'system/chromeos/supervised/tray_supervised_user_unittest.cc',
-      'system/chromeos/tray_display_unittest.cc',
-      'system/overview/overview_button_tray_unittest.cc',
-      'system/toast/toast_manager_unittest.cc',
-      'system/tray/system_tray_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',
-      'test/ash_unittests.cc',
-      'tooltips/tooltip_controller_unittest.cc',
-      'touch/touch_observer_hud_unittest.cc',
-      'touch/touch_transformer_controller_unittest.cc',
-      'touch/touchscreen_util_unittest.cc',
-      'utility/screenshot_controller_unittest.cc',
-      'virtual_keyboard_controller_unittest.cc',
-      'wm/always_on_top_controller_unittest.cc',
-      'wm/ash_focus_rules_unittest.cc',
-      'wm/ash_native_cursor_manager_unittest.cc',
-      'wm/dock/docked_window_layout_manager_unittest.cc',
-      'wm/dock/docked_window_resizer_unittest.cc',
-      'wm/drag_window_resizer_unittest.cc',
-      'wm/gestures/overview_gesture_handler_unittest.cc',
-      'wm/immersive_fullscreen_controller_unittest.cc',
-      'wm/lock_layout_manager_unittest.cc',
-      'wm/lock_state_controller_unittest.cc',
-      'wm/maximize_mode/accelerometer_test_data_literals.cc',
-      'wm/maximize_mode/maximize_mode_controller_unittest.cc',
-      'wm/maximize_mode/maximize_mode_window_manager_unittest.cc',
-      'wm/mru_window_tracker_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',
-      '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',
-      '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',
-      'wm/workspace/multi_window_resize_controller_unittest.cc',
-      'wm/workspace/workspace_event_handler_test_helper.cc',
-      'wm/workspace/workspace_event_handler_test_helper.h',
-      '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',
-    ],
-  },
-  'targets': [
-    {
-      # GN version: //ash
-      'target_name': 'ash',
-      'type': '<(component)',
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../base/base.gyp:base_i18n',
-        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '../cc/cc.gyp:cc',
-        '../components/components.gyp:device_event_log_component',
-        '../components/components.gyp:onc_component',
-        '../components/components.gyp:signin_core_account_id',
-        '../components/components.gyp:user_manager',
-        '../components/components.gyp:wallpaper',
-        '../media/media.gyp:media',
-        '../net/net.gyp:net',
-        '../skia/skia.gyp:skia',
-        '../third_party/icu/icu.gyp:icui18n',
-        '../third_party/icu/icu.gyp:icuuc',
-        '../ui/accessibility/accessibility.gyp:accessibility',
-        '../ui/app_list/app_list.gyp:app_list',
-        '../ui/app_list/presenter/app_list_presenter.gyp:app_list_presenter',
-        '../ui/aura/aura.gyp:aura',
-        '../ui/base/ime/ui_base_ime.gyp:ui_base_ime',
-        '../ui/base/ui_base.gyp:ui_base',
-        '../ui/base/ui_base.gyp:ui_data_pack',
-        '../ui/compositor/compositor.gyp:compositor',
-        '../ui/display/display.gyp:display',
-        '../ui/events/devices/events_devices.gyp:events_devices',
-        '../ui/events/events.gyp:events',
-        '../ui/events/events.gyp:events_base',
-        '../ui/events/events.gyp:gesture_detection',
-        '../ui/events/platform/events_platform.gyp:events_platform',
-        '../ui/gfx/gfx.gyp:gfx',
-        '../ui/gfx/gfx.gyp:gfx_geometry',
-        '../ui/gfx/gfx.gyp:gfx_range',
-        '../ui/gfx/gfx.gyp:gfx_vector_icons',
-        '../ui/keyboard/keyboard.gyp:keyboard',
-        '../ui/message_center/message_center.gyp:message_center',
-        '../ui/native_theme/native_theme.gyp:native_theme',
-        '../ui/platform_window/stub/stub_window.gyp:stub_window',
-        '../ui/resources/ui_resources.gyp:ui_resources',
-        '../ui/strings/ui_strings.gyp:ui_strings',
-        '../ui/views/views.gyp:views',
-        '../ui/wm/wm.gyp:wm',
-        '../url/url.gyp:url_lib',
-        'ash_resources.gyp:ash_resources',
-        'ash_strings.gyp:ash_strings',
-      ],
-      'defines': [
-        'ASH_IMPLEMENTATION',
-      ],
-      'sources': [
-        '<@(ash_sources)',
-      ],
-      'conditions': [
-        ['OS=="win"', {
-          'sources!': [
-            # Note: sources list duplicated in GN build.
-            "sticky_keys/sticky_keys_controller.cc",
-            "sticky_keys/sticky_keys_controller.h",
-          ],
-          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-          'msvs_disabled_warnings': [ 4267, ],
-        }],
-        ['use_x11==1', {
-          'dependencies': [
-            '../build/linux/system.gyp:x11',
-            '../build/linux/system.gyp:xfixes',
-            '../ui/base/x/ui_base_x.gyp:ui_base_x',
-            '../ui/events/devices/x11/events_devices_x11.gyp:events_devices_x11',
-            '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
-           ],
-        }],
-        ['use_ozone==1', {
-          'dependencies': [
-            '../ui/events/ozone/events_ozone.gyp:events_ozone',
-            '../ui/ozone/ozone.gyp:ozone',
-          ],
-        }],
-        ['chromeos==1', {
-          'dependencies': [
-            '../chromeos/chromeos.gyp:chromeos',
-            # Ash #includes power_supply_properties.pb.h directly.
-            '../chromeos/chromeos.gyp:power_manager_proto',
-            '../components/components.gyp:quirks',
-            '../device/bluetooth/bluetooth.gyp:device_bluetooth',
-            '../third_party/qcms/qcms.gyp:qcms',
-            '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources',
-            '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings',
-            '../ui/chromeos/ui_chromeos.gyp:ui_chromeos',
-            '../ui/display/display.gyp:display_util',
-          ],
-        }, { # else: chromeos!=1
-          'sources!': [
-            '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',
-            'display/resolution_notification_controller.cc',
-            'display/resolution_notification_controller.h',
-            'touch/touch_transformer_controller.cc',
-            'touch/touch_transformer_controller.h',
-            'touch/touchscreen_util.cc',
-            'touch/touchscreen_util.h',
-            'virtual_keyboard_controller.cc',
-            'virtual_keyboard_controller.h'
-          ],
-        }],
-      ],
-    },
-    {
-      # GN version: //ash:ash_with_content
-      'target_name': 'ash_with_content',
-      'type': '<(component)',
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '../content/content.gyp:content_browser',
-        '../ipc/ipc.gyp:ipc',
-        '../skia/skia.gyp:skia',
-        '../ui/aura/aura.gyp:aura',
-        '../ui/base/ui_base.gyp:ui_base',
-        '../ui/compositor/compositor.gyp:compositor',
-        '../ui/display/display.gyp:display',
-        '../ui/events/events.gyp:events',
-        '../ui/gfx/gfx.gyp:gfx',
-        '../ui/gfx/gfx.gyp:gfx_geometry',
-        '../ui/keyboard/keyboard.gyp:keyboard_with_content',
-        '../ui/resources/ui_resources.gyp:ui_resources',
-        '../ui/strings/ui_strings.gyp:ui_strings',
-        '../ui/views/controls/webview/webview.gyp:webview',
-        '../ui/views/views.gyp:views',
-        '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
-        '../url/url.gyp:url_lib',
-        'ash',
-        'ash_resources.gyp:ash_resources',
-        'ash_strings.gyp:ash_strings',
-      ],
-      'defines': [
-        'ASH_WITH_CONTENT_IMPLEMENTATION',
-      ],
-      'sources': [
-        '<@(ash_with_content_sources)',
-      ],
-    },
-    {
-      # GN version: //ash:test_support
-      'target_name': 'ash_test_support',
-      'type': 'static_library',
-      'dependencies': [
-        '../skia/skia.gyp:skia',
-        '../testing/gtest.gyp:gtest',
-        '../ui/accessibility/accessibility.gyp:ax_gen',
-        '../ui/app_list/app_list.gyp:app_list_test_support',
-        '../ui/app_list/presenter/app_list_presenter.gyp:app_list_presenter',
-        '../ui/events/devices/events_devices.gyp:events_devices',
-        '../ui/views/views.gyp:views_test_support',
-        'ash',
-        'ash_resources.gyp:ash_resources',
-        'ash_test_support_with_content',
-      ],
-      'sources': [
-        '<@(ash_test_support_sources)',
-      ],
-      'conditions': [
-        ['OS=="win"', {
-          'dependencies': [
-            '../ui/platform_window/win/win_window.gyp:win_window',
-          ],
-        }],
-      ],
-    },
-    {
-      # GN version: //ash:test_support_with_content
-      'target_name': 'ash_test_support_with_content',
-      'type': 'static_library',
-      'dependencies': [
-        '../skia/skia.gyp:skia',
-        'ash_with_content',
-      ],
-      'sources': [
-        '<@(ash_test_support_with_content_sources)',
-      ],
-    },
-    {
-      # GN version: //ash:interactive_ui_test_support
-      'target_name': 'ash_interactive_ui_test_support',
-      'type': 'static_library',
-      'dependencies': [
-        '../skia/skia.gyp:skia',
-        '../testing/gtest.gyp:gtest',
-        'ash',
-        'ash_test_support',
-      ],
-      'sources': [
-        'test/ash_interactive_ui_test_base.cc',
-        'test/ash_interactive_ui_test_base.h',
-      ],
-    },
-    {
-      # GN version: //ash:ash_unittests
-      'target_name': 'ash_unittests',
-      'type': 'executable',
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../base/base.gyp:test_support_base',
-        '../chrome/chrome_resources.gyp:packed_resources',
-        '../components/components.gyp:signin_core_account_id',
-        '../components/components.gyp:user_manager',
-        '../content/content.gyp:content_browser',
-        '../content/content_shell_and_tests.gyp:test_support_content',
-        '../skia/skia.gyp:skia',
-        '../testing/gmock.gyp:gmock',
-        '../testing/gtest.gyp:gtest',
-        '../third_party/icu/icu.gyp:icui18n',
-        '../third_party/icu/icu.gyp:icuuc',
-        '../ui/accessibility/accessibility.gyp:accessibility',
-        '../ui/app_list/app_list.gyp:app_list',
-        '../ui/app_list/presenter/app_list_presenter.gyp:app_list_presenter',
-        '../ui/aura/aura.gyp:aura',
-        '../ui/aura/aura.gyp:aura_test_support',
-        '../ui/base/ime/ui_base_ime.gyp:ui_base_ime',
-        '../ui/base/ui_base.gyp:ui_base',
-        '../ui/base/ui_base.gyp:ui_base_test_support',
-        '../ui/compositor/compositor.gyp:compositor',
-        '../ui/compositor/compositor.gyp:compositor_test_support',
-        '../ui/display/display.gyp:display',
-        '../ui/events/devices/events_devices.gyp:events_devices',
-        '../ui/events/events.gyp:events',
-        '../ui/events/events.gyp:events_test_support',
-        '../ui/events/events.gyp:gesture_detection',
-        '../ui/gfx/gfx.gyp:gfx',
-        '../ui/gfx/gfx.gyp:gfx_geometry',
-        '../ui/keyboard/keyboard.gyp:keyboard',
-        '../ui/keyboard/keyboard.gyp:keyboard_with_content',
-        '../ui/message_center/message_center.gyp:message_center',
-        '../ui/message_center/message_center.gyp:message_center_test_support',
-        '../ui/resources/ui_resources.gyp:ui_resources',
-        '../ui/views/controls/webview/webview_tests.gyp:webview_test_support',
-        '../ui/views/views.gyp:views',
-        '../ui/views/views.gyp:views_test_support',
-        '../ui/web_dialogs/web_dialogs.gyp:web_dialogs_test_support',
-        '../ui/wm/wm.gyp:wm',
-        '../ui/wm/wm.gyp:wm_test_support',
-        '../url/url.gyp:url_lib',
-        'ash',
-        'ash_resources.gyp:ash_resources',
-        'ash_resources.gyp:ash_test_resources_100_percent',
-        'ash_resources.gyp:ash_test_resources_200_percent',
-        'ash_strings.gyp:ash_strings',
-        'ash_strings.gyp:ash_test_strings',
-        'ash_test_support',
-        'ash_with_content',
-      ],
-      'sources': [
-        '<@(ash_unittests_sources)',
-      ],
-      'conditions': [
-        ['chromeos==0', {
-          'sources!': [
-            # TODO(zork): fix this test to build on Windows. See: crosbug.com/26906
-            'focus_cycler_unittest.cc',
-
-            # All tests for multiple displays: not supported on Windows Ash.
-            'wm/drag_window_resizer_unittest.cc',
-
-            # Can't resize on Windows Ash. http://crbug.com/165962
-            'autoclick/autoclick_unittest.cc',
-            'magnifier/magnification_controller_unittest.cc',
-            'sticky_keys/sticky_keys_overlay_unittest.cc',
-            'sticky_keys/sticky_keys_unittest.cc',
-            'system/chromeos/rotation/tray_rotation_lock_unittest.cc',
-            'virtual_keyboard_controller_unittest.cc',
-            'wm/maximize_mode/maximize_mode_controller_unittest.cc',
-            'wm/workspace/workspace_window_resizer_unittest.cc',
-          ],
-          'sources': [
-            '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc',
-          ],
-          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-          'msvs_disabled_warnings': [ 4267, ],
-        }],
-        ['chromeos==1', {
-          'dependencies': [
-            '../chromeos/chromeos.gyp:chromeos_test_support_without_gmock',
-            '../chromeos/chromeos.gyp:power_manager_proto',
-            '../components/components.gyp:quirks',
-            '../device/bluetooth/bluetooth.gyp:device_bluetooth',
-            '../ui/display/display.gyp:display_test_support',
-            '../ui/display/display.gyp:display_test_util',
-            '../ui/display/display.gyp:display_types',
-          ],
-          'sources': [
-            'first_run/first_run_helper_unittest.cc',
-          ],
-        }, { # else: chromeos!=1
-          'sources!': [
-            'accelerators/magnifier_key_scroller_unittest.cc',
-            'accelerators/spoken_feedback_toggler_unittest.cc',
-            'display/resolution_notification_controller_unittest.cc',
-            'touch/touch_transformer_controller_unittest.cc',
-            'touch/touchscreen_util_unittest.cc',
-          ],
-        }],
-      ],
-    },
-    {
-      # GN version: //ash:ash_shell_lib
-      'target_name': 'ash_shell_lib',
-      'type': 'static_library',
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../base/base.gyp:base_i18n',
-        '../chrome/chrome_resources.gyp:packed_resources',
-        '../skia/skia.gyp:skia',
-        '../third_party/icu/icu.gyp:icui18n',
-        '../third_party/icu/icu.gyp:icuuc',
-        '../ui/app_list/app_list.gyp:app_list',
-        '../ui/app_list/presenter/app_list_presenter.gyp:app_list_presenter',
-        '../ui/aura/aura.gyp:aura',
-        '../ui/base/ime/ui_base_ime.gyp:ui_base_ime',
-        '../ui/base/ui_base.gyp:ui_base',
-        '../ui/compositor/compositor.gyp:compositor',
-        '../ui/events/events.gyp:events',
-        '../ui/gfx/gfx.gyp:gfx',
-        '../ui/gfx/gfx.gyp:gfx_geometry',
-        '../ui/keyboard/keyboard.gyp:keyboard',
-        '../ui/keyboard/keyboard.gyp:keyboard_with_content',
-        '../ui/message_center/message_center.gyp:message_center',
-        '../ui/resources/ui_resources.gyp:ui_resources',
-        '../ui/views/examples/examples.gyp:views_examples_lib',
-        '../ui/views/examples/examples.gyp:views_examples_with_content_lib',
-        '../ui/views/views.gyp:views',
-        '../ui/views/views.gyp:views_test_support',
-        'ash',
-        'ash_resources.gyp:ash_resources',
-        'ash_strings.gyp:ash_strings',
-        'ash_test_support',
-        'ash_with_content',
-      ],
-      'sources': [
-        '<@(ash_shell_lib_sources)',
-      ],
-    },
-    {
-      # GN version: //ash:ash_shell_lib_with_content
-      'target_name': 'ash_shell_lib_with_content',
-      'type': 'static_library',
-      'dependencies': [
-        'ash_shell_lib',
-        '../content/content_shell_and_tests.gyp:content_shell_lib',
-        '../content/content.gyp:content',
-        '../skia/skia.gyp:skia',
-      ],
-      'sources': [
-        '<@(ash_shell_with_content_lib_sources)',
-      ],
-      'conditions': [
-        ['OS=="win"', {
-          'dependencies': [
-            '../content/content.gyp:sandbox_helper_win',
-          ],
-        }],
-      ],
-    },
-    {
-      # GN version: //ash:ash_shell_with_content
-      'target_name': 'ash_shell_with_content',
-      'type': 'executable',
-      'dependencies': [
-        'ash_shell_lib_with_content',
-        '../components/components.gyp:user_manager',
-      ],
-      'sources': [
-        'shell/content/shell_with_content_main.cc',
-      ],
-      'conditions': [
-        ['OS=="win"', {
-          'msvs_settings': {
-            'VCLinkerTool': {
-              'SubSystem': '2',  # Set /SUBSYSTEM:WINDOWS
-            },
-          },
-          'dependencies': [
-            '../sandbox/sandbox.gyp:sandbox',
-          ],
-        }],
-        ['chromeos==1', {
-          'dependencies': [
-            '../device/bluetooth/bluetooth.gyp:device_bluetooth',
-          ],
-        }],
-      ],
-    },
-  ],
-  'conditions': [
-    ['test_isolation_mode != "noop"', {
-      'targets': [
-        {
-          'target_name': 'ash_unittests_run',
-          'type': 'none',
-          'dependencies': [
-            'ash_unittests',
-          ],
-          'includes': [
-            '../build/isolate.gypi',
-          ],
-          'sources': [
-            'ash_unittests.isolate',
-          ],
-          'conditions': [
-            ['use_x11==1',
-              {
-                'dependencies': [
-                  '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
-                ],
-              }
-            ],
-          ],
-        },
-      ],
-    }],
-  ],
-}
diff --git a/chromium/ash/ash_resources.gyp b/chromium/ash/ash_resources.gyp
deleted file mode 100644
index cae3d14f988..00000000000
--- a/chromium/ash/ash_resources.gyp
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 2014 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.
-
-{
-  'targets': [
-    {
-      # GN version: //ash/resources
-      'target_name': 'ash_resources',
-      'type': 'none',
-      'variables': {
-        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ash/resources',
-      },
-      'actions': [
-        {
-          'action_name': 'ash_resources',
-          'variables': {
-            'grit_grd_file': 'resources/ash_resources.grd',
-          },
-          'includes': [ '../build/grit_action.gypi' ],
-        },
-      ],
-      'includes': [ '../build/grit_target.gypi' ],
-    },
-    {
-      # Creates a 100% pak file containing resources for ash_unittests, etc.
-      # TODO(msw): Use ui_test.pak instead of its pieces? (no 200% support?)
-      # TODO(msw): Add copy steps and mac handling like repack_ui_test_pack?
-      # GN version: //ash/resources:ash_test_resources_100_percent
-      'target_name': 'ash_test_resources_100_percent',
-      'type': 'none',
-      'dependencies': [
-        '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
-        'ash_resources',
-      ],
-      'actions': [
-        {
-          'action_name': 'repack_ash_test_resources',
-          'variables': {
-            'pak_output': '<(PRODUCT_DIR)/ash_test_resources_100_percent.pak',
-            'pak_inputs': [
-              '<(SHARED_INTERMEDIATE_DIR)/ash/resources/ash_resources_100_percent.pak',
-              '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak',
-              '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak',
-            ],
-            'conditions': [
-              ['chromeos==1', {
-                'pak_inputs': [
-                  '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources/ui_chromeos_resources_100_percent.pak',
-                ],
-              }],
-              ['toolkit_views==1', {
-                'pak_inputs': [
-                  # TODO(msw): This seems bad, but follows repack_ui_test_pack's example.
-                  '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak',
-                  '<(SHARED_INTERMEDIATE_DIR)/ui/app_list/resources/app_list_resources_100_percent.pak',
-                  '<(SHARED_INTERMEDIATE_DIR)/ui/views/resources/views_resources_100_percent.pak',
-                ],
-              }],
-            ],
-          },
-          'includes': [ '../build/repack_action.gypi' ],
-        },
-      ],
-      'conditions': [
-        ['chromeos==1', {
-          'dependencies': [
-            '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources',
-          ],
-        }],
-        ['toolkit_views==1', {
-          'dependencies': [
-            '<(DEPTH)/ui/views/resources/views_resources.gyp:views_resources',
-          ],
-        }],
-      ],
-    },
-    {
-      # Creates a 200% pak file containing resources for ash_unittests, etc.
-      # TODO(msw): Use ui_test.pak instead of its pieces? (no 200% support?)
-      # TODO(msw): Add copy steps and mac handling like repack_ui_test_pack?
-      # GN version: //ash/resources:ash_test_resources_200_percent
-      'target_name': 'ash_test_resources_200_percent',
-      'type': 'none',
-      'dependencies': [
-        '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
-        'ash_resources',
-      ],
-      'actions': [
-        {
-          'action_name': 'repack_ash_test_resources',
-          'variables': {
-            'pak_output': '<(PRODUCT_DIR)/ash_test_resources_200_percent.pak',
-            'pak_inputs': [
-              '<(SHARED_INTERMEDIATE_DIR)/ash/resources/ash_resources_200_percent.pak',
-              '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_200_percent.pak',
-            ],
-            'conditions': [
-              ['chromeos==1', {
-                'pak_inputs': [
-                  '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources/ui_chromeos_resources_200_percent.pak',
-                ],
-              }],
-              ['toolkit_views==1', {
-                'pak_inputs': [
-                  '<(SHARED_INTERMEDIATE_DIR)/ui/app_list/resources/app_list_resources_200_percent.pak',
-                  '<(SHARED_INTERMEDIATE_DIR)/ui/views/resources/views_resources_200_percent.pak',
-                ],
-              }],
-            ],
-          },
-          'includes': [ '../build/repack_action.gypi' ],
-        },
-      ],
-      'conditions': [
-        ['chromeos==1', {
-          'dependencies': [
-            '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources',
-          ],
-        }],
-        ['toolkit_views==1', {
-          'dependencies': [
-            '<(DEPTH)/ui/views/resources/views_resources.gyp:views_resources',
-          ],
-        }],
-      ],
-    },
-  ],
-}
diff --git a/chromium/ash/ash_strings.gyp b/chromium/ash/ash_strings.gyp
deleted file mode 100644
index 2865b5c16ef..00000000000
--- a/chromium/ash/ash_strings.gyp
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright (c) 2012 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.
-
-{
-  'targets': [
-    {
-      # GN version: //ash/strings
-      'target_name': 'ash_strings',
-      'type': 'none',
-      'variables': {
-        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ash/strings',
-      },
-      'actions': [
-        {
-          'action_name': 'generate_ash_strings',
-          'variables': {
-            'grit_grd_file': 'ash_strings.grd',
-          },
-          'includes': [ '../build/grit_action.gypi' ],
-        },
-      ],
-      'includes': [ '../build/grit_target.gypi' ],
-    },
-    {
-      # Creates a pak file containing strings for ash_unittests, etc.
-      # GN version: //ash/strings:ash_test_strings
-      'target_name': 'ash_test_strings',
-      'type': 'none',
-      'dependencies': [
-        '<(DEPTH)/ui/strings/ui_strings.gyp:ui_strings',
-        'ash_strings.gyp:ash_strings',
-      ],
-      'actions': [
-        {
-          'action_name': 'repack_ash_test_strings',
-          'variables': {
-            'pak_output': '<(PRODUCT_DIR)/ash_test_strings.pak',
-            'pak_inputs': [
-              '<(SHARED_INTERMEDIATE_DIR)/ash/strings/ash_strings_en-US.pak',
-              '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.pak',
-              '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
-            ],
-            'conditions': [
-              ['chromeos==1', {
-                'pak_inputs': [
-                  '<(SHARED_INTERMEDIATE_DIR)/device/bluetooth/strings/bluetooth_strings_en-US.pak',
-                  '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/strings/ui_chromeos_strings_en-US.pak',
-                ],
-              }],
-            ],
-          },
-          'includes': [ '../build/repack_action.gypi' ],
-        },
-      ],
-      'conditions': [
-        ['chromeos==1', {
-          'dependencies': [
-            '<(DEPTH)/device/bluetooth/bluetooth_strings.gyp:bluetooth_strings',
-            '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings',
-          ],
-        }],
-      ],
-    },
-  ],
-}
diff --git a/chromium/ash/ash_unittests.isolate b/chromium/ash/ash_unittests.isolate
deleted file mode 100644
index 418a78ee4bb..00000000000
--- a/chromium/ash/ash_unittests.isolate
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright (c) 2014 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.
-{
-  'variables': {
-    'files': [
-      '../testing/test_env.py',
-      '<(PRODUCT_DIR)/ash_test_resources_100_percent.pak',
-      '<(PRODUCT_DIR)/ash_test_resources_200_percent.pak',
-      '<(PRODUCT_DIR)/ash_test_strings.pak',
-      '<(PRODUCT_DIR)/keyboard_resources.pak',
-    ],
-  },
-  'conditions': [
-    ['use_x11==0', {
-      'variables': {
-        'command': [
-          '../testing/test_env.py',
-          '<(PRODUCT_DIR)/ash_unittests<(EXECUTABLE_SUFFIX)',
-          '--test-launcher-bot-mode',
-        ],
-      },
-    }],
-    ['use_x11==1', {
-      'variables': {
-        'command': [
-          '../testing/xvfb.py',
-          '<(PRODUCT_DIR)',
-          '<(PRODUCT_DIR)/ash_unittests',
-          '--test-launcher-bot-mode',
-        ],
-        'files': [
-          '../testing/xvfb.py',
-          '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
-        ],
-      },
-    }],
-    ['chromeos==1', {
-      'variables': {
-        'files': [
-          'display/test_data/'
-        ],
-      },
-    }],
-    ['OS=="linux"', {
-      'variables': {
-        'files': [
-          '<(PRODUCT_DIR)/libosmesa.so',
-        ],
-      },
-    }],
-    ['OS=="win"', {
-      'variables': {
-        'files': [
-          '<(PRODUCT_DIR)/osmesa.dll',
-        ],
-      },
-    }],
-  ],
-  'includes': [
-    '../base/base.isolate',
-    '../ui/gl/gl.isolate',
-  ],
-}
diff --git a/chromium/ash/autoclick/common/BUILD.gn b/chromium/ash/autoclick/common/BUILD.gn
new file mode 100644
index 00000000000..b33fab57dbd
--- /dev/null
+++ b/chromium/ash/autoclick/common/BUILD.gn
@@ -0,0 +1,28 @@
+# Copyright 2016 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/ui.gni")
+
+source_set("autoclick") {
+  sources = [
+    "autoclick_controller_common.cc",
+    "autoclick_controller_common.h",
+    "autoclick_controller_common_delegate.h",
+    "autoclick_ring_handler.cc",
+    "autoclick_ring_handler.h",
+  ]
+
+  deps = [
+    "//base",
+    "//skia",
+    "//ui/aura",
+    "//ui/compositor",
+    "//ui/display",
+    "//ui/events",
+    "//ui/gfx",
+    "//ui/gfx/geometry",
+    "//ui/views",
+    "//ui/wm",
+  ]
+}
diff --git a/chromium/ash/autoclick/mus/BUILD.gn b/chromium/ash/autoclick/mus/BUILD.gn
new file mode 100644
index 00000000000..140dd0e5f73
--- /dev/null
+++ b/chromium/ash/autoclick/mus/BUILD.gn
@@ -0,0 +1,61 @@
+# Copyright 2016 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/ui.gni")
+import("//services/shell/public/cpp/service.gni")
+import("//services/shell/public/service_manifest.gni")
+import("//mojo/public/tools/bindings/mojom.gni")
+
+source_set("lib") {
+  sources = [
+    "autoclick_application.cc",
+    "autoclick_application.h",
+  ]
+
+  deps = [
+    "//ash/autoclick/common:autoclick",
+    "//ash/autoclick/mus/public/interfaces",
+    "//ash/public/interfaces",
+    "//base",
+    "//mash/public/interfaces",
+    "//mojo/common",
+    "//mojo/public/cpp/bindings",
+    "//services/shell/public/cpp",
+    "//services/shell/public/cpp:sources",
+    "//services/ui/public/cpp",
+    "//services/ui/public/interfaces",
+    "//ui/views",
+    "//ui/views/mus:for_mojo_application",
+  ]
+
+  data_deps = [
+    "//services/ui",
+  ]
+}
+
+service("accessibility_autoclick") {
+  sources = [
+    "main.cc",
+  ]
+
+  deps = [
+    ":lib",
+    "//base",
+    "//mojo/public/cpp/bindings",
+    "//services/shell/public/cpp",
+    "//services/shell/public/cpp:sources",
+    "//ui/views/mus:for_mojo_application",
+  ]
+
+  resources = [ "$root_out_dir/views_mus_resources.pak" ]
+
+  data_deps = [
+    ":manifest",
+  ]
+}
+
+service_manifest("manifest") {
+  name = "accessibility_autoclick"
+  source = "manifest.json"
+}
diff --git a/chromium/ash/sysui/public/interfaces/BUILD.gn b/chromium/ash/autoclick/mus/public/interfaces/BUILD.gn
index 5dc80b1c58f..96676819b5f 100644
--- a/chromium/ash/sysui/public/interfaces/BUILD.gn
+++ b/chromium/ash/autoclick/mus/public/interfaces/BUILD.gn
@@ -6,10 +6,8 @@ import("//mojo/public/tools/bindings/mojom.gni")
 
 mojom("interfaces") {
   sources = [
-    "wallpaper.mojom",
+    "autoclick.mojom",
   ]
 
-  deps = [
-    "//skia/public/interfaces",
-  ]
+  use_new_wrapper_types = true
 }
diff --git a/chromium/ash/autoclick/mus/public/interfaces/autoclick.mojom b/chromium/ash/autoclick/mus/public/interfaces/autoclick.mojom
new file mode 100644
index 00000000000..93e1f0dc8f3
--- /dev/null
+++ b/chromium/ash/autoclick/mus/public/interfaces/autoclick.mojom
@@ -0,0 +1,11 @@
+// Copyright 2016 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.autoclick.mojom;
+
+// Used by Chrome to set the time to wait in milliseconds from when the mouse
+// stops moving to when the autoclick event is sent in accessibility_autoclick.
+interface AutoclickController {
+  SetAutoclickDelay(uint32 delay_in_milliseconds);
+};
diff --git a/chromium/ash/strings/BUILD.gn b/chromium/ash/common/strings/BUILD.gn
index 68f39cc8865..8ca655ab8bd 100644
--- a/chromium/ash/strings/BUILD.gn
+++ b/chromium/ash/common/strings/BUILD.gn
@@ -6,7 +6,7 @@ import("//tools/grit/grit_rule.gni")
 import("//tools/grit/repack.gni")
 
 grit("strings") {
-  source = "../ash_strings.grd"
+  source = "../../ash_strings.grd"
   outputs = [
     "grit/ash_strings.h",
     "ash_strings_am.pak",
@@ -66,29 +66,40 @@ grit("strings") {
   ]
 }
 
-# Creates a pak file containing strings for ash_unittests, etc.
-repack("ash_test_strings") {
-  output = "$root_build_dir/ash_test_strings.pak"
-
-  sources = [
-    "$root_gen_dir/ash/strings/ash_strings_en-US.pak",
-    "$root_gen_dir/ui/strings/app_locale_settings_en-US.pak",
-    "$root_gen_dir/ui/strings/ui_strings_en-US.pak",
-  ]
-
-  deps = [
-    "//ash/strings",
-    "//ui/strings",
-  ]
+# Creates locale-specific pak files with strings needed for ash_unittests, etc.
+template("repack_one_locale_ash") {
+  locale = invoker.locale
+  output = invoker.output
 
-  if (is_chromeos) {
-    sources += [
-      "$root_gen_dir/device/bluetooth/strings/bluetooth_strings_en-US.pak",
-      "$root_gen_dir/ui/chromeos/strings/ui_chromeos_strings_en-US.pak",
+  repack(target_name) {
+    # Each input pak file should also have a deps line for completeness.
+    sources = [
+      "$root_gen_dir/ash/common/strings/ash_strings_${locale}.pak",
+      "$root_gen_dir/ui/strings/app_locale_settings_${locale}.pak",
+      "$root_gen_dir/ui/strings/ui_strings_${locale}.pak",
     ]
-    deps += [
-      "//device/bluetooth/strings",
-      "//ui/chromeos/strings",
+
+    deps = [
+      "//ash/common/strings",
+      "//ui/strings:app_locale_settings",
+      "//ui/strings:ui_strings",
     ]
+
+    if (is_chromeos) {
+      sources += [
+        "$root_gen_dir/device/bluetooth/strings/bluetooth_strings_${locale}.pak",
+        "$root_gen_dir/ui/chromeos/strings/ui_chromeos_strings_${locale}.pak",
+      ]
+      deps += [
+        "//device/bluetooth/strings",
+        "//ui/chromeos/strings",
+      ]
+    }
   }
 }
+
+# Creates a pak file containing en-US strings for ash_unittests, etc.
+repack_one_locale_ash("ash_test_strings") {
+  output = "$root_build_dir/ash_test_strings.pak"
+  locale = "en-US"
+}
diff --git a/chromium/ash/mus/BUILD.gn b/chromium/ash/mus/BUILD.gn
index 97ff79b14f2..9becfce4efe 100644
--- a/chromium/ash/mus/BUILD.gn
+++ b/chromium/ash/mus/BUILD.gn
@@ -3,15 +3,27 @@
 # found in the LICENSE file.
 
 import("//build/config/ui.gni")
-import("//mojo/public/mojo_application.gni")
-import("//mojo/public/mojo_application_manifest.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
+import("//services/shell/public/cpp/service.gni")
+import("//services/shell/public/service_manifest.gni")
 import("//tools/grit/repack.gni")
 
 source_set("lib") {
   sources = [
-    "accelerator_registrar_impl.cc",
-    "accelerator_registrar_impl.h",
+    "accelerators/accelerator_controller_delegate_mus.cc",
+    "accelerators/accelerator_controller_delegate_mus.h",
+    "accelerators/accelerator_controller_registrar.cc",
+    "accelerators/accelerator_controller_registrar.h",
+    "accelerators/accelerator_handler.h",
+    "accelerators/accelerator_ids.h",
+    "accelerators/accelerator_registrar_impl.cc",
+    "accelerators/accelerator_registrar_impl.h",
+    "accessibility_delegate_mus.cc",
+    "accessibility_delegate_mus.h",
+    "app_list_presenter_mus.cc",
+    "app_list_presenter_mus.h",
+    "bridge/immersive_handler_factory_mus.cc",
+    "bridge/immersive_handler_factory_mus.h",
     "bridge/mus_layout_manager_adapter.cc",
     "bridge/mus_layout_manager_adapter.h",
     "bridge/wm_lookup_mus.cc",
@@ -24,30 +36,31 @@ source_set("lib") {
     "bridge/wm_shell_mus.h",
     "bridge/wm_window_mus.cc",
     "bridge/wm_window_mus.h",
+    "bridge/workspace_event_handler_mus.cc",
+    "bridge/workspace_event_handler_mus.h",
     "container_ids.cc",
     "container_ids.h",
+    "context_menu_mus.cc",
+    "context_menu_mus.h",
     "disconnected_app_handler.cc",
     "disconnected_app_handler.h",
     "drag_window_resizer.cc",
     "drag_window_resizer.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/default_header_painter.cc",
-    "frame/default_header_painter.h",
-    "frame/frame_border_hit_test_controller.cc",
-    "frame/frame_border_hit_test_controller.h",
-    "frame/header_painter.h",
-    "frame/header_painter_util.cc",
-    "frame/header_painter_util.h",
-    "frame/move_event_handler.cc",
-    "frame/move_event_handler.h",
-    "frame/non_client_frame_view_mash.cc",
-    "frame/non_client_frame_view_mash.h",
+    "frame/custom_frame_view_mus.cc",
+    "frame/custom_frame_view_mus.h",
+    "frame/detached_title_area_renderer.cc",
+    "frame/detached_title_area_renderer.h",
+    "frame/detached_title_area_renderer_host.h",
+    "keyboard_ui_mus.cc",
+    "keyboard_ui_mus.h",
     "layout_manager.cc",
     "layout_manager.h",
+    "move_event_handler.cc",
+    "move_event_handler.h",
+    "native_widget_factory_mus.cc",
+    "native_widget_factory_mus.h",
+    "new_window_delegate_mus.cc",
+    "new_window_delegate_mus.h",
     "non_client_frame_controller.cc",
     "non_client_frame_controller.h",
     "property_util.cc",
@@ -60,15 +73,12 @@ source_set("lib") {
     "shadow.h",
     "shadow_controller.cc",
     "shadow_controller.h",
-    "shelf_layout_impl.cc",
-    "shelf_layout_impl.h",
-    "shelf_layout_manager.cc",
-    "shelf_layout_manager.h",
-    "shelf_layout_manager_delegate.h",
-    "status_layout_manager.cc",
-    "status_layout_manager.h",
-    "user_window_controller_impl.cc",
-    "user_window_controller_impl.h",
+    "shelf_delegate_mus.cc",
+    "shelf_delegate_mus.h",
+    "shell_delegate_mus.cc",
+    "shell_delegate_mus.h",
+    "wallpaper_delegate_mus.cc",
+    "wallpaper_delegate_mus.h",
     "window_manager.cc",
     "window_manager.h",
     "window_manager_application.cc",
@@ -76,25 +86,34 @@ source_set("lib") {
     "window_manager_observer.h",
   ]
 
+  defines = [ "NOTIMPLEMENTED_POLICY=5" ]
+
   deps = [
     "//components/user_manager",
+    "//components/wallpaper",
+    "//ui/app_list/presenter",
+    "//ui/app_list/presenter:mojom",
+    "//ui/keyboard",
+    "//ui/keyboard:mojom",
+    "//ui/message_center",
   ]
 
   public_deps = [
     "//ash",
-    "//ash/mus/resources",
     "//ash/public/interfaces",
     "//base",
-    "//components/mus/common:mus_common",
-    "//components/mus/public/cpp",
-    "//components/mus/public/interfaces",
+    "//base:i18n",
+    "//mash/public/interfaces",
     "//mash/session/public/interfaces",
     "//mojo/common:common_base",
     "//services/shell/public/cpp",
     "//services/tracing/public/cpp",
+    "//services/ui/common:mus_common",
+    "//services/ui/public/cpp",
+    "//services/ui/public/interfaces",
+    "//services/ui/public/interfaces/display",
     "//skia",
     "//ui/aura",
-    "//ui/display/mojo",
     "//ui/events",
     "//ui/gfx",
     "//ui/gfx/geometry",
@@ -103,10 +122,31 @@ source_set("lib") {
     "//ui/strings",
     "//ui/views",
     "//ui/views/mus:for_mojo_application",
+    "//ui/wm",
+  ]
+
+  data_deps = [
+    "//ash/touch_hud/mus:touch_hud",
   ]
+
+  if (is_chromeos) {
+    sources += [
+      "system_tray_delegate_mus.cc",
+      "system_tray_delegate_mus.h",
+      "vpn_delegate_mus.cc",
+      "vpn_delegate_mus.h",
+    ]
+
+    deps += [
+      "//chromeos",
+      "//chromeos:power_manager_proto",
+      "//device/bluetooth",
+      "//ui/chromeos",
+    ]
+  }
 }
 
-mojo_native_application("mus") {
+service("mus") {
   output_name = "ash"
 
   sources = [
@@ -116,6 +156,7 @@ mojo_native_application("mus") {
   deps = [
     ":lib",
     ":resources",
+    ":resources_200",
     "//services/shell/public/cpp",
   ]
 
@@ -123,51 +164,94 @@ mojo_native_application("mus") {
   #             can't state that dependency here.
   data_deps = [
     ":manifest",
-    "//components/mus",
+    "//services/ui",
   ]
 
-  resources = [ "$root_out_dir/ash_mus_resources.pak" ]
+  resources = [
+    "$root_out_dir/ash_mus_resources.pak",
+    "$root_out_dir/ash_mus_resources_200.pak",
+  ]
 }
 
-mojo_application_manifest("manifest") {
-  application_name = "ash"
+service_manifest("manifest") {
+  name = "ash"
   source = "manifest.json"
 }
 
+# TODO: Load locale-specific strings.
+# TODO: Avoid duplication between Mash and Chrome pak files: crbug.com/628715.
 repack("resources") {
+  output = "$root_out_dir/ash_mus_resources.pak"
   sources = [
-    "$root_gen_dir/ash/mus/resources/ash_mus_resources_100_percent.pak",
+    "$root_gen_dir/ash/common/strings/ash_strings_en-US.pak",
     "$root_gen_dir/ash/resources/ash_resources_100_percent.pak",
     "$root_gen_dir/ui/resources/ui_resources_100_percent.pak",
     "$root_gen_dir/ui/strings/app_locale_settings_en-US.pak",
     "$root_gen_dir/ui/strings/ui_strings_en-US.pak",
     "$root_gen_dir/ui/views/resources/views_resources_100_percent.pak",
   ]
-  output = "$root_out_dir/ash_mus_resources.pak"
   deps = [
-    "//ash/mus/resources",
+    "//ash/common/strings",
     "//ash/resources",
     "//ui/resources",
     "//ui/strings",
     "//ui/views/mus:resources",
     "//ui/views/resources",
   ]
+
+  if (is_chromeos) {
+    sources += [
+      "$root_gen_dir/ui/chromeos/resources/ui_chromeos_resources_100_percent.pak",
+      "$root_gen_dir/ui/chromeos/strings/ui_chromeos_strings_en-US.pak",
+    ]
+    deps += [
+      "//ui/chromeos/resources",
+      "//ui/chromeos/strings",
+    ]
+  }
+}
+
+repack("resources_200") {
+  output = "$root_out_dir/ash_mus_resources_200.pak"
+  sources = [
+    "$root_gen_dir/ash/resources/ash_resources_200_percent.pak",
+    "$root_gen_dir/ui/resources/ui_resources_200_percent.pak",
+    "$root_gen_dir/ui/views/resources/views_resources_200_percent.pak",
+  ]
+  deps = [
+    "//ash/resources",
+    "//ui/resources",
+    "//ui/views/resources",
+  ]
+
+  if (is_chromeos) {
+    sources += [ "$root_gen_dir/ui/chromeos/resources/ui_chromeos_resources_200_percent.pak" ]
+    deps += [ "//ui/chromeos/resources" ]
+  }
 }
 
 source_set("unittests") {
   testonly = true
 
   sources = [
-    "accelerator_registrar_unittest.cc",
+    "../common/wm_window_unittest.cc",
+    "accelerators/accelerator_controller_registrar_test_api.cc",
+    "accelerators/accelerator_controller_registrar_test_api.h",
+    "accelerators/accelerator_controller_unittest.cc",
+    "accelerators/accelerator_registrar_unittest.cc",
     "app_launch_unittest.cc",
+    "bridge/wm_shell_mus_test_api.h",
+    "bridge/wm_window_mus_test_api.h",
     "layout_manager_unittest.cc",
+    "root_window_controller_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",
-    "test/wm_test_screen.cc",
-    "test/wm_test_screen.h",
     "window_manager_unittest.cc",
+    "wm/container_finder_unittest.cc",
     "wm/mru_window_tracker_unittest.cc",
     "workspace/workspace_layout_manager_unittest.cc",
   ]
@@ -176,25 +260,31 @@ source_set("unittests") {
     ":lib",
     ":resources",
     "//ash",
+    "//ash:test_support_without_content",
     "//ash/public/interfaces",
     "//base",
     "//base/test:test_config",
-    "//components/mus/common:mus_common",
-    "//components/mus/public/cpp",
-    "//components/mus/public/cpp/tests:test_support",
-    "//components/mus/public/cpp/tests:unittest_support",
-    "//components/mus/public/interfaces",
+    "//base/test:test_support",
     "//mojo/public/cpp/system",
-    "//services/shell/public/cpp:shell_test_support",
+    "//services/shell/public/cpp:service_test_support",
+    "//services/ui/common:mus_common",
+    "//services/ui/public/cpp",
+    "//services/ui/public/cpp/tests:test_support",
+    "//services/ui/public/cpp/tests:unittest_support",
+    "//services/ui/public/interfaces",
     "//skia",
     "//testing/gtest",
     "//ui/aura",
     "//ui/base",
+    "//ui/base:test_support",
     "//ui/display",
     "//ui/events",
+    "//ui/events:test_support",
     "//ui/gfx:test_support",
     "//ui/gfx/geometry",
     "//ui/gfx/geometry/mojo",
+    "//ui/message_center",
+    "//ui/views:test_support",
     "//ui/views/mus",
   ]
 
@@ -202,4 +292,11 @@ source_set("unittests") {
     ":mus",
     "//mash/quick_launch",
   ]
+
+  defines = [ "NOTIMPLEMENTED_POLICY=5" ]
+
+  if (is_chromeos) {
+    sources +=
+        [ "../common/system/chromeos/brightness/tray_brightness_unittest.cc" ]
+  }
 }
diff --git a/chromium/ash/mus/resources/BUILD.gn b/chromium/ash/mus/resources/BUILD.gn
deleted file mode 100644
index 9ae798b5694..00000000000
--- a/chromium/ash/mus/resources/BUILD.gn
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2015 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("//tools/grit/grit_rule.gni")
-
-grit("resources") {
-  source = "ash_mus_resources.grd"
-  outputs = [
-    "grit/ash_mus_resources.h",
-    "ash_mus_resources_100_percent.pak",
-    "ash_mus_resources_200_percent.pak",
-  ]
-}
diff --git a/chromium/ash/public/cpp/BUILD.gn b/chromium/ash/public/cpp/BUILD.gn
new file mode 100644
index 00000000000..ea64e0fbe9c
--- /dev/null
+++ b/chromium/ash/public/cpp/BUILD.gn
@@ -0,0 +1,10 @@
+# Copyright 2016 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.
+
+# C++ headers and sources that can be used outside ash.
+source_set("cpp") {
+  sources = [
+    "shelf_types.h",
+  ]
+}
diff --git a/chromium/ash/public/interfaces/BUILD.gn b/chromium/ash/public/interfaces/BUILD.gn
index 2c60c4caef2..0570864ba57 100644
--- a/chromium/ash/public/interfaces/BUILD.gn
+++ b/chromium/ash/public/interfaces/BUILD.gn
@@ -8,11 +8,12 @@ mojom("interfaces") {
   sources = [
     "ash_window_type.mojom",
     "container.mojom",
-    "shelf_layout.mojom",
-    "user_window_controller.mojom",
+    "shelf.mojom",
+    "system_tray.mojom",
+    "wallpaper.mojom",
   ]
 
   public_deps = [
-    "//mash/shelf/public/interfaces",
+    "//skia/public/interfaces",
   ]
 }
diff --git a/chromium/ash/public/interfaces/container.mojom b/chromium/ash/public/interfaces/container.mojom
index e0269a118d6..f363d7fa7ed 100644
--- a/chromium/ash/public/interfaces/container.mojom
+++ b/chromium/ash/public/interfaces/container.mojom
@@ -10,7 +10,7 @@ module ash.mojom;
 // that other apps may need to parent windows to.
 enum Container {
   // TODO: remove everything but LOGIN_WINDOWS, http://crbug.com/616859.
-  USER_BACKGROUND,
+  WALLPAPER,
   USER_PRIVATE_SHELF,
   LOGIN_WINDOWS,
   // Status area widget and message center notification popups.
@@ -20,6 +20,7 @@ enum Container {
   BUBBLES,
   MENUS,
   DRAG_AND_TOOLTIPS,
+  OVERLAY,
 };
 
 const string kWindowContainer_Property = "ash:window-container";
diff --git a/chromium/ash/public/interfaces/shelf.mojom b/chromium/ash/public/interfaces/shelf.mojom
new file mode 100644
index 00000000000..020a5577d5b
--- /dev/null
+++ b/chromium/ash/public/interfaces/shelf.mojom
@@ -0,0 +1,80 @@
+// Copyright 2016 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 "skia/public/interfaces/bitmap.mojom";
+
+// These values match ash::ShelfAlignment.
+enum ShelfAlignment { BOTTOM, LEFT, RIGHT, BOTTOM_LOCKED, };
+
+// These values match ash::ShelfAutoHideBehavior.
+enum ShelfAutoHideBehavior { ALWAYS, NEVER, HIDDEN, };
+
+// The Shelf controller allows clients (eg. Chrome) to control the ash shelf.
+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.
+  SetAlignment(ShelfAlignment alignment, int64 display_id);
+  SetAutoHideBehavior(ShelfAutoHideBehavior auto_hide, int64 display_id);
+
+  // Pin and unpin items on the shelf, or update shelf item images.
+  PinItem(ShelfItem item, associated ShelfItemDelegate delegate);
+  UnpinItem(string app_id);
+  SetItemImage(string app_id, skia.mojom.Bitmap image);
+};
+
+// ShelfObserver is notified on shelf changes; used to persist profile settings.
+interface ShelfObserver {
+  OnShelfCreated(int64 display_id);
+  OnAlignmentChanged(ShelfAlignment alignment, int64 display_id);
+  OnAutoHideBehaviorChanged(ShelfAutoHideBehavior auto_hide, int64 display_id);
+};
+
+// ShelfItemDelegate handles command execution and observes shelf item changes.
+interface ShelfItemDelegate {
+  // Called when a pinned shelf item is invoked without an open window.
+  LaunchItem();
+
+  // Called on invocation of a shelf item's context menu command.
+  ExecuteCommand(uint32 command_id, int32 event_flags);
+
+  // Called when a shelf item is pinned or unpinned.
+  ItemPinned();
+  ItemUnpinned();
+
+  // Called when a pinned shelf item is reordered.
+  // |order| is the index of the item on the shelf.
+  ItemReordered(uint32 order);
+};
+
+// ContextMenuItems may be used to supplement ash shelf item context menus.
+struct ContextMenuItem {
+  enum Type { ITEM, CHECK, RADIO, SEPARATOR, SUBMENU };
+
+  Type type;
+  uint32 command_id;
+  string? label;
+  array<ContextMenuItem>? submenu;
+  bool enabled;
+  bool checked;
+  uint32 radio_group_id;
+};
+
+// ShelfItem contains the basic fields needed to pin shortcut items.
+struct ShelfItem {
+  // An app id, used to correlate windows and shortcuts (eg. 'mojo:foo').
+  string app_id;
+
+  // A app title, used for tooltips, etc. (eg. 'Foo Application').
+  string app_title;
+
+  // An icon image Bitmap, shown on the shelf.
+  skia.mojom.Bitmap image;
+
+  // Additional context menu items (eg. 'New Incognito Window').
+  array<ContextMenuItem>? context_menu_items;
+};
diff --git a/chromium/ash/public/interfaces/shelf.typemap b/chromium/ash/public/interfaces/shelf.typemap
new file mode 100644
index 00000000000..5fd20642dc7
--- /dev/null
+++ b/chromium/ash/public/interfaces/shelf.typemap
@@ -0,0 +1,14 @@
+# Copyright 2016 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.
+
+mojom = "//ash/public/interfaces/shelf.mojom"
+public_headers = [ "//ash/public/cpp/shelf_types.h" ]
+traits_headers = [ "//ash/public/interfaces/shelf_enum_traits.h" ]
+public_deps = [
+  "//ash/public/cpp",
+]
+type_mappings = [
+  "ash.mojom.ShelfAlignment=ash::ShelfAlignment",
+  "ash.mojom.ShelfAutoHideBehavior=ash::ShelfAutoHideBehavior",
+]
diff --git a/chromium/ash/public/interfaces/shelf_layout.mojom b/chromium/ash/public/interfaces/shelf_layout.mojom
deleted file mode 100644
index 529f92f804e..00000000000
--- a/chromium/ash/public/interfaces/shelf_layout.mojom
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2016 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 "mash/shelf/public/interfaces/shelf_constants.mojom";
-
-// Used by mojo:ash_sysui to push the current shelf state to its layout manager.
-interface ShelfLayout {
-  // TODO: Update preferred sizes with alignment to avoid flicker during layout.
-  SetAlignment(mash.shelf.mojom.Alignment alignment);
-  SetAutoHideBehavior(mash.shelf.mojom.AutoHideBehavior auto_hide);
-};
diff --git a/chromium/ash/public/interfaces/system_tray.mojom b/chromium/ash/public/interfaces/system_tray.mojom
new file mode 100644
index 00000000000..3cdb3e1be62
--- /dev/null
+++ b/chromium/ash/public/interfaces/system_tray.mojom
@@ -0,0 +1,65 @@
+// Copyright 2016 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;
+
+// Allows clients (e.g. Chrome browser) to control the ash system tray menu.
+interface SystemTray {
+  // Sets the clock to use 24 hour time formatting if |use_24_hour| is true.
+  // Otherwise sets 12 hour time formatting.
+  SetUse24HourClock(bool use_24_hour);
+};
+
+// Allows ash system tray to control a client (e.g. Chrome browser). Requests
+// often involve preferences or web UI that is not available to ash.
+interface SystemTrayClient {
+  // Shows general settings UI.
+  ShowSettings();
+
+  // Shows the settings related to date, timezone etc.
+  ShowDateSettings();
+
+  // TODO(crbug.com/647412): ShowSetTimeDialog();
+
+  // Shows settings related to multiple displays.
+  ShowDisplaySettings();
+
+  // Shows settings related to power.
+  ShowPowerSettings();
+
+  // Shows the page that lets you disable performance tracing.
+  ShowChromeSlow();
+
+  // Shows settings related to input methods.
+  ShowIMESettings();
+
+  // Shows help.
+  ShowHelp();
+
+  // Show accessibility help.
+  ShowAccessibilityHelp();
+
+  // Show the settings related to accessibility.
+  ShowAccessibilitySettings();
+
+  // Shows the help center article for the stylus tool palette.
+  ShowPaletteHelp();
+
+  // Shows the settings related to the stylus tool palette.
+  ShowPaletteSettings();
+
+  // Shows information about public account mode.
+  ShowPublicAccountInfo();
+
+  // TODO(crbug.com/647412): ShowEnterpriseInfo();
+
+  // Shows settings related to networking. If |network_id| is empty, shows
+  // general settings. Otherwise shows settings for the individual network.
+  // On devices |network_id| is a GUID, but on Linux desktop and in tests it can
+  // be any string.
+  ShowNetworkSettings(string network_id);
+
+  // Shows UI for changing proxy settings.
+  ShowProxySettings();
+};
diff --git a/chromium/ash/public/interfaces/typemaps.gni b/chromium/ash/public/interfaces/typemaps.gni
new file mode 100644
index 00000000000..33df2c31fa3
--- /dev/null
+++ b/chromium/ash/public/interfaces/typemaps.gni
@@ -0,0 +1,5 @@
+# Copyright 2016 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.
+
+typemaps = [ "//ash/public/interfaces/shelf.typemap" ]
diff --git a/chromium/ash/public/interfaces/user_window_controller.mojom b/chromium/ash/public/interfaces/user_window_controller.mojom
deleted file mode 100644
index 2add8cca7d8..00000000000
--- a/chromium/ash/public/interfaces/user_window_controller.mojom
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2015 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;
-
-struct UserWindow {
-  uint32 window_id;  // The local window id, defined by UserWindowController.
-  string window_title;  // The window title.
-  bool window_has_focus;  // A flag; true if the window is currently focused.
-  array<uint8> window_app_icon;  // A serialized SkBitmap.
-  string window_app_id;  // The window application ID (ie. 'mojo:foo').
-  bool ignored_by_shelf; // A flag; true to avoid showing a shelf item.
-};
-
-// An observer of user windows within mojom::Container::USER_WINDOWS.
-// TODO(msw): Observe focus changes, title/icon changes, etc.
-interface UserWindowObserver {
-  // Called when the observer is first added to supply the initial state.
-  OnUserWindowObserverAdded(array<UserWindow> user_windows);
-
-  OnUserWindowAdded(UserWindow user_window);
-  OnUserWindowRemoved(uint32 window_id);
-
-  OnUserWindowTitleChanged(uint32 window_id, string window_title);
-
-  // |app_icon| is a serialized SkBitmap.
-  OnUserWindowAppIconChanged(uint32 window_id, array<uint8> app_icon);
-
-  OnUserWindowFocusChanged(uint32 window_id, bool has_focus);
-};
-
-// An interface allowing system UIs to manage the set of user windows.
-// TODO(msw): Add minimization, restoration, opening a chooser view, etc.
-interface UserWindowController {
-  AddUserWindowObserver(UserWindowObserver observer);
-  FocusUserWindow(uint32 window_id);
-};
diff --git a/chromium/ash/sysui/public/interfaces/wallpaper.mojom b/chromium/ash/public/interfaces/wallpaper.mojom
index af7b7128db1..fd04d84fa62 100644
--- a/chromium/ash/sysui/public/interfaces/wallpaper.mojom
+++ b/chromium/ash/public/interfaces/wallpaper.mojom
@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-module ash.sysui.mojom;
+module ash.mojom;
 
 import "skia/public/interfaces/bitmap.mojom";
 
 // These values match wallpaper::WallpaperLayout.
 enum WallpaperLayout { CENTER, CENTER_CROPPED, STRETCH, TILE, };
 
-// Used by Chrome to set the wallpaper displayed by ash_sysui.
+// Used by Chrome to set the wallpaper displayed by ash.
 interface WallpaperController {
-  SetWallpaper(skia.mojom.Bitmap wallpaper, WallpaperLayout layout);
+  SetWallpaper(skia.mojom.Bitmap? wallpaper, WallpaperLayout layout);
 };
 
-// Used by ash_sysui to trigger Chrome's wallpaper picker functionality.
+// Used by ash to trigger Chrome's wallpaper picker functionality.
 interface WallpaperManager {
   Open();
 };
diff --git a/chromium/ash/resources/BUILD.gn b/chromium/ash/resources/BUILD.gn
index 6f2fd27ee41..1454da54676 100644
--- a/chromium/ash/resources/BUILD.gn
+++ b/chromium/ash/resources/BUILD.gn
@@ -17,13 +17,13 @@ grit("resources") {
   ]
 }
 
-# Generates a rule to repack ash resources for a given percentage (e.g. "100").
+# Repacks resources needed for ash_unittests, etc. at a given scale.
 # TODO(msw): Use ui_test.pak instead of its pieces? (no 200% support?)
 template("ash_test_resources") {
   percent = invoker.percent
 
   repack("ash_test_resources_${target_name}") {
-    output = "$root_build_dir/ash_test_resources_${percent}_percent.pak"
+    output = "$root_build_dir/${target_name}.pak"
 
     sources = [
       "$root_gen_dir/ash/resources/ash_resources_${percent}_percent.pak",
@@ -31,18 +31,22 @@ template("ash_test_resources") {
     ]
 
     if (percent == "100") {
-      sources += [
-        "$root_gen_dir/content/content_resources.pak",
-        "$root_gen_dir/ui/resources/webui_resources.pak",
-      ]
+      sources += [ "$root_gen_dir/ui/resources/webui_resources.pak" ]
+    }
+
+    if (defined(invoker.sources)) {
+      sources += invoker.sources
     }
 
     deps = [
       "//ash/resources",
-      "//content:resources",
       "//ui/resources",
     ]
 
+    if (defined(invoker.deps)) {
+      deps += invoker.deps
+    }
+
     if (toolkit_views) {
       deps += [
         "//ui/app_list/resources",
@@ -75,3 +79,15 @@ ash_test_resources("100_percent") {
 ash_test_resources("200_percent") {
   percent = "200"
 }
+
+# There is no with_content_200_percent as content resources are only available
+# at 100%.
+ash_test_resources("with_content_100_percent") {
+  percent = "100"
+  sources = [
+    "$root_gen_dir/content/content_resources.pak",
+  ]
+  deps = [
+    "//content:resources",
+  ]
+}
diff --git a/chromium/ash/resources/vector_icons/BUILD.gn b/chromium/ash/resources/vector_icons/BUILD.gn
new file mode 100644
index 00000000000..134942b7586
--- /dev/null
+++ b/chromium/ash/resources/vector_icons/BUILD.gn
@@ -0,0 +1,150 @@
+# Copyright 2016 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.
+
+action("aggregate_vector_icons") {
+  visibility = [ ":*" ]
+
+  script = "//ui/gfx/vector_icons/aggregate_vector_icons.py"
+
+  icons = [
+    "ime_menu_emoticon.1x.icon",
+    "ime_menu_emoticon.icon",
+    "ime_menu_microphone.1x.icon",
+    "ime_menu_microphone.icon",
+    "ime_menu_write.1x.icon",
+    "ime_menu_write.icon",
+    "palette_action_capture_region.1x.icon",
+    "palette_action_capture_region.icon",
+    "palette_action_capture_screen.1x.icon",
+    "palette_action_capture_screen.icon",
+    "palette_action_create_note.1x.icon",
+    "palette_action_create_note.icon",
+    "palette_mode_laser_pointer.1x.icon",
+    "palette_mode_laser_pointer.icon",
+    "palette_mode_magnify.1x.icon",
+    "palette_mode_magnify.icon",
+    "palette_tray_icon_capture_region.1x.icon",
+    "palette_tray_icon_capture_region.icon",
+    "palette_tray_icon_default.1x.icon",
+    "palette_tray_icon_default.icon",
+    "palette_tray_icon_laser_pointer.1x.icon",
+    "palette_tray_icon_laser_pointer.icon",
+    "palette_tray_icon_magnify.1x.icon",
+    "palette_tray_icon_magnify.icon",
+    "shelf_app_list.1x.icon",
+    "shelf_app_list.icon",
+    "shelf_notifications.1x.icon",
+    "shelf_notifications.icon",
+    "system_menu_accessibility.1x.icon",
+    "system_menu_accessibility.icon",
+    "system_menu_accessibility_auto_click.1x.icon",
+    "system_menu_accessibility_auto_click.icon",
+    "system_menu_accessibility_chromevox.1x.icon",
+    "system_menu_accessibility_chromevox.icon",
+    "system_menu_accessibility_contrast.1x.icon",
+    "system_menu_accessibility_contrast.icon",
+    "system_menu_accessibility_large_cursor.1x.icon",
+    "system_menu_accessibility_large_cursor.icon",
+    "system_menu_accessibility_screen_magnifier.1x.icon",
+    "system_menu_accessibility_screen_magnifier.icon",
+    "system_menu_arrow_back.1x.icon",
+    "system_menu_arrow_back.icon",
+    "system_menu_arrow_right.1x.icon",
+    "system_menu_arrow_right.icon",
+    "system_menu_bluetooth.1x.icon",
+    "system_menu_bluetooth.icon",
+    "system_menu_bluetooth_disabled.1x.icon",
+    "system_menu_bluetooth_disabled.icon",
+    "system_menu_brightness.1x.icon",
+    "system_menu_brightness.icon",
+    "system_menu_business.1x.icon",
+    "system_menu_business.icon",
+    "system_menu_caps_lock.1x.icon",
+    "system_menu_caps_lock.icon",
+    "system_menu_cast.1x.icon",
+    "system_menu_cast.icon",
+    "system_menu_child_user.1x.icon",
+    "system_menu_child_user.icon",
+    "system_menu_help.1x.icon",
+    "system_menu_help.icon",
+    "system_menu_keyboard.1x.icon",
+    "system_menu_keyboard.icon",
+    "system_menu_lock.1x.icon",
+    "system_menu_lock.icon",
+    "system_menu_power.1x.icon",
+    "system_menu_power.icon",
+    "system_menu_rotation_lock_auto.1x.icon",
+    "system_menu_rotation_lock_auto.icon",
+    "system_menu_rotation_lock_locked.1x.icon",
+    "system_menu_rotation_lock_locked.icon",
+    "system_menu_screen_share.1x.icon",
+    "system_menu_screen_share.icon",
+    "system_menu_settings.1x.icon",
+    "system_menu_settings.icon",
+    "system_menu_sms.icon",
+    "system_menu_supervised_user.1x.icon",
+    "system_menu_supervised_user.icon",
+    "system_menu_timer.1x.icon",
+    "system_menu_timer.icon",
+    "system_menu_update.1x.icon",
+    "system_menu_update.icon",
+    "system_tray_accessibility.1x.icon",
+    "system_tray_accessibility.icon",
+    "system_tray_battery.1x.icon",
+    "system_tray_battery.icon",
+    "system_tray_battery_alert.1x.icon",
+    "system_tray_battery_alert.icon",
+    "system_tray_battery_bolt.1x.icon",
+    "system_tray_battery_bolt.icon",
+    "system_tray_battery_unreliable.1x.icon",
+    "system_tray_battery_unreliable.icon",
+    "system_tray_battery_x.1x.icon",
+    "system_tray_battery_x.icon",
+    "system_tray_caps_lock.1x.icon",
+    "system_tray_caps_lock.icon",
+    "system_tray_cast.1x.icon",
+    "system_tray_cast.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_update.1x.icon",
+    "system_tray_update.icon",
+    "system_tray_volume_mute.1x.icon",
+    "system_tray_volume_mute.icon",
+  ]
+
+  output_cc = "$target_gen_dir/vector_icons.cc"
+  output_h = "$target_gen_dir/vector_icons.h"
+
+  inputs = icons
+  inputs += [
+    "vector_icons.cc.template",
+    "vector_icons.h.template",
+  ]
+  outputs = [
+    output_cc,
+    output_h,
+  ]
+
+  response_file_contents = rebase_path(icons, root_build_dir)
+
+  args = [
+    "--working_directory=" + rebase_path("./"),
+    "--file_list={{response_file_name}}",
+    "--output_cc=" + rebase_path(output_cc, root_build_dir),
+    "--output_h=" + rebase_path(output_h, root_build_dir),
+  ]
+}
+
+source_set("vector_icons") {
+  sources = get_target_outputs(":aggregate_vector_icons")
+  sources += [ "//ui/gfx/vector_icon_types.h" ]
+
+  deps = [
+    ":aggregate_vector_icons",
+    "//base",
+    "//skia",
+  ]
+}
diff --git a/chromium/ash/shared/BUILD.gn b/chromium/ash/shared/BUILD.gn
new file mode 100644
index 00000000000..3bfae4f1a6c
--- /dev/null
+++ b/chromium/ash/shared/BUILD.gn
@@ -0,0 +1,9 @@
+# Copyright 2016 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.
+
+source_set("app_types") {
+  sources = [
+    "app_types.h",
+  ]
+}
diff --git a/chromium/ash/sysui/BUILD.gn b/chromium/ash/sysui/BUILD.gn
deleted file mode 100644
index a038dd006be..00000000000
--- a/chromium/ash/sysui/BUILD.gn
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/ui.gni")
-import("//mojo/public/mojo_application.gni")
-import("//mojo/public/mojo_application_manifest.gni")
-import("//mojo/public/tools/bindings/mojom.gni")
-import("//tools/grit/repack.gni")
-
-source_set("lib") {
-  sources = [
-    "app_list_presenter_mus.cc",
-    "app_list_presenter_mus.h",
-    "context_menu_mus.cc",
-    "context_menu_mus.h",
-    "keyboard_ui_mus.cc",
-    "keyboard_ui_mus.h",
-    "pointer_watcher_delegate_mus.cc",
-    "pointer_watcher_delegate_mus.h",
-    "shelf_delegate_mus.cc",
-    "shelf_delegate_mus.h",
-    "shell_delegate_mus.cc",
-    "shell_delegate_mus.h",
-    "stub_context_factory.cc",
-    "stub_context_factory.h",
-    "sysui_application.cc",
-    "sysui_application.h",
-    "user_wallpaper_delegate_mus.cc",
-    "user_wallpaper_delegate_mus.h",
-  ]
-
-  deps = [
-    "//ash",
-    "//ash/public/interfaces",
-    "//cc",
-    "//cc/surfaces",
-    "//components/mus/common:mus_common",
-    "//components/mus/public/cpp",
-    "//components/mus/public/cpp/input_devices",
-    "//components/mus/public/interfaces",
-    "//components/user_manager",
-    "//components/wallpaper",
-    "//device/bluetooth",
-    "//mojo/common:common_base",
-    "//services/catalog/public/cpp",
-    "//services/shell/public/cpp",
-    "//services/tracing/public/cpp",
-    "//ui/app_list/presenter",
-    "//ui/app_list/presenter:mojom",
-    "//ui/aura",
-    "//ui/events",
-    "//ui/events/devices",
-    "//ui/gfx",
-    "//ui/gfx/geometry",
-    "//ui/gfx/geometry/mojo",
-    "//ui/keyboard:mojom",
-    "//ui/message_center",
-    "//ui/platform_window/stub",
-    "//ui/resources",
-    "//ui/strings",
-    "//ui/views",
-    "//ui/views/mus:for_mojo_application",
-    "//ui/wm",
-  ]
-
-  public_deps = [
-    "//ash/sysui/public/interfaces",
-    "//mash/shelf/public/interfaces",
-  ]
-
-  if (is_chromeos) {
-    deps += [ "//chromeos" ]
-  }
-}
-
-mojo_application_manifest("manifest") {
-  application_name = "ash_sysui"
-  source = "manifest.json"
-}
-
-mojo_native_application("sysui") {
-  output_name = "ash_sysui"
-  sources = [
-    "main.cc",
-  ]
-  deps = [
-    ":lib",
-    ":resources_100",
-    ":resources_200",
-    ":resources_strings",
-    "//services/shell/public/cpp",
-  ]
-
-  data_deps = [
-    ":manifest",
-    "//components/mus",
-  ]
-
-  resources = [
-    "$root_out_dir/ash_resources_strings.pak",
-    "$root_out_dir/ash_resources_100_percent.pak",
-    "$root_out_dir/ash_resources_200_percent.pak",
-  ]
-}
-
-#TODO(msw): Do not load 'test' resources (include sys lang?).
-repack("resources_strings") {
-  sources = [
-    "$root_out_dir/ash_test_strings.pak",
-  ]
-  output = "$root_out_dir/ash_resources_strings.pak"
-  deps = [
-    "//ash/strings:ash_test_strings",
-  ]
-}
-
-repack("resources_100") {
-  sources = [
-    "$root_out_dir/ash_test_resources_100_percent.pak",
-  ]
-  output = "$root_out_dir/ash_resources_100_percent.pak"
-  deps = [
-    "//ash/resources:ash_test_resources_100_percent",
-  ]
-}
-
-repack("resources_200") {
-  sources = [
-    "$root_out_dir/ash_test_resources_200_percent.pak",
-  ]
-  output = "$root_out_dir/ash_resources_200_percent.pak"
-  deps = [
-    "//ash/resources:ash_test_resources_200_percent",
-  ]
-}
diff --git a/chromium/ash/touch_hud/BUILD.gn b/chromium/ash/touch_hud/BUILD.gn
new file mode 100644
index 00000000000..8c509ef66d3
--- /dev/null
+++ b/chromium/ash/touch_hud/BUILD.gn
@@ -0,0 +1,25 @@
+# Copyright 2016 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/ui.gni")
+
+component("touch_hud") {
+  sources = [
+    "ash_touch_hud_export.h",
+    "touch_hud_renderer.cc",
+    "touch_hud_renderer.h",
+  ]
+
+  defines = [ "ASH_TOUCH_HUD_IMPLEMENTATION" ]
+
+  deps = [
+    "//base",
+    "//skia",
+    "//ui/compositor",
+    "//ui/events",
+    "//ui/gfx",
+    "//ui/gfx/geometry",
+    "//ui/views",
+  ]
+}
diff --git a/chromium/ash/touch_hud/mus/BUILD.gn b/chromium/ash/touch_hud/mus/BUILD.gn
new file mode 100644
index 00000000000..47aea01ebdb
--- /dev/null
+++ b/chromium/ash/touch_hud/mus/BUILD.gn
@@ -0,0 +1,60 @@
+# Copyright 2016 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/ui.gni")
+import("//services/shell/public/cpp/service.gni")
+import("//services/shell/public/service_manifest.gni")
+import("//mojo/public/tools/bindings/mojom.gni")
+
+source_set("lib") {
+  sources = [
+    "touch_hud_application.cc",
+    "touch_hud_application.h",
+  ]
+
+  deps = [
+    "//ash/public/interfaces",
+    "//ash/touch_hud",
+    "//base",
+    "//mash/public/interfaces",
+    "//mojo/common",
+    "//mojo/public/cpp/bindings",
+    "//services/shell/public/cpp",
+    "//services/shell/public/cpp:sources",
+    "//services/ui/public/cpp",
+    "//services/ui/public/interfaces",
+    "//ui/views",
+    "//ui/views/mus:for_mojo_application",
+  ]
+
+  data_deps = [
+    "//services/ui",
+  ]
+}
+
+service("touch_hud") {
+  sources = [
+    "main.cc",
+  ]
+
+  deps = [
+    ":lib",
+    "//base",
+    "//mojo/public/cpp/bindings",
+    "//services/shell/public/cpp",
+    "//services/shell/public/cpp:sources",
+    "//ui/views/mus:for_mojo_application",
+  ]
+
+  resources = [ "$root_out_dir/views_mus_resources.pak" ]
+
+  data_deps = [
+    ":manifest",
+  ]
+}
+
+service_manifest("manifest") {
+  name = "touch_hud"
+  source = "manifest.json"
+}