Revert "chromeos: Move files in //ash/common to //ash, part 2"
Landing this right after the M58 branch will complicate backports. I'm
going to land it right before the M59 branch.
This reverts commit 775aa607056fbeeaa5a87494f6d61ffa75d22f36.
Original description:
Now that mustash can use standard aura windows we don't need the ash/aura
vs. ash/mus vs. ash/common distinction. Eliminate //ash/common. Also move
files in //ash/common/system/chromeos out to //ash/system because ash only
compiles on chromeos these days.
Part 2 moves a subset of //ash/common into //ash. The CQ cannot move
all the files at once, see https://codereview.chromium.org/2734653002/
BUG=690096
TEST=compiles, ash_unittests
[email protected]
Review-Url: https://codereview.chromium.org/2734683002
Cr-Original-Commit-Position: refs/heads/master@{#454791}
Review-Url: https://codereview.chromium.org/2734753002 .
Cr-Commit-Position: refs/heads/master@{#454798}
diff --git a/ash/BUILD.gn b/ash/BUILD.gn
index e385c47..db8a1dc 100644
--- a/ash/BUILD.gn
+++ b/ash/BUILD.gn
@@ -15,27 +15,12 @@
component("ash") {
sources = [
- "accelerators/accelerator_commands.cc",
- "accelerators/accelerator_commands.h",
"accelerators/accelerator_commands_aura.cc",
"accelerators/accelerator_commands_aura.h",
- "accelerators/accelerator_controller.cc",
- "accelerators/accelerator_controller.h",
- "accelerators/accelerator_controller_delegate.h",
"accelerators/accelerator_controller_delegate_aura.cc",
"accelerators/accelerator_controller_delegate_aura.h",
"accelerators/accelerator_delegate.cc",
"accelerators/accelerator_delegate.h",
- "accelerators/accelerator_router.cc",
- "accelerators/accelerator_router.h",
- "accelerators/accelerator_table.cc",
- "accelerators/accelerator_table.h",
- "accelerators/ash_focus_manager_factory.cc",
- "accelerators/ash_focus_manager_factory.h",
- "accelerators/debug_commands.cc",
- "accelerators/debug_commands.h",
- "accelerators/exit_warning_handler.cc",
- "accelerators/exit_warning_handler.h",
"accelerators/key_hold_detector.cc",
"accelerators/key_hold_detector.h",
"accelerators/magnifier_key_scroller.cc",
@@ -64,6 +49,21 @@
"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",
@@ -80,8 +80,29 @@
"common/devtools/ash_devtools_css_agent.h",
"common/devtools/ash_devtools_dom_agent.cc",
"common/devtools/ash_devtools_dom_agent.h",
+ "common/drag_drop/drag_image_view.cc",
+ "common/drag_drop/drag_image_view.h",
"common/focus_cycler.cc",
"common/focus_cycler.h",
+ "common/frame/caption_buttons/caption_button_types.h",
+ "common/frame/caption_buttons/frame_caption_button.cc",
+ "common/frame/caption_buttons/frame_caption_button.h",
+ "common/frame/caption_buttons/frame_caption_button_container_view.cc",
+ "common/frame/caption_buttons/frame_caption_button_container_view.h",
+ "common/frame/caption_buttons/frame_size_button.cc",
+ "common/frame/caption_buttons/frame_size_button.h",
+ "common/frame/caption_buttons/frame_size_button_delegate.h",
+ "common/frame/custom_frame_view_ash.cc",
+ "common/frame/custom_frame_view_ash.h",
+ "common/frame/default_header_painter.cc",
+ "common/frame/default_header_painter.h",
+ "common/frame/frame_border_hit_test.cc",
+ "common/frame/frame_border_hit_test.h",
+ "common/frame/header_painter.h",
+ "common/frame/header_painter_util.cc",
+ "common/frame/header_painter_util.h",
+ "common/frame/header_view.cc",
+ "common/frame/header_view.h",
"common/gpu_support.h",
"common/gpu_support_stub.cc",
"common/gpu_support_stub.h",
@@ -95,6 +116,10 @@
"common/material_design/material_design_controller.h",
"common/media_controller.cc",
"common/media_controller.h",
+ "common/metrics/gesture_action_type.h",
+ "common/metrics/pointer_metrics_recorder.cc",
+ "common/metrics/pointer_metrics_recorder.h",
+ "common/metrics/user_metrics_action.h",
"common/mojo_interface_factory.cc",
"common/mojo_interface_factory.h",
"common/multi_profile_uma.cc",
@@ -110,6 +135,60 @@
"common/session/session_state_delegate.h",
"common/session/session_state_observer.cc",
"common/session/session_state_observer.h",
+ "common/shelf/app_list_button.cc",
+ "common/shelf/app_list_button.h",
+ "common/shelf/app_list_shelf_item_delegate.cc",
+ "common/shelf/app_list_shelf_item_delegate.h",
+ "common/shelf/ink_drop_button_listener.h",
+ "common/shelf/overflow_bubble.cc",
+ "common/shelf/overflow_bubble.h",
+ "common/shelf/overflow_bubble_view.cc",
+ "common/shelf/overflow_bubble_view.h",
+ "common/shelf/overflow_button.cc",
+ "common/shelf/overflow_button.h",
+ "common/shelf/shelf_alignment_menu.cc",
+ "common/shelf/shelf_alignment_menu.h",
+ "common/shelf/shelf_application_menu_model.cc",
+ "common/shelf/shelf_application_menu_model.h",
+ "common/shelf/shelf_background_animator.cc",
+ "common/shelf/shelf_background_animator.h",
+ "common/shelf/shelf_background_animator_observer.h",
+ "common/shelf/shelf_button.cc",
+ "common/shelf/shelf_button.h",
+ "common/shelf/shelf_button_pressed_metric_tracker.cc",
+ "common/shelf/shelf_button_pressed_metric_tracker.h",
+ "common/shelf/shelf_constants.cc",
+ "common/shelf/shelf_constants.h",
+ "common/shelf/shelf_controller.cc",
+ "common/shelf/shelf_controller.h",
+ "common/shelf/shelf_delegate.h",
+ "common/shelf/shelf_item_delegate.cc",
+ "common/shelf/shelf_item_delegate.h",
+ "common/shelf/shelf_item_types.cc",
+ "common/shelf/shelf_item_types.h",
+ "common/shelf/shelf_layout_manager.cc",
+ "common/shelf/shelf_layout_manager.h",
+ "common/shelf/shelf_layout_manager_observer.h",
+ "common/shelf/shelf_locking_manager.cc",
+ "common/shelf/shelf_locking_manager.h",
+ "common/shelf/shelf_model.cc",
+ "common/shelf/shelf_model.h",
+ "common/shelf/shelf_model_observer.h",
+ "common/shelf/shelf_tooltip_manager.cc",
+ "common/shelf/shelf_tooltip_manager.h",
+ "common/shelf/shelf_view.cc",
+ "common/shelf/shelf_view.h",
+ "common/shelf/shelf_widget.cc",
+ "common/shelf/shelf_widget.h",
+ "common/shelf/shelf_window_watcher.cc",
+ "common/shelf/shelf_window_watcher.h",
+ "common/shelf/shelf_window_watcher_item_delegate.cc",
+ "common/shelf/shelf_window_watcher_item_delegate.h",
+ "common/shelf/wm_shelf.cc",
+ "common/shelf/wm_shelf.h",
+ "common/shelf/wm_shelf_observer.h",
+ "common/shelf/wm_shelf_util.cc",
+ "common/shelf/wm_shelf_util.h",
"common/shell_delegate.h",
"common/shutdown_controller.cc",
"common/shutdown_controller.h",
@@ -121,6 +200,130 @@
"common/wallpaper/wallpaper_view.h",
"common/wallpaper/wallpaper_widget_controller.cc",
"common/wallpaper/wallpaper_widget_controller.h",
+ "common/wm/always_on_top_controller.cc",
+ "common/wm/always_on_top_controller.h",
+ "common/wm/container_finder.cc",
+ "common/wm/container_finder.h",
+ "common/wm/default_state.cc",
+ "common/wm/default_state.h",
+ "common/wm/default_window_resizer.cc",
+ "common/wm/default_window_resizer.h",
+ "common/wm/dock/docked_window_layout_manager.cc",
+ "common/wm/dock/docked_window_layout_manager.h",
+ "common/wm/dock/docked_window_layout_manager_observer.h",
+ "common/wm/dock/docked_window_resizer.cc",
+ "common/wm/dock/docked_window_resizer.h",
+ "common/wm/drag_details.cc",
+ "common/wm/drag_details.h",
+ "common/wm/focus_rules.cc",
+ "common/wm/focus_rules.h",
+ "common/wm/fullscreen_window_finder.cc",
+ "common/wm/fullscreen_window_finder.h",
+ "common/wm/immersive_context_ash.cc",
+ "common/wm/immersive_context_ash.h",
+ "common/wm/lock_layout_manager.cc",
+ "common/wm/lock_layout_manager.h",
+ "common/wm/lock_state_observer.h",
+ "common/wm/lock_window_state.cc",
+ "common/wm/lock_window_state.h",
+ "common/wm/maximize_mode/maximize_mode_controller.cc",
+ "common/wm/maximize_mode/maximize_mode_controller.h",
+ "common/wm/maximize_mode/maximize_mode_event_handler.cc",
+ "common/wm/maximize_mode/maximize_mode_event_handler.h",
+ "common/wm/maximize_mode/maximize_mode_window_manager.cc",
+ "common/wm/maximize_mode/maximize_mode_window_manager.h",
+ "common/wm/maximize_mode/maximize_mode_window_state.cc",
+ "common/wm/maximize_mode/maximize_mode_window_state.h",
+ "common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h",
+ "common/wm/maximize_mode/workspace_backdrop_delegate.cc",
+ "common/wm/maximize_mode/workspace_backdrop_delegate.h",
+ "common/wm/mru_window_tracker.cc",
+ "common/wm/mru_window_tracker.h",
+ "common/wm/overview/cleanup_animation_observer.cc",
+ "common/wm/overview/cleanup_animation_observer.h",
+ "common/wm/overview/overview_animation_type.h",
+ "common/wm/overview/scoped_overview_animation_settings.h",
+ "common/wm/overview/scoped_overview_animation_settings_factory.cc",
+ "common/wm/overview/scoped_overview_animation_settings_factory.h",
+ "common/wm/overview/scoped_transform_overview_window.cc",
+ "common/wm/overview/scoped_transform_overview_window.h",
+ "common/wm/overview/window_grid.cc",
+ "common/wm/overview/window_grid.h",
+ "common/wm/overview/window_selector.cc",
+ "common/wm/overview/window_selector.h",
+ "common/wm/overview/window_selector_controller.cc",
+ "common/wm/overview/window_selector_controller.h",
+ "common/wm/overview/window_selector_item.cc",
+ "common/wm/overview/window_selector_item.h",
+ "common/wm/panels/panel_frame_view.cc",
+ "common/wm/panels/panel_frame_view.h",
+ "common/wm/panels/panel_layout_manager.cc",
+ "common/wm/panels/panel_layout_manager.h",
+ "common/wm/panels/panel_window_resizer.cc",
+ "common/wm/panels/panel_window_resizer.h",
+ "common/wm/root_window_finder.cc",
+ "common/wm/root_window_finder.h",
+ "common/wm/root_window_layout_manager.cc",
+ "common/wm/root_window_layout_manager.h",
+ "common/wm/screen_dimmer.cc",
+ "common/wm/screen_dimmer.h",
+ "common/wm/switchable_windows.cc",
+ "common/wm/switchable_windows.h",
+ "common/wm/system_modal_container_layout_manager.cc",
+ "common/wm/system_modal_container_layout_manager.h",
+ "common/wm/window_animation_types.h",
+ "common/wm/window_cycle_controller.cc",
+ "common/wm/window_cycle_controller.h",
+ "common/wm/window_cycle_event_filter.h",
+ "common/wm/window_cycle_list.cc",
+ "common/wm/window_cycle_list.h",
+ "common/wm/window_dimmer.cc",
+ "common/wm/window_dimmer.h",
+ "common/wm/window_parenting_utils.cc",
+ "common/wm/window_parenting_utils.h",
+ "common/wm/window_positioner.cc",
+ "common/wm/window_positioner.h",
+ "common/wm/window_positioning_utils.cc",
+ "common/wm/window_positioning_utils.h",
+ "common/wm/window_resizer.cc",
+ "common/wm/window_resizer.h",
+ "common/wm/window_state.cc",
+ "common/wm/window_state.h",
+ "common/wm/window_state_delegate.cc",
+ "common/wm/window_state_delegate.h",
+ "common/wm/window_state_observer.h",
+ "common/wm/window_state_util.cc",
+ "common/wm/window_state_util.h",
+ "common/wm/wm_event.cc",
+ "common/wm/wm_event.h",
+ "common/wm/wm_screen_util.cc",
+ "common/wm/wm_screen_util.h",
+ "common/wm/wm_snap_to_pixel_layout_manager.cc",
+ "common/wm/wm_snap_to_pixel_layout_manager.h",
+ "common/wm/wm_toplevel_window_event_handler.cc",
+ "common/wm/wm_toplevel_window_event_handler.h",
+ "common/wm/wm_types.cc",
+ "common/wm/wm_types.h",
+ "common/wm/wm_window_animations.cc",
+ "common/wm/wm_window_animations.h",
+ "common/wm/workspace/magnetism_matcher.cc",
+ "common/wm/workspace/magnetism_matcher.h",
+ "common/wm/workspace/multi_window_resize_controller.cc",
+ "common/wm/workspace/multi_window_resize_controller.h",
+ "common/wm/workspace/phantom_window_controller.cc",
+ "common/wm/workspace/phantom_window_controller.h",
+ "common/wm/workspace/two_step_edge_cycler.cc",
+ "common/wm/workspace/two_step_edge_cycler.h",
+ "common/wm/workspace/workspace_event_handler.cc",
+ "common/wm/workspace/workspace_event_handler.h",
+ "common/wm/workspace/workspace_layout_manager.cc",
+ "common/wm/workspace/workspace_layout_manager.h",
+ "common/wm/workspace/workspace_layout_manager_backdrop_delegate.h",
+ "common/wm/workspace/workspace_types.h",
+ "common/wm/workspace/workspace_window_resizer.cc",
+ "common/wm/workspace/workspace_window_resizer.h",
+ "common/wm/workspace_controller.cc",
+ "common/wm/workspace_controller.h",
"common/wm_activation_observer.h",
"common/wm_display_observer.h",
"common/wm_layout_manager.h",
@@ -185,33 +388,12 @@
"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.cc",
- "frame/frame_border_hit_test.h",
- "frame/header_painter.h",
- "frame/header_painter_util.cc",
- "frame/header_painter_util.h",
- "frame/header_view.cc",
- "frame/header_view.h",
"high_contrast/high_contrast_controller.cc",
"high_contrast/high_contrast_controller.h",
"host/ash_window_tree_host.cc",
@@ -246,14 +428,10 @@
"magnifier/partial_magnification_controller.h",
"metrics/desktop_task_switch_metric_recorder.cc",
"metrics/desktop_task_switch_metric_recorder.h",
- "metrics/gesture_action_type.h",
- "metrics/pointer_metrics_recorder.cc",
- "metrics/pointer_metrics_recorder.h",
"metrics/task_switch_metrics_recorder.cc",
"metrics/task_switch_metrics_recorder.h",
"metrics/task_switch_time_tracker.cc",
"metrics/task_switch_time_tracker.h",
- "metrics/user_metrics_action.h",
"metrics/user_metrics_recorder.cc",
"metrics/user_metrics_recorder.h",
"root_window_controller.cc",
@@ -280,64 +458,10 @@
"shared/immersive_handler_factory.h",
"shared/immersive_revealed_lock.cc",
"shared/immersive_revealed_lock.h",
- "shelf/app_list_button.cc",
- "shelf/app_list_button.h",
- "shelf/app_list_shelf_item_delegate.cc",
- "shelf/app_list_shelf_item_delegate.h",
- "shelf/ink_drop_button_listener.h",
- "shelf/overflow_bubble.cc",
- "shelf/overflow_bubble.h",
- "shelf/overflow_bubble_view.cc",
- "shelf/overflow_bubble_view.h",
- "shelf/overflow_button.cc",
- "shelf/overflow_button.h",
- "shelf/shelf_alignment_menu.cc",
- "shelf/shelf_alignment_menu.h",
- "shelf/shelf_application_menu_model.cc",
- "shelf/shelf_application_menu_model.h",
- "shelf/shelf_background_animator.cc",
- "shelf/shelf_background_animator.h",
- "shelf/shelf_background_animator_observer.h",
"shelf/shelf_bezel_event_handler.cc",
"shelf/shelf_bezel_event_handler.h",
- "shelf/shelf_button.cc",
- "shelf/shelf_button.h",
- "shelf/shelf_button_pressed_metric_tracker.cc",
- "shelf/shelf_button_pressed_metric_tracker.h",
- "shelf/shelf_constants.cc",
- "shelf/shelf_constants.h",
- "shelf/shelf_controller.cc",
- "shelf/shelf_controller.h",
- "shelf/shelf_delegate.h",
- "shelf/shelf_item_delegate.cc",
- "shelf/shelf_item_delegate.h",
- "shelf/shelf_item_types.cc",
- "shelf/shelf_item_types.h",
- "shelf/shelf_layout_manager.cc",
- "shelf/shelf_layout_manager.h",
- "shelf/shelf_layout_manager_observer.h",
- "shelf/shelf_locking_manager.cc",
- "shelf/shelf_locking_manager.h",
- "shelf/shelf_model.cc",
- "shelf/shelf_model.h",
- "shelf/shelf_model_observer.h",
- "shelf/shelf_tooltip_manager.cc",
- "shelf/shelf_tooltip_manager.h",
- "shelf/shelf_view.cc",
- "shelf/shelf_view.h",
- "shelf/shelf_widget.cc",
- "shelf/shelf_widget.h",
"shelf/shelf_window_targeter.cc",
"shelf/shelf_window_targeter.h",
- "shelf/shelf_window_watcher.cc",
- "shelf/shelf_window_watcher.h",
- "shelf/shelf_window_watcher_item_delegate.cc",
- "shelf/shelf_window_watcher_item_delegate.h",
- "shelf/wm_shelf.cc",
- "shelf/wm_shelf.h",
- "shelf/wm_shelf_observer.h",
- "shelf/wm_shelf_util.cc",
- "shelf/wm_shelf_util.h",
"shell.cc",
"shell.h",
"shell_init_params.h",
@@ -625,107 +749,46 @@
"utility/screenshot_controller.h",
"virtual_keyboard_controller.cc",
"virtual_keyboard_controller.h",
- "wm/always_on_top_controller.cc",
- "wm/always_on_top_controller.h",
"wm/ash_focus_rules.cc",
"wm/ash_focus_rules.h",
"wm/ash_native_cursor_manager.cc",
"wm/ash_native_cursor_manager.h",
"wm/boot_splash_screen_chromeos.cc",
"wm/boot_splash_screen_chromeos.h",
- "wm/container_finder.cc",
- "wm/container_finder.h",
"wm/cursor_manager_chromeos.cc",
"wm/cursor_manager_chromeos.h",
- "wm/default_state.cc",
- "wm/default_state.h",
- "wm/default_window_resizer.cc",
- "wm/default_window_resizer.h",
- "wm/dock/docked_window_layout_manager.cc",
- "wm/dock/docked_window_layout_manager.h",
- "wm/dock/docked_window_layout_manager_observer.h",
- "wm/dock/docked_window_resizer.cc",
- "wm/dock/docked_window_resizer.h",
- "wm/drag_details.cc",
- "wm/drag_details.h",
"wm/drag_window_controller.cc",
"wm/drag_window_controller.h",
"wm/drag_window_resizer.cc",
"wm/drag_window_resizer.h",
"wm/event_client_impl.cc",
"wm/event_client_impl.h",
- "wm/focus_rules.cc",
- "wm/focus_rules.h",
- "wm/fullscreen_window_finder.cc",
- "wm/fullscreen_window_finder.h",
"wm/gestures/overview_gesture_handler.cc",
"wm/gestures/overview_gesture_handler.h",
- "wm/immersive_context_ash.cc",
- "wm/immersive_context_ash.h",
"wm/immersive_focus_watcher_aura.cc",
"wm/immersive_focus_watcher_aura.h",
"wm/immersive_gesture_handler_aura.cc",
"wm/immersive_gesture_handler_aura.h",
"wm/immersive_handler_factory_ash.cc",
"wm/immersive_handler_factory_ash.h",
- "wm/lock_layout_manager.cc",
- "wm/lock_layout_manager.h",
"wm/lock_state_controller.cc",
"wm/lock_state_controller.h",
- "wm/lock_state_observer.h",
- "wm/lock_window_state.cc",
- "wm/lock_window_state.h",
- "wm/maximize_mode/maximize_mode_controller.cc",
- "wm/maximize_mode/maximize_mode_controller.h",
- "wm/maximize_mode/maximize_mode_event_handler.cc",
- "wm/maximize_mode/maximize_mode_event_handler.h",
"wm/maximize_mode/maximize_mode_event_handler_aura.cc",
"wm/maximize_mode/maximize_mode_event_handler_aura.h",
- "wm/maximize_mode/maximize_mode_window_manager.cc",
- "wm/maximize_mode/maximize_mode_window_manager.h",
- "wm/maximize_mode/maximize_mode_window_state.cc",
- "wm/maximize_mode/maximize_mode_window_state.h",
- "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h",
"wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.cc",
"wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h",
"wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc",
"wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h",
- "wm/maximize_mode/workspace_backdrop_delegate.cc",
- "wm/maximize_mode/workspace_backdrop_delegate.h",
- "wm/mru_window_tracker.cc",
- "wm/mru_window_tracker.h",
"wm/overlay_event_filter.cc",
"wm/overlay_event_filter.h",
- "wm/overview/cleanup_animation_observer.cc",
- "wm/overview/cleanup_animation_observer.h",
- "wm/overview/overview_animation_type.h",
- "wm/overview/scoped_overview_animation_settings.h",
"wm/overview/scoped_overview_animation_settings_aura.cc",
"wm/overview/scoped_overview_animation_settings_aura.h",
- "wm/overview/scoped_overview_animation_settings_factory.cc",
- "wm/overview/scoped_overview_animation_settings_factory.h",
"wm/overview/scoped_overview_animation_settings_factory_aura.cc",
"wm/overview/scoped_overview_animation_settings_factory_aura.h",
- "wm/overview/scoped_transform_overview_window.cc",
- "wm/overview/scoped_transform_overview_window.h",
- "wm/overview/window_grid.cc",
- "wm/overview/window_grid.h",
- "wm/overview/window_selector.cc",
- "wm/overview/window_selector.h",
- "wm/overview/window_selector_controller.cc",
- "wm/overview/window_selector_controller.h",
- "wm/overview/window_selector_item.cc",
- "wm/overview/window_selector_item.h",
"wm/panels/attached_panel_window_targeter.cc",
"wm/panels/attached_panel_window_targeter.h",
- "wm/panels/panel_frame_view.cc",
- "wm/panels/panel_frame_view.h",
- "wm/panels/panel_layout_manager.cc",
- "wm/panels/panel_layout_manager.h",
"wm/panels/panel_window_event_handler.cc",
"wm/panels/panel_window_event_handler.h",
- "wm/panels/panel_window_resizer.cc",
- "wm/panels/panel_window_resizer.h",
"wm/power_button_controller.cc",
"wm/power_button_controller.h",
"wm/resize_handle_window_targeter.cc",
@@ -734,12 +797,6 @@
"wm/resize_shadow.h",
"wm/resize_shadow_controller.cc",
"wm/resize_shadow_controller.h",
- "wm/root_window_finder.cc",
- "wm/root_window_finder.h",
- "wm/root_window_layout_manager.cc",
- "wm/root_window_layout_manager.h",
- "wm/screen_dimmer.cc",
- "wm/screen_dimmer.h",
"wm/screen_pinning_controller.cc",
"wm/screen_pinning_controller.h",
"wm/session_state_animator.cc",
@@ -748,88 +805,31 @@
"wm/session_state_animator_impl.h",
"wm/stacking_controller.cc",
"wm/stacking_controller.h",
- "wm/switchable_windows.cc",
- "wm/switchable_windows.h",
"wm/system_gesture_event_filter.cc",
"wm/system_gesture_event_filter.h",
"wm/system_modal_container_event_filter.cc",
"wm/system_modal_container_event_filter.h",
"wm/system_modal_container_event_filter_delegate.h",
- "wm/system_modal_container_layout_manager.cc",
- "wm/system_modal_container_layout_manager.h",
"wm/system_wallpaper_controller.cc",
"wm/system_wallpaper_controller.h",
"wm/toplevel_window_event_handler.cc",
"wm/toplevel_window_event_handler.h",
"wm/video_detector.cc",
"wm/video_detector.h",
- "wm/window_animation_types.h",
"wm/window_animations.cc",
"wm/window_animations.h",
- "wm/window_cycle_controller.cc",
- "wm/window_cycle_controller.h",
- "wm/window_cycle_event_filter.h",
"wm/window_cycle_event_filter_aura.cc",
"wm/window_cycle_event_filter_aura.h",
- "wm/window_cycle_list.cc",
- "wm/window_cycle_list.h",
- "wm/window_dimmer.cc",
- "wm/window_dimmer.h",
"wm/window_mirror_view.cc",
"wm/window_mirror_view.h",
- "wm/window_parenting_utils.cc",
- "wm/window_parenting_utils.h",
- "wm/window_positioner.cc",
- "wm/window_positioner.h",
- "wm/window_positioning_utils.cc",
- "wm/window_positioning_utils.h",
"wm/window_properties.cc",
"wm/window_properties.h",
- "wm/window_resizer.cc",
- "wm/window_resizer.h",
- "wm/window_state.cc",
- "wm/window_state.h",
"wm/window_state_aura.cc",
"wm/window_state_aura.h",
- "wm/window_state_delegate.cc",
- "wm/window_state_delegate.h",
- "wm/window_state_observer.h",
- "wm/window_state_util.cc",
- "wm/window_state_util.h",
"wm/window_util.cc",
"wm/window_util.h",
- "wm/wm_event.cc",
- "wm/wm_event.h",
- "wm/wm_screen_util.cc",
- "wm/wm_screen_util.h",
- "wm/wm_snap_to_pixel_layout_manager.cc",
- "wm/wm_snap_to_pixel_layout_manager.h",
- "wm/wm_toplevel_window_event_handler.cc",
- "wm/wm_toplevel_window_event_handler.h",
- "wm/wm_types.cc",
- "wm/wm_types.h",
- "wm/wm_window_animations.cc",
- "wm/wm_window_animations.h",
- "wm/workspace/magnetism_matcher.cc",
- "wm/workspace/magnetism_matcher.h",
- "wm/workspace/multi_window_resize_controller.cc",
- "wm/workspace/multi_window_resize_controller.h",
- "wm/workspace/phantom_window_controller.cc",
- "wm/workspace/phantom_window_controller.h",
- "wm/workspace/two_step_edge_cycler.cc",
- "wm/workspace/two_step_edge_cycler.h",
- "wm/workspace/workspace_event_handler.cc",
- "wm/workspace/workspace_event_handler.h",
"wm/workspace/workspace_event_handler_aura.cc",
"wm/workspace/workspace_event_handler_aura.h",
- "wm/workspace/workspace_layout_manager.cc",
- "wm/workspace/workspace_layout_manager.h",
- "wm/workspace/workspace_layout_manager_backdrop_delegate.h",
- "wm/workspace/workspace_types.h",
- "wm/workspace/workspace_window_resizer.cc",
- "wm/workspace/workspace_window_resizer.h",
- "wm/workspace_controller.cc",
- "wm/workspace_controller.h",
]
configs += [ "//build/config:precompiled_headers" ]
@@ -1153,45 +1153,49 @@
sources = [
"accelerators/accelerator_controller_unittest.cc",
"accelerators/accelerator_filter_unittest.cc",
- "accelerators/accelerator_table_unittest.cc",
"accelerators/spoken_feedback_toggler_unittest.cc",
"ash_touch_exploration_manager_chromeos_unittest.cc",
"autoclick/autoclick_unittest.cc",
+ "common/accelerators/accelerator_table_unittest.cc",
"common/devtools/ash_devtools_unittest.cc",
+ "common/drag_drop/drag_image_view_unittest.cc",
+ "common/frame/caption_buttons/frame_caption_button_container_view_unittest.cc",
+ "common/frame/custom_frame_view_ash_unittest.cc",
+ "common/frame/default_header_painter_unittest.cc",
+ "common/metrics/pointer_metrics_recorder_unittest.cc",
"common/mus_property_mirror_ash_unittest.cc",
"common/session/session_controller_unittest.cc",
+ "common/shelf/shelf_application_menu_model_unittest.cc",
+ "common/shelf/shelf_background_animator_unittest.cc",
+ "common/shelf/shelf_button_pressed_metric_tracker_unittest.cc",
+ "common/shelf/shelf_locking_manager_unittest.cc",
+ "common/shelf/shelf_model_unittest.cc",
+ "common/shelf/shelf_tooltip_manager_unittest.cc",
+ "common/shelf/shelf_window_watcher_unittest.cc",
"common/wallpaper/wallpaper_controller_unittest.cc",
+ "common/wm/container_finder_unittest.cc",
+ "common/wm/mru_window_tracker_unittest.cc",
+ "common/wm/overview/cleanup_animation_observer_unittest.cc",
+ "common/wm/workspace/workspace_layout_manager_unittest.cc",
"common/wm_window_unittest.cc",
"common/wm_window_user_data_unittest.cc",
- "drag_drop/drag_image_view_unittest.cc",
"first_run/first_run_helper_unittest.cc",
"focus_cycler_unittest.cc",
- "frame/caption_buttons/frame_caption_button_container_view_unittest.cc",
"frame/caption_buttons/frame_size_button_unittest.cc",
- "frame/custom_frame_view_ash_unittest.cc",
- "frame/default_header_painter_unittest.cc",
"laser/laser_pointer_controller_unittest.cc",
"laser/laser_pointer_points_unittest.cc",
"laser/laser_segment_utils_unittest.cc",
"metrics/desktop_task_switch_metric_recorder_unittest.cc",
- "metrics/pointer_metrics_recorder_unittest.cc",
"metrics/task_switch_metrics_recorder_unittest.cc",
"metrics/task_switch_time_tracker_unittest.cc",
"metrics/user_metrics_recorder_unittest.cc",
"root_window_controller_unittest.cc",
"rotator/screen_rotation_animation_unittest.cc",
"screen_util_unittest.cc",
- "shelf/shelf_application_menu_model_unittest.cc",
- "shelf/shelf_background_animator_unittest.cc",
- "shelf/shelf_button_pressed_metric_tracker_unittest.cc",
"shelf/shelf_layout_manager_unittest.cc",
- "shelf/shelf_locking_manager_unittest.cc",
- "shelf/shelf_model_unittest.cc",
- "shelf/shelf_tooltip_manager_unittest.cc",
"shelf/shelf_unittest.cc",
"shelf/shelf_view_unittest.cc",
"shelf/shelf_widget_unittest.cc",
- "shelf/shelf_window_watcher_unittest.cc",
"shell_unittest.cc",
"sticky_keys/sticky_keys_overlay_unittest.cc",
"sticky_keys/sticky_keys_unittest.cc",
@@ -1233,16 +1237,12 @@
"test/ash_test_helper_unittest.cc",
"tooltips/tooltip_controller_unittest.cc",
"wm/ash_focus_rules_unittest.cc",
- "wm/container_finder_unittest.cc",
"wm/dock/docked_window_layout_manager_unittest.cc",
"wm/dock/docked_window_resizer_unittest.cc",
"wm/immersive_fullscreen_controller_unittest.cc",
"wm/lock_state_controller_unittest.cc",
"wm/maximize_mode/accelerometer_test_data_literals.cc",
"wm/maximize_mode/maximize_mode_window_manager_unittest.cc",
- "wm/mru_window_tracker_unittest.cc",
- "wm/overview/cleanup_animation_observer_unittest.cc",
- "wm/workspace/workspace_layout_manager_unittest.cc",
]
deps = [
"//ash",
diff --git a/ash/accelerators/accelerator_commands_aura.cc b/ash/accelerators/accelerator_commands_aura.cc
index e78f996..88ad889 100644
--- a/ash/accelerators/accelerator_commands_aura.cc
+++ b/ash/accelerators/accelerator_commands_aura.cc
@@ -4,10 +4,10 @@
#include "ash/accelerators/accelerator_commands_aura.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_window.h"
#include "ash/shell.h"
#include "ash/wm/screen_pinning_controller.h"
-#include "ash/wm/window_state.h"
#include "base/metrics/user_metrics.h"
#include "ui/display/manager/display_manager.h"
#include "ui/display/manager/managed_display_info.h"
diff --git a/ash/accelerators/accelerator_commands_unittest.cc b/ash/accelerators/accelerator_commands_unittest.cc
index 8c56ef3..04661ab 100644
--- a/ash/accelerators/accelerator_commands_unittest.cc
+++ b/ash/accelerators/accelerator_commands_unittest.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/accelerators/accelerator_commands.h"
+#include "ash/common/accelerators/accelerator_commands.h"
#include <memory>
#include "ash/accelerators/accelerator_commands_aura.h"
+#include "ash/common/wm/window_state.h"
#include "ash/test/ash_test_base.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
#include "ui/aura/window.h"
diff --git a/ash/accelerators/accelerator_controller_delegate_aura.cc b/ash/accelerators/accelerator_controller_delegate_aura.cc
index 9fddcad..d72cb56 100644
--- a/ash/accelerators/accelerator_controller_delegate_aura.cc
+++ b/ash/accelerators/accelerator_controller_delegate_aura.cc
@@ -10,10 +10,14 @@
#include <utility>
#include "ash/accelerators/accelerator_commands_aura.h"
-#include "ash/accelerators/debug_commands.h"
+#include "ash/common/accelerators/debug_commands.h"
#include "ash/common/accessibility_types.h"
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/shell_delegate.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_event.h"
#include "ash/common/wm_shell.h"
#include "ash/debug.h"
#include "ash/display/display_configuration_controller.h"
@@ -24,18 +28,14 @@
#include "ash/root_window_controller.h"
#include "ash/rotator/window_rotation.h"
#include "ash/screenshot_delegate.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/system/system_notifier.h"
#include "ash/system/tray/system_tray.h"
#include "ash/touch/touch_hud_debug.h"
#include "ash/utility/screenshot_controller.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/wm/power_button_controller.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
-#include "ash/wm/wm_event.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
#include "base/metrics/user_metrics.h"
diff --git a/ash/accelerators/accelerator_controller_delegate_aura.h b/ash/accelerators/accelerator_controller_delegate_aura.h
index 2338dd9..3f68382 100644
--- a/ash/accelerators/accelerator_controller_delegate_aura.h
+++ b/ash/accelerators/accelerator_controller_delegate_aura.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "ash/accelerators/accelerator_controller_delegate.h"
+#include "ash/common/accelerators/accelerator_controller_delegate.h"
#include "base/macros.h"
namespace ash {
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc
index c8b88b7c..a654aa2f 100644
--- a/ash/accelerators/accelerator_controller_unittest.cc
+++ b/ash/accelerators/accelerator_controller_unittest.cc
@@ -2,14 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/accelerators/accelerator_controller.h"
+#include "ash/common/accelerators/accelerator_controller.h"
-#include "ash/accelerators/accelerator_table.h"
+#include "ash/common/accelerators/accelerator_table.h"
#include "ash/common/accessibility_delegate.h"
#include "ash/common/accessibility_types.h"
#include "ash/common/ash_switches.h"
#include "ash/common/ime_control_delegate.h"
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/test/test_shelf_delegate.h"
+#include "ash/common/wm/panels/panel_layout_manager.h"
+#include "ash/common/wm/window_positioning_utils.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_event.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
@@ -21,14 +26,9 @@
#include "ash/test/lock_state_controller_test_api.h"
#include "ash/test/test_screenshot_delegate.h"
#include "ash/test/test_session_state_animator.h"
-#include "ash/test/test_shelf_delegate.h"
#include "ash/wm/lock_state_controller.h"
-#include "ash/wm/panels/panel_layout_manager.h"
-#include "ash/wm/window_positioning_utils.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
-#include "ash/wm/wm_event.h"
#include "base/command_line.h"
#include "base/test/user_action_tester.cc"
#include "services/ui/public/interfaces/window_manager_constants.mojom.h"
diff --git a/ash/accelerators/accelerator_delegate.cc b/ash/accelerators/accelerator_delegate.cc
index 3a87b0e..679813f 100644
--- a/ash/accelerators/accelerator_delegate.cc
+++ b/ash/accelerators/accelerator_delegate.cc
@@ -4,7 +4,7 @@
#include "ash/accelerators/accelerator_delegate.h"
-#include "ash/accelerators/accelerator_router.h"
+#include "ash/common/accelerators/accelerator_router.h"
#include "ash/common/wm_window.h"
#include "ui/aura/window.h"
#include "ui/events/event.h"
diff --git a/ash/accelerators/accelerator_filter_unittest.cc b/ash/accelerators/accelerator_filter_unittest.cc
index 2b1b55d..f19204b 100644
--- a/ash/accelerators/accelerator_filter_unittest.cc
+++ b/ash/accelerators/accelerator_filter_unittest.cc
@@ -6,16 +6,16 @@
#include <memory>
-#include "ash/accelerators/accelerator_controller.h"
#include "ash/accelerators/accelerator_delegate.h"
+#include "ash/common/accelerators/accelerator_controller.h"
+#include "ash/common/test/test_session_state_delegate.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/ash_test_helper.h"
#include "ash/test/test_screenshot_delegate.h"
-#include "ash/test/test_session_state_delegate.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/ash/accelerators/accelerator_interactive_uitest_chromeos.cc b/ash/accelerators/accelerator_interactive_uitest_chromeos.cc
index 30332fc..323ef08 100644
--- a/ash/accelerators/accelerator_interactive_uitest_chromeos.cc
+++ b/ash/accelerators/accelerator_interactive_uitest_chromeos.cc
@@ -2,9 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/accelerators/accelerator_controller.h"
+#include "ash/common/accelerators/accelerator_controller.h"
#include "ash/common/shell_observer.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/shell.h"
#include "ash/system/network/network_observer.h"
@@ -12,7 +13,6 @@
#include "ash/system/tray/system_tray_notifier.h"
#include "ash/test/ash_interactive_ui_test_base.h"
#include "ash/test/test_screenshot_delegate.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
#include "base/run_loop.h"
diff --git a/ash/app_list/app_list_delegate_impl.cc b/ash/app_list/app_list_delegate_impl.cc
index 79b2d89b..8f5c63b 100644
--- a/ash/app_list/app_list_delegate_impl.cc
+++ b/ash/app_list/app_list_delegate_impl.cc
@@ -4,11 +4,11 @@
#include "ash/app_list/app_list_delegate_impl.h"
+#include "ash/common/shelf/app_list_button.h"
+#include "ash/common/shelf/shelf_widget.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wm_shell.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/app_list_button.h"
-#include "ash/shelf/shelf_widget.h"
-#include "ash/shelf/wm_shelf.h"
#include "ui/app_list/presenter/app_list.h"
namespace ash {
diff --git a/ash/app_list/app_list_presenter_delegate.cc b/ash/app_list/app_list_presenter_delegate.cc
index d252ebf0..fd56856 100644
--- a/ash/app_list/app_list_presenter_delegate.cc
+++ b/ash/app_list/app_list_presenter_delegate.cc
@@ -5,6 +5,12 @@
#include "ash/app_list/app_list_presenter_delegate.h"
#include "ash/common/ash_switches.h"
+#include "ash/common/shelf/app_list_button.h"
+#include "ash/common/shelf/shelf_layout_manager.h"
+#include "ash/common/shelf/shelf_widget.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
+#include "ash/common/wm/wm_screen_util.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/display/window_tree_host_manager.h"
@@ -12,13 +18,7 @@
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
#include "ash/screen_util.h"
-#include "ash/shelf/app_list_button.h"
-#include "ash/shelf/shelf_layout_manager.h"
-#include "ash/shelf/shelf_widget.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
-#include "ash/wm/wm_screen_util.h"
#include "base/command_line.h"
#include "ui/app_list/app_list_constants.h"
#include "ui/app_list/app_list_switches.h"
diff --git a/ash/app_list/app_list_presenter_delegate.h b/ash/app_list/app_list_presenter_delegate.h
index 7fd185f..964061b 100644
--- a/ash/app_list/app_list_presenter_delegate.h
+++ b/ash/app_list/app_list_presenter_delegate.h
@@ -8,8 +8,8 @@
#include <stdint.h>
#include "ash/ash_export.h"
+#include "ash/common/shelf/wm_shelf_observer.h"
#include "ash/common/shell_observer.h"
-#include "ash/shelf/wm_shelf_observer.h"
#include "base/macros.h"
#include "ui/app_list/presenter/app_list_presenter_delegate.h"
#include "ui/events/event_handler.h"
diff --git a/ash/aura/wm_shell_aura.cc b/ash/aura/wm_shell_aura.cc
index 4f6861852..8398546 100644
--- a/ash/aura/wm_shell_aura.cc
+++ b/ash/aura/wm_shell_aura.cc
@@ -11,6 +11,9 @@
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/shell_delegate.h"
#include "ash/common/shell_observer.h"
+#include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"
+#include "ash/common/wm/mru_window_tracker.h"
+#include "ash/common/wm/overview/window_selector_controller.h"
#include "ash/common/wm_activation_observer.h"
#include "ash/common/wm_display_observer.h"
#include "ash/common/wm_window.h"
@@ -25,9 +28,6 @@
#include "ash/virtual_keyboard_controller.h"
#include "ash/wm/drag_window_resizer.h"
#include "ash/wm/maximize_mode/maximize_mode_event_handler_aura.h"
-#include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"
-#include "ash/wm/mru_window_tracker.h"
-#include "ash/wm/overview/window_selector_controller.h"
#include "ash/wm/screen_pinning_controller.h"
#include "ash/wm/window_cycle_event_filter_aura.h"
#include "ash/wm/window_util.h"
diff --git a/ash/autoclick/autoclick_controller.cc b/ash/autoclick/autoclick_controller.cc
index cbe9c0c9b..85bf13e 100644
--- a/ash/autoclick/autoclick_controller.cc
+++ b/ash/autoclick/autoclick_controller.cc
@@ -6,10 +6,10 @@
#include "ash/autoclick/common/autoclick_controller_common.h"
#include "ash/autoclick/common/autoclick_controller_common_delegate.h"
+#include "ash/common/wm/root_window_finder.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/shell.h"
-#include "ash/wm/root_window_finder.h"
#include "base/timer/timer.h"
#include "ui/aura/window_observer.h"
#include "ui/aura/window_tree_host.h"
diff --git a/ash/accelerators/accelerator_commands.cc b/ash/common/accelerators/accelerator_commands.cc
similarity index 89%
rename from ash/accelerators/accelerator_commands.cc
rename to ash/common/accelerators/accelerator_commands.cc
index 7c34110..3fe7d171 100644
--- a/ash/accelerators/accelerator_commands.cc
+++ b/ash/common/accelerators/accelerator_commands.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/accelerators/accelerator_commands.h"
+#include "ash/common/accelerators/accelerator_commands.h"
+#include "ash/common/wm/mru_window_tracker.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_event.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
-#include "ash/wm/mru_window_tracker.h"
-#include "ash/wm/window_state.h"
-#include "ash/wm/wm_event.h"
#include "base/metrics/user_metrics.h"
namespace ash {
diff --git a/ash/accelerators/accelerator_commands.h b/ash/common/accelerators/accelerator_commands.h
similarity index 84%
rename from ash/accelerators/accelerator_commands.h
rename to ash/common/accelerators/accelerator_commands.h
index df576ba..279c59e1 100644
--- a/ash/accelerators/accelerator_commands.h
+++ b/ash/common/accelerators/accelerator_commands.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_ACCELERATORS_ACCELERATOR_COMMANDS_H_
-#define ASH_ACCELERATORS_ACCELERATOR_COMMANDS_H_
+#ifndef ASH_COMMON_ACCELERATORS_ACCELERATOR_COMMANDS_H_
+#define ASH_COMMON_ACCELERATORS_ACCELERATOR_COMMANDS_H_
#include "ash/ash_export.h"
@@ -28,4 +28,4 @@
} // namespace accelerators
} // namespace ash
-#endif // ASH_ACCELERATORS_ACCELERATOR_COMMANDS_H_
+#endif // ASH_COMMON_ACCELERATORS_ACCELERATOR_COMMANDS_H_
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/common/accelerators/accelerator_controller.cc
similarity index 98%
rename from ash/accelerators/accelerator_controller.cc
rename to ash/common/accelerators/accelerator_controller.cc
index 21eda7d2..0fdc14d 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/common/accelerators/accelerator_controller.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/accelerators/accelerator_controller.h"
+#include "ash/common/accelerators/accelerator_controller.h"
#include <utility>
-#include "ash/accelerators/accelerator_commands.h"
-#include "ash/accelerators/accelerator_controller_delegate.h"
-#include "ash/accelerators/debug_commands.h"
+#include "ash/common/accelerators/accelerator_commands.h"
+#include "ash/common/accelerators/accelerator_controller_delegate.h"
+#include "ash/common/accelerators/debug_commands.h"
#include "ash/common/accessibility_delegate.h"
#include "ash/common/accessibility_types.h"
#include "ash/common/focus_cycler.h"
@@ -18,13 +18,19 @@
#include "ash/common/new_window_controller.h"
#include "ash/common/palette_delegate.h"
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/shelf/shelf_widget.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/shell_delegate.h"
+#include "ash/common/wm/mru_window_tracker.h"
+#include "ash/common/wm/overview/window_selector_controller.h"
+#include "ash/common/wm/window_cycle_controller.h"
+#include "ash/common/wm/window_positioning_utils.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_event.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/resources/vector_icons/vector_icons.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/shelf_widget.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/strings/grit/ash_strings.h"
#include "ash/system/brightness_control_delegate.h"
#include "ash/system/ime_menu/ime_menu_tray.h"
@@ -36,12 +42,6 @@
#include "ash/system/tray/system_tray_delegate.h"
#include "ash/system/tray/system_tray_notifier.h"
#include "ash/system/web_notification/web_notification_tray.h"
-#include "ash/wm/mru_window_tracker.h"
-#include "ash/wm/overview/window_selector_controller.h"
-#include "ash/wm/window_cycle_controller.h"
-#include "ash/wm/window_positioning_utils.h"
-#include "ash/wm/window_state.h"
-#include "ash/wm/wm_event.h"
#include "base/metrics/histogram_macros.h"
#include "base/metrics/user_metrics.h"
#include "chromeos/dbus/dbus_thread_manager.h"
diff --git a/ash/accelerators/accelerator_controller.h b/ash/common/accelerators/accelerator_controller.h
similarity index 96%
rename from ash/accelerators/accelerator_controller.h
rename to ash/common/accelerators/accelerator_controller.h
index 4be34b7f5..0a39c63 100644
--- a/ash/accelerators/accelerator_controller.h
+++ b/ash/common/accelerators/accelerator_controller.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
-#define ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
+#ifndef ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
+#define ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
#include <stddef.h>
@@ -12,9 +12,9 @@
#include <set>
#include <vector>
-#include "ash/accelerators/accelerator_table.h"
-#include "ash/accelerators/exit_warning_handler.h"
#include "ash/ash_export.h"
+#include "ash/common/accelerators/accelerator_table.h"
+#include "ash/common/accelerators/exit_warning_handler.h"
#include "ash/public/interfaces/accelerator_controller.mojom.h"
#include "base/compiler_specific.h"
#include "base/gtest_prod_util.h"
@@ -231,4 +231,4 @@
} // namespace ash
-#endif // ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
+#endif // ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
diff --git a/ash/accelerators/accelerator_controller_delegate.h b/ash/common/accelerators/accelerator_controller_delegate.h
similarity index 84%
rename from ash/accelerators/accelerator_controller_delegate.h
rename to ash/common/accelerators/accelerator_controller_delegate.h
index 81c06e4..291d9fd5 100644
--- a/ash/accelerators/accelerator_controller_delegate.h
+++ b/ash/common/accelerators/accelerator_controller_delegate.h
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_
-#define ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_
+#ifndef ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_
+#define ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_
-#include "ash/accelerators/accelerator_table.h"
#include "ash/ash_export.h"
+#include "ash/common/accelerators/accelerator_table.h"
namespace ui {
class Accelerator;
@@ -47,4 +47,4 @@
} // namespace ash
-#endif // ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_
+#endif // ASH_COMMON_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_H_
diff --git a/ash/accelerators/accelerator_router.cc b/ash/common/accelerators/accelerator_router.cc
similarity index 96%
rename from ash/accelerators/accelerator_router.cc
rename to ash/common/accelerators/accelerator_router.cc
index 36fc6d8..2a42383 100644
--- a/ash/accelerators/accelerator_router.cc
+++ b/ash/common/accelerators/accelerator_router.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/accelerators/accelerator_router.h"
+#include "ash/common/accelerators/accelerator_router.h"
-#include "ash/accelerators/accelerator_controller.h"
+#include "ash/common/accelerators/accelerator_controller.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
-#include "ash/wm/window_state.h"
#include "base/metrics/histogram_macros.h"
#include "base/stl_util.h"
#include "ui/base/accelerators/accelerator.h"
diff --git a/ash/accelerators/accelerator_router.h b/ash/common/accelerators/accelerator_router.h
similarity index 100%
rename from ash/accelerators/accelerator_router.h
rename to ash/common/accelerators/accelerator_router.h
diff --git a/ash/accelerators/accelerator_table.cc b/ash/common/accelerators/accelerator_table.cc
similarity index 99%
rename from ash/accelerators/accelerator_table.cc
rename to ash/common/accelerators/accelerator_table.cc
index bda1e1d..f0f06f82 100644
--- a/ash/accelerators/accelerator_table.cc
+++ b/ash/common/accelerators/accelerator_table.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/accelerators/accelerator_table.h"
+#include "ash/common/accelerators/accelerator_table.h"
#include "ash/strings/grit/ash_strings.h"
#include "base/macros.h"
diff --git a/ash/accelerators/accelerator_table.h b/ash/common/accelerators/accelerator_table.h
similarity index 97%
rename from ash/accelerators/accelerator_table.h
rename to ash/common/accelerators/accelerator_table.h
index 34b8476..86a4e0d1 100644
--- a/ash/accelerators/accelerator_table.h
+++ b/ash/common/accelerators/accelerator_table.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_ACCELERATORS_ACCELERATOR_TABLE_H_
-#define ASH_ACCELERATORS_ACCELERATOR_TABLE_H_
+#ifndef ASH_COMMON_ACCELERATORS_ACCELERATOR_TABLE_H_
+#define ASH_COMMON_ACCELERATORS_ACCELERATOR_TABLE_H_
#include <stddef.h>
@@ -261,4 +261,4 @@
} // namespace ash
-#endif // ASH_ACCELERATORS_ACCELERATOR_TABLE_H_
+#endif // ASH_COMMON_ACCELERATORS_ACCELERATOR_TABLE_H_
diff --git a/ash/accelerators/accelerator_table_unittest.cc b/ash/common/accelerators/accelerator_table_unittest.cc
similarity index 98%
rename from ash/accelerators/accelerator_table_unittest.cc
rename to ash/common/accelerators/accelerator_table_unittest.cc
index 927165f..e469625 100644
--- a/ash/accelerators/accelerator_table_unittest.cc
+++ b/ash/common/accelerators/accelerator_table_unittest.cc
@@ -4,7 +4,7 @@
#include <set>
-#include "ash/accelerators/accelerator_table.h"
+#include "ash/common/accelerators/accelerator_table.h"
#include "base/strings/string_util.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/ash/accelerators/ash_focus_manager_factory.cc b/ash/common/accelerators/ash_focus_manager_factory.cc
similarity index 88%
rename from ash/accelerators/ash_focus_manager_factory.cc
rename to ash/common/accelerators/ash_focus_manager_factory.cc
index 596a8d2..058e0575 100644
--- a/ash/accelerators/ash_focus_manager_factory.cc
+++ b/ash/common/accelerators/ash_focus_manager_factory.cc
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/accelerators/ash_focus_manager_factory.h"
+#include "ash/common/accelerators/ash_focus_manager_factory.h"
-#include "ash/accelerators/accelerator_controller.h"
+#include "ash/common/accelerators/accelerator_controller.h"
#include "ash/common/wm_shell.h"
#include "base/memory/ptr_util.h"
#include "ui/views/focus/focus_manager.h"
diff --git a/ash/accelerators/ash_focus_manager_factory.h b/ash/common/accelerators/ash_focus_manager_factory.h
similarity index 84%
rename from ash/accelerators/ash_focus_manager_factory.h
rename to ash/common/accelerators/ash_focus_manager_factory.h
index 5d4ac24..32d9e9a 100644
--- a/ash/accelerators/ash_focus_manager_factory.h
+++ b/ash/common/accelerators/ash_focus_manager_factory.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_ACCELERATORS_ASH_FOCUS_MANAGER_FACTORY_H_
-#define ASH_ACCELERATORS_ASH_FOCUS_MANAGER_FACTORY_H_
+#ifndef ASH_COMMON_ACCELERATORS_ASH_FOCUS_MANAGER_FACTORY_H_
+#define ASH_COMMON_ACCELERATORS_ASH_FOCUS_MANAGER_FACTORY_H_
#include "base/macros.h"
#include "ui/views/focus/focus_manager_delegate.h"
@@ -35,4 +35,4 @@
} // namespace ash
-#endif // ASH_ACCELERATORS_ASH_FOCUS_MANAGER_FACTORY_H_
+#endif // ASH_COMMON_ACCELERATORS_ASH_FOCUS_MANAGER_FACTORY_H_
diff --git a/ash/accelerators/debug_commands.cc b/ash/common/accelerators/debug_commands.cc
similarity index 97%
rename from ash/accelerators/debug_commands.cc
rename to ash/common/accelerators/debug_commands.cc
index 94e978c0..e54ec89 100644
--- a/ash/accelerators/debug_commands.cc
+++ b/ash/common/accelerators/debug_commands.cc
@@ -2,19 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/accelerators/debug_commands.h"
+#include "ash/common/accelerators/debug_commands.h"
-#include "ash/accelerators/accelerator_commands.h"
+#include "ash/common/accelerators/accelerator_commands.h"
#include "ash/common/ash_switches.h"
#include "ash/common/shell_delegate.h"
#include "ash/common/wallpaper/wallpaper_controller.h"
#include "ash/common/wallpaper/wallpaper_delegate.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/root_window_controller.h"
#include "ash/system/toast/toast_data.h"
#include "ash/system/toast/toast_manager.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/wm/window_properties.h"
#include "base/command_line.h"
#include "base/metrics/user_metrics.h"
diff --git a/ash/accelerators/debug_commands.h b/ash/common/accelerators/debug_commands.h
similarity index 82%
rename from ash/accelerators/debug_commands.h
rename to ash/common/accelerators/debug_commands.h
index e6a0bab..3ef73ae4 100644
--- a/ash/accelerators/debug_commands.h
+++ b/ash/common/accelerators/debug_commands.h
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_ACCELERATORS_DEBUG_COMMANDS_H_
-#define ASH_ACCELERATORS_DEBUG_COMMANDS_H_
+#ifndef ASH_COMMON_ACCELERATORS_DEBUG_COMMANDS_H_
+#define ASH_COMMON_ACCELERATORS_DEBUG_COMMANDS_H_
-#include "ash/accelerators/accelerator_table.h"
#include "ash/ash_export.h"
+#include "ash/common/accelerators/accelerator_table.h"
// This file contains implementations of commands that are used only when
// debugging.
@@ -33,4 +33,4 @@
} // namespace debug
} // namespace ash
-#endif // ASH_ACCELERATORS_DEBUG_COMMANDS_H_
+#endif // ASH_COMMON_ACCELERATORS_DEBUG_COMMANDS_H_
diff --git a/ash/accelerators/exit_warning_handler.cc b/ash/common/accelerators/exit_warning_handler.cc
similarity index 98%
rename from ash/accelerators/exit_warning_handler.cc
rename to ash/common/accelerators/exit_warning_handler.cc
index b575066..9f6b970 100644
--- a/ash/accelerators/exit_warning_handler.cc
+++ b/ash/common/accelerators/exit_warning_handler.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/accelerators/exit_warning_handler.h"
+#include "ash/common/accelerators/exit_warning_handler.h"
#include "ash/common/shell_delegate.h"
#include "ash/common/wm_shell.h"
diff --git a/ash/accelerators/exit_warning_handler.h b/ash/common/accelerators/exit_warning_handler.h
similarity index 91%
rename from ash/accelerators/exit_warning_handler.h
rename to ash/common/accelerators/exit_warning_handler.h
index c678f84d..d992ba9 100644
--- a/ash/accelerators/exit_warning_handler.h
+++ b/ash/common/accelerators/exit_warning_handler.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_ACCELERATORS_EXIT_WARNING_HANDLER_H_
-#define ASH_ACCELERATORS_EXIT_WARNING_HANDLER_H_
+#ifndef ASH_COMMON_ACCELERATORS_EXIT_WARNING_HANDLER_H_
+#define ASH_COMMON_ACCELERATORS_EXIT_WARNING_HANDLER_H_
#include <memory>
@@ -81,4 +81,4 @@
} // namespace ash
-#endif // ASH_ACCELERATORS_EXIT_WARNING_HANDLER_H_
+#endif // ASH_COMMON_ACCELERATORS_EXIT_WARNING_HANDLER_H_
diff --git a/ash/common/devtools/ash_devtools_unittest.cc b/ash/common/devtools/ash_devtools_unittest.cc
index 9aa0192..7c96bff 100644
--- a/ash/common/devtools/ash_devtools_unittest.cc
+++ b/ash/common/devtools/ash_devtools_unittest.cc
@@ -4,10 +4,10 @@
#include "ash/common/devtools/ash_devtools_css_agent.h"
#include "ash/common/devtools/ash_devtools_dom_agent.h"
+#include "ash/common/test/ash_test.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/root_window_controller.h"
-#include "ash/test/ash_test.h"
#include "base/memory/ptr_util.h"
#include "base/strings/stringprintf.h"
#include "ui/display/display.h"
diff --git a/ash/common/drag_drop/OWNERS b/ash/common/drag_drop/OWNERS
new file mode 100644
index 0000000..d231d19d
--- /dev/null
+++ b/ash/common/drag_drop/OWNERS
@@ -0,0 +1 @@
[email protected]
diff --git a/ash/drag_drop/drag_image_view.cc b/ash/common/drag_drop/drag_image_view.cc
similarity index 98%
rename from ash/drag_drop/drag_image_view.cc
rename to ash/common/drag_drop/drag_image_view.cc
index 4cb2beb..1306bf1 100644
--- a/ash/drag_drop/drag_image_view.cc
+++ b/ash/common/drag_drop/drag_image_view.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/drag_drop/drag_image_view.h"
+#include "ash/common/drag_drop/drag_image_view.h"
#include <memory>
diff --git a/ash/drag_drop/drag_image_view.h b/ash/common/drag_drop/drag_image_view.h
similarity index 95%
rename from ash/drag_drop/drag_image_view.h
rename to ash/common/drag_drop/drag_image_view.h
index be1830e..de6e4d5 100644
--- a/ash/drag_drop/drag_image_view.h
+++ b/ash/common/drag_drop/drag_image_view.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_DRAG_DROP_DRAG_IMAGE_VIEW_H_
-#define ASH_DRAG_DROP_DRAG_IMAGE_VIEW_H_
+#ifndef ASH_COMMON_DRAG_DROP_DRAG_IMAGE_VIEW_H_
+#define ASH_COMMON_DRAG_DROP_DRAG_IMAGE_VIEW_H_
#include <memory>
@@ -100,4 +100,4 @@
} // namespace ash
-#endif // ASH_DRAG_DROP_DRAG_IMAGE_VIEW_H_
+#endif // ASH_COMMON_DRAG_DROP_DRAG_IMAGE_VIEW_H_
diff --git a/ash/drag_drop/drag_image_view_unittest.cc b/ash/common/drag_drop/drag_image_view_unittest.cc
similarity index 96%
rename from ash/drag_drop/drag_image_view_unittest.cc
rename to ash/common/drag_drop/drag_image_view_unittest.cc
index 6fa0bd3..e74d1bc 100644
--- a/ash/drag_drop/drag_image_view_unittest.cc
+++ b/ash/common/drag_drop/drag_image_view_unittest.cc
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/drag_drop/drag_image_view.h"
+#include "ash/common/drag_drop/drag_image_view.h"
-#include "ash/test/ash_test.h"
+#include "ash/common/test/ash_test.h"
#include "ui/base/dragdrop/drag_drop_types.h"
namespace ash {
diff --git a/ash/common/focus_cycler.cc b/ash/common/focus_cycler.cc
index 47ef19b..5ef50d4 100644
--- a/ash/common/focus_cycler.cc
+++ b/ash/common/focus_cycler.cc
@@ -4,10 +4,10 @@
#include "ash/common/focus_cycler.h"
+#include "ash/common/wm/mru_window_tracker.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
-#include "ash/wm/mru_window_tracker.h"
-#include "ash/wm/window_state.h"
#include "ui/views/accessible_pane_view.h"
#include "ui/views/focus/focus_search.h"
#include "ui/views/widget/widget.h"
diff --git a/ash/common/frame/OWNERS b/ash/common/frame/OWNERS
new file mode 100644
index 0000000..e710530
--- /dev/null
+++ b/ash/common/frame/OWNERS
@@ -0,0 +1 @@
[email protected]
diff --git a/ash/frame/caption_buttons/caption_button_types.h b/ash/common/frame/caption_buttons/caption_button_types.h
similarity index 75%
rename from ash/frame/caption_buttons/caption_button_types.h
rename to ash/common/frame/caption_buttons/caption_button_types.h
index ece7d8e9c..ca067be 100644
--- a/ash/frame/caption_buttons/caption_button_types.h
+++ b/ash/common/frame/caption_buttons/caption_button_types.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_FRAME_CAPTION_BUTTONS_CAPTION_BUTTON_TYPES_H_
-#define ASH_FRAME_CAPTION_BUTTONS_CAPTION_BUTTON_TYPES_H_
+#ifndef ASH_COMMON_FRAME_CAPTION_BUTTONS_CAPTION_BUTTON_TYPES_H_
+#define ASH_COMMON_FRAME_CAPTION_BUTTONS_CAPTION_BUTTON_TYPES_H_
namespace ash {
@@ -22,4 +22,4 @@
} // namespace ash
-#endif // ASH_FRAME_CAPTION_BUTTONS_CAPTION_BUTTON_TYPES_H_
+#endif // ASH_COMMON_FRAME_CAPTION_BUTTONS_CAPTION_BUTTON_TYPES_H_
diff --git a/ash/frame/caption_buttons/frame_caption_button.cc b/ash/common/frame/caption_buttons/frame_caption_button.cc
similarity index 98%
rename from ash/frame/caption_buttons/frame_caption_button.cc
rename to ash/common/frame/caption_buttons/frame_caption_button.cc
index 9879443..0d26e0d 100644
--- a/ash/frame/caption_buttons/frame_caption_button.cc
+++ b/ash/common/frame/caption_buttons/frame_caption_button.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/frame/caption_buttons/frame_caption_button.h"
+#include "ash/common/frame/caption_buttons/frame_caption_button.h"
#include "ui/gfx/animation/slide_animation.h"
#include "ui/gfx/animation/throb_animation.h"
diff --git a/ash/frame/caption_buttons/frame_caption_button.h b/ash/common/frame/caption_buttons/frame_caption_button.h
similarity index 91%
rename from ash/frame/caption_buttons/frame_caption_button.h
rename to ash/common/frame/caption_buttons/frame_caption_button.h
index 0d296a8..8b6df28 100644
--- a/ash/frame/caption_buttons/frame_caption_button.h
+++ b/ash/common/frame/caption_buttons/frame_caption_button.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_
-#define ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_
+#ifndef ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_
+#define ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_
#include <memory>
#include "ash/ash_export.h"
-#include "ash/frame/caption_buttons/caption_button_types.h"
+#include "ash/common/frame/caption_buttons/caption_button_types.h"
#include "base/macros.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/views/controls/button/custom_button.h"
@@ -103,4 +103,4 @@
} // namespace ash
-#endif // ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_
+#endif // ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_H_
diff --git a/ash/frame/caption_buttons/frame_caption_button_container_view.cc b/ash/common/frame/caption_buttons/frame_caption_button_container_view.cc
similarity index 97%
rename from ash/frame/caption_buttons/frame_caption_button_container_view.cc
rename to ash/common/frame/caption_buttons/frame_caption_button_container_view.cc
index 63a97dd..3539a04 100644
--- a/ash/frame/caption_buttons/frame_caption_button_container_view.cc
+++ b/ash/common/frame/caption_buttons/frame_caption_button_container_view.cc
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
+#include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h"
#include <cmath>
#include <map>
+#include "ash/common/frame/caption_buttons/frame_caption_button.h"
+#include "ash/common/frame/caption_buttons/frame_size_button.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm_shell.h"
-#include "ash/frame/caption_buttons/frame_caption_button.h"
-#include "ash/frame/caption_buttons/frame_size_button.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
#include "ui/base/hit_test.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/compositor/scoped_animation_duration_scale_mode.h"
diff --git a/ash/frame/caption_buttons/frame_caption_button_container_view.h b/ash/common/frame/caption_buttons/frame_caption_button_container_view.h
similarity index 94%
rename from ash/frame/caption_buttons/frame_caption_button_container_view.h
rename to ash/common/frame/caption_buttons/frame_caption_button_container_view.h
index 4c59001..014071a 100644
--- a/ash/frame/caption_buttons/frame_caption_button_container_view.h
+++ b/ash/common/frame/caption_buttons/frame_caption_button_container_view.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_
-#define ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_
+#ifndef ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_
+#define ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_
#include <map>
#include "ash/ash_export.h"
-#include "ash/frame/caption_buttons/frame_size_button_delegate.h"
+#include "ash/common/frame/caption_buttons/frame_size_button_delegate.h"
#include "base/macros.h"
#include "ui/gfx/animation/animation_delegate.h"
#include "ui/views/controls/button/button.h"
@@ -155,4 +155,4 @@
} // namespace ash
-#endif // ASH_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_
+#endif // ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_
diff --git a/ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc b/ash/common/frame/caption_buttons/frame_caption_button_container_view_unittest.cc
similarity index 97%
rename from ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc
rename to ash/common/frame/caption_buttons/frame_caption_button_container_view_unittest.cc
index f2be7fee..f84fe43 100644
--- a/ash/frame/caption_buttons/frame_caption_button_container_view_unittest.cc
+++ b/ash/common/frame/caption_buttons/frame_caption_button_container_view_unittest.cc
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
+#include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h"
#include "ash/common/ash_layout_constants.h"
+#include "ash/common/frame/caption_buttons/frame_caption_button.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm_shell.h"
-#include "ash/frame/caption_buttons/frame_caption_button.h"
#include "ash/resources/grit/ash_resources.h"
#include "ash/resources/vector_icons/vector_icons.h"
#include "ash/test/ash_test_base.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/views/widget/widget.h"
#include "ui/views/widget/widget_delegate.h"
diff --git a/ash/frame/caption_buttons/frame_size_button.cc b/ash/common/frame/caption_buttons/frame_size_button.cc
similarity index 97%
rename from ash/frame/caption_buttons/frame_size_button.cc
rename to ash/common/frame/caption_buttons/frame_size_button.cc
index 7fa8612a..cc2fe20 100644
--- a/ash/frame/caption_buttons/frame_size_button.cc
+++ b/ash/common/frame/caption_buttons/frame_size_button.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/frame/caption_buttons/frame_size_button.h"
+#include "ash/common/frame/caption_buttons/frame_size_button.h"
+#include "ash/common/wm/window_positioning_utils.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_event.h"
+#include "ash/common/wm/workspace/phantom_window_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
-#include "ash/wm/window_positioning_utils.h"
-#include "ash/wm/window_state.h"
-#include "ash/wm/wm_event.h"
-#include "ash/wm/workspace/phantom_window_controller.h"
#include "base/i18n/rtl.h"
#include "ui/gfx/geometry/vector2d.h"
#include "ui/views/widget/widget.h"
diff --git a/ash/frame/caption_buttons/frame_size_button.h b/ash/common/frame/caption_buttons/frame_size_button.h
similarity index 92%
rename from ash/frame/caption_buttons/frame_size_button.h
rename to ash/common/frame/caption_buttons/frame_size_button.h
index bebca5a..0ab4dcf 100644
--- a/ash/frame/caption_buttons/frame_size_button.h
+++ b/ash/common/frame/caption_buttons/frame_size_button.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_H_
-#define ASH_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_H_
+#ifndef ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_H_
+#define ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_H_
#include <memory>
#include "ash/ash_export.h"
-#include "ash/frame/caption_buttons/frame_caption_button.h"
-#include "ash/frame/caption_buttons/frame_size_button_delegate.h"
+#include "ash/common/frame/caption_buttons/frame_caption_button.h"
+#include "ash/common/frame/caption_buttons/frame_size_button_delegate.h"
#include "base/macros.h"
#include "base/timer/timer.h"
@@ -117,4 +117,4 @@
} // namespace ash
-#endif // ASH_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_H_
+#endif // ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_H_
diff --git a/ash/frame/caption_buttons/frame_size_button_delegate.h b/ash/common/frame/caption_buttons/frame_size_button_delegate.h
similarity index 84%
rename from ash/frame/caption_buttons/frame_size_button_delegate.h
rename to ash/common/frame/caption_buttons/frame_size_button_delegate.h
index 87ee688..026436ac 100644
--- a/ash/frame/caption_buttons/frame_size_button_delegate.h
+++ b/ash/common/frame/caption_buttons/frame_size_button_delegate.h
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_DELEGATE_H_
-#define ASH_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_DELEGATE_H_
+#ifndef ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_DELEGATE_H_
+#define ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_DELEGATE_H_
#include "ash/ash_export.h"
-#include "ash/frame/caption_buttons/caption_button_types.h"
+#include "ash/common/frame/caption_buttons/caption_button_types.h"
namespace gfx {
class Point;
@@ -50,4 +50,4 @@
} // namespace ash
-#endif // ASH_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_DELEGATE_H_
+#endif // ASH_COMMON_FRAME_CAPTION_BUTTONS_FRAME_SIZE_BUTTON_DELEGATE_H_
diff --git a/ash/frame/custom_frame_view_ash.cc b/ash/common/frame/custom_frame_view_ash.cc
similarity index 96%
rename from ash/frame/custom_frame_view_ash.cc
rename to ash/common/frame/custom_frame_view_ash.cc
index a41420ff..470dd01 100644
--- a/ash/frame/custom_frame_view_ash.cc
+++ b/ash/common/frame/custom_frame_view_ash.cc
@@ -2,21 +2,21 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/frame/custom_frame_view_ash.h"
+#include "ash/common/frame/custom_frame_view_ash.h"
#include <algorithm>
#include <vector>
+#include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h"
+#include "ash/common/frame/frame_border_hit_test.h"
+#include "ash/common/frame/header_view.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/window_state_delegate.h"
+#include "ash/common/wm/window_state_observer.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
-#include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
-#include "ash/frame/frame_border_hit_test.h"
-#include "ash/frame/header_view.h"
#include "ash/shared/immersive_fullscreen_controller.h"
#include "ash/shared/immersive_fullscreen_controller_delegate.h"
-#include "ash/wm/window_state.h"
-#include "ash/wm/window_state_delegate.h"
-#include "ash/wm/window_state_observer.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/window.h"
#include "ui/aura/window_observer.h"
diff --git a/ash/frame/custom_frame_view_ash.h b/ash/common/frame/custom_frame_view_ash.h
similarity index 96%
rename from ash/frame/custom_frame_view_ash.h
rename to ash/common/frame/custom_frame_view_ash.h
index c012c05..b2e50be 100644
--- a/ash/frame/custom_frame_view_ash.h
+++ b/ash/common/frame/custom_frame_view_ash.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_
-#define ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_
+#ifndef ASH_COMMON_FRAME_CUSTOM_FRAME_VIEW_ASH_H_
+#define ASH_COMMON_FRAME_CUSTOM_FRAME_VIEW_ASH_H_
#include <memory>
@@ -111,4 +111,4 @@
} // namespace ash
-#endif // ASH_FRAME_CUSTOM_FRAME_VIEW_ASH_H_
+#endif // ASH_COMMON_FRAME_CUSTOM_FRAME_VIEW_ASH_H_
diff --git a/ash/frame/custom_frame_view_ash_unittest.cc b/ash/common/frame/custom_frame_view_ash_unittest.cc
similarity index 95%
rename from ash/frame/custom_frame_view_ash_unittest.cc
rename to ash/common/frame/custom_frame_view_ash_unittest.cc
index 27c7e272..b5729ef3 100644
--- a/ash/frame/custom_frame_view_ash_unittest.cc
+++ b/ash/common/frame/custom_frame_view_ash_unittest.cc
@@ -2,17 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/frame/custom_frame_view_ash.h"
+#include "ash/common/frame/custom_frame_view_ash.h"
#include <memory>
#include "ash/common/ash_layout_constants.h"
+#include "ash/common/frame/caption_buttons/frame_caption_button.h"
+#include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h"
+#include "ash/common/test/test_session_state_delegate.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm_shell.h"
-#include "ash/frame/caption_buttons/frame_caption_button.h"
-#include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
#include "ash/test/ash_test_base.h"
-#include "ash/test/test_session_state_delegate.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/image/image_unittest_util.h"
diff --git a/ash/frame/default_header_painter.cc b/ash/common/frame/default_header_painter.cc
similarity index 98%
rename from ash/frame/default_header_painter.cc
rename to ash/common/frame/default_header_painter.cc
index de78dbb..519cfe2 100644
--- a/ash/frame/default_header_painter.cc
+++ b/ash/common/frame/default_header_painter.cc
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/frame/default_header_painter.h"
+#include "ash/common/frame/default_header_painter.h"
#include "ash/common/ash_layout_constants.h"
-#include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
-#include "ash/frame/header_painter_util.h"
+#include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h"
+#include "ash/common/frame/header_painter_util.h"
#include "ash/resources/grit/ash_resources.h"
#include "ash/resources/vector_icons/vector_icons.h"
#include "base/debug/leak_annotations.h"
diff --git a/ash/frame/default_header_painter.h b/ash/common/frame/default_header_painter.h
similarity index 94%
rename from ash/frame/default_header_painter.h
rename to ash/common/frame/default_header_painter.h
index c6f715f..c499929 100644
--- a/ash/frame/default_header_painter.h
+++ b/ash/common/frame/default_header_painter.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_FRAME_DEFAULT_HEADER_PAINTER_H_
-#define ASH_FRAME_DEFAULT_HEADER_PAINTER_H_
+#ifndef ASH_COMMON_FRAME_DEFAULT_HEADER_PAINTER_H_
+#define ASH_COMMON_FRAME_DEFAULT_HEADER_PAINTER_H_
#include <memory>
#include "ash/ash_export.h"
-#include "ash/frame/header_painter.h"
+#include "ash/common/frame/header_painter.h"
#include "base/compiler_specific.h" // override
#include "base/gtest_prod_util.h"
#include "base/macros.h"
@@ -118,4 +118,4 @@
} // namespace ash
-#endif // ASH_FRAME_DEFAULT_HEADER_PAINTER_H_
+#endif // ASH_COMMON_FRAME_DEFAULT_HEADER_PAINTER_H_
diff --git a/ash/frame/default_header_painter_unittest.cc b/ash/common/frame/default_header_painter_unittest.cc
similarity index 95%
rename from ash/frame/default_header_painter_unittest.cc
rename to ash/common/frame/default_header_painter_unittest.cc
index 083a8c0..85d5ddd 100644
--- a/ash/frame/default_header_painter_unittest.cc
+++ b/ash/common/frame/default_header_painter_unittest.cc
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/frame/default_header_painter.h"
+#include "ash/common/frame/default_header_painter.h"
#include <memory>
-#include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
+#include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/test/ash_test_base.h"
#include "ui/views/test/test_views.h"
diff --git a/ash/frame/frame_border_hit_test.cc b/ash/common/frame/frame_border_hit_test.cc
similarity index 94%
rename from ash/frame/frame_border_hit_test.cc
rename to ash/common/frame/frame_border_hit_test.cc
index 58cb7ff1..3f0116a1 100644
--- a/ash/frame/frame_border_hit_test.cc
+++ b/ash/common/frame/frame_border_hit_test.cc
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/frame/frame_border_hit_test.h"
+#include "ash/common/frame/frame_border_hit_test.h"
#include "ash/common/ash_constants.h"
+#include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h"
#include "ash/common/wm_shell.h"
-#include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
#include "ui/base/hit_test.h"
#include "ui/views/widget/widget.h"
#include "ui/views/widget/widget_delegate.h"
diff --git a/ash/frame/frame_border_hit_test.h b/ash/common/frame/frame_border_hit_test.h
similarity index 79%
rename from ash/frame/frame_border_hit_test.h
rename to ash/common/frame/frame_border_hit_test.h
index 083ba6a9..4c79cad 100644
--- a/ash/frame/frame_border_hit_test.h
+++ b/ash/common/frame/frame_border_hit_test.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_FRAME_FRAME_BORDER_HIT_TEST_H_
-#define ASH_FRAME_FRAME_BORDER_HIT_TEST_H_
+#ifndef ASH_COMMON_FRAME_FRAME_BORDER_HIT_TEST_H_
+#define ASH_COMMON_FRAME_FRAME_BORDER_HIT_TEST_H_
#include "ash/ash_export.h"
@@ -27,4 +27,4 @@
} // namespace ash
-#endif // ASH_FRAME_FRAME_BORDER_HIT_TEST_H_
+#endif // ASH_COMMON_FRAME_FRAME_BORDER_HIT_TEST_H_
diff --git a/ash/frame/header_painter.h b/ash/common/frame/header_painter.h
similarity index 89%
rename from ash/frame/header_painter.h
rename to ash/common/frame/header_painter.h
index 517f2aa..f60d62f 100644
--- a/ash/frame/header_painter.h
+++ b/ash/common/frame/header_painter.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_FRAME_HEADER_PAINTER_H_
-#define ASH_FRAME_HEADER_PAINTER_H_
+#ifndef ASH_COMMON_FRAME_HEADER_PAINTER_H_
+#define ASH_COMMON_FRAME_HEADER_PAINTER_H_
#include "ash/ash_export.h"
@@ -44,4 +44,4 @@
} // namespace ash
-#endif // ASH_FRAME_HEADER_PAINTER_H_
+#endif // ASH_COMMON_FRAME_HEADER_PAINTER_H_
diff --git a/ash/frame/header_painter_util.cc b/ash/common/frame/header_painter_util.cc
similarity index 98%
rename from ash/frame/header_painter_util.cc
rename to ash/common/frame/header_painter_util.cc
index 4d8b4a7..6d5a11f2 100644
--- a/ash/frame/header_painter_util.cc
+++ b/ash/common/frame/header_painter_util.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/frame/header_painter_util.h"
+#include "ash/common/frame/header_painter_util.h"
#include <algorithm>
diff --git a/ash/frame/header_painter_util.h b/ash/common/frame/header_painter_util.h
similarity index 91%
rename from ash/frame/header_painter_util.h
rename to ash/common/frame/header_painter_util.h
index d0b5e3c..71c42ad 100644
--- a/ash/frame/header_painter_util.h
+++ b/ash/common/frame/header_painter_util.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_FRAME_HEADER_PAINTER_UTIL_H_
-#define ASH_FRAME_HEADER_PAINTER_UTIL_H_
+#ifndef ASH_COMMON_FRAME_HEADER_PAINTER_UTIL_H_
+#define ASH_COMMON_FRAME_HEADER_PAINTER_UTIL_H_
#include "ash/ash_export.h"
#include "base/macros.h"
@@ -52,4 +52,4 @@
} // namespace ash
-#endif // ASH_FRAME_HEADER_PAINTER_UTIL_H_
+#endif // ASH_COMMON_FRAME_HEADER_PAINTER_UTIL_H_
diff --git a/ash/frame/header_view.cc b/ash/common/frame/header_view.cc
similarity index 96%
rename from ash/frame/header_view.cc
rename to ash/common/frame/header_view.cc
index 206489c..fbd326a 100644
--- a/ash/frame/header_view.cc
+++ b/ash/common/frame/header_view.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/frame/header_view.h"
+#include "ash/common/frame/header_view.h"
+#include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h"
+#include "ash/common/frame/default_header_painter.h"
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
-#include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
-#include "ash/frame/default_header_painter.h"
#include "ui/gfx/canvas.h"
#include "ui/views/controls/image_view.h"
#include "ui/views/widget/widget.h"
diff --git a/ash/frame/header_view.h b/ash/common/frame/header_view.h
similarity index 96%
rename from ash/frame/header_view.h
rename to ash/common/frame/header_view.h
index 78c9774..d96a62a3 100644
--- a/ash/frame/header_view.h
+++ b/ash/common/frame/header_view.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_FRAME_HEADER_VIEW_H_
-#define ASH_FRAME_HEADER_VIEW_H_
+#ifndef ASH_COMMON_FRAME_HEADER_VIEW_H_
+#define ASH_COMMON_FRAME_HEADER_VIEW_H_
#include <memory>
@@ -113,4 +113,4 @@
} // namespace ash
-#endif // ASH_FRAME_HEADER_VIEW_H_
+#endif // ASH_COMMON_FRAME_HEADER_VIEW_H_
diff --git a/ash/common/metrics/OWNERS b/ash/common/metrics/OWNERS
new file mode 100644
index 0000000..21cb7090
--- /dev/null
+++ b/ash/common/metrics/OWNERS
@@ -0,0 +1 @@
[email protected]
diff --git a/ash/metrics/gesture_action_type.h b/ash/common/metrics/gesture_action_type.h
similarity index 86%
rename from ash/metrics/gesture_action_type.h
rename to ash/common/metrics/gesture_action_type.h
index 120298dc1..feee85a 100644
--- a/ash/metrics/gesture_action_type.h
+++ b/ash/common/metrics/gesture_action_type.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_METRICS_GESTURE_ACTION_TYPE_H_
-#define ASH_METRICS_GESTURE_ACTION_TYPE_H_
+#ifndef ASH_COMMON_METRICS_GESTURE_ACTION_TYPE_H_
+#define ASH_COMMON_METRICS_GESTURE_ACTION_TYPE_H_
namespace ash {
@@ -37,4 +37,4 @@
} // namespace ash
-#endif // ASH_METRICS_GESTURE_ACTION_TYPE_H_
+#endif // ASH_COMMON_METRICS_GESTURE_ACTION_TYPE_H_
diff --git a/ash/metrics/pointer_metrics_recorder.cc b/ash/common/metrics/pointer_metrics_recorder.cc
similarity index 95%
rename from ash/metrics/pointer_metrics_recorder.cc
rename to ash/common/metrics/pointer_metrics_recorder.cc
index da85806..be9e91cb 100644
--- a/ash/metrics/pointer_metrics_recorder.cc
+++ b/ash/common/metrics/pointer_metrics_recorder.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/metrics/pointer_metrics_recorder.h"
+#include "ash/common/metrics/pointer_metrics_recorder.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/shared/app_types.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
#include "base/metrics/histogram_macros.h"
#include "ui/events/event_constants.h"
#include "ui/views/widget/widget.h"
diff --git a/ash/metrics/pointer_metrics_recorder.h b/ash/common/metrics/pointer_metrics_recorder.h
similarity index 82%
rename from ash/metrics/pointer_metrics_recorder.h
rename to ash/common/metrics/pointer_metrics_recorder.h
index e3d49f6..bf19e909 100644
--- a/ash/metrics/pointer_metrics_recorder.h
+++ b/ash/common/metrics/pointer_metrics_recorder.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef UI_ASH_METRICS_POINTER_METRICS_RECORDER_H_
-#define UI_ASH_METRICS_POINTER_METRICS_RECORDER_H_
+#ifndef UI_ASH_COMMON_METRICS_POINTER_METRICS_RECORDER_H_
+#define UI_ASH_COMMON_METRICS_POINTER_METRICS_RECORDER_H_
#include "ash/ash_export.h"
#include "base/macros.h"
@@ -36,4 +36,4 @@
} // namespace ash
-#endif // UI_ASH_METRICS_POINTER_METRICS_RECORDER_H_
+#endif // UI_ASH_COMMON_METRICS_POINTER_METRICS_RECORDER_H_
diff --git a/ash/metrics/pointer_metrics_recorder_unittest.cc b/ash/common/metrics/pointer_metrics_recorder_unittest.cc
similarity index 98%
rename from ash/metrics/pointer_metrics_recorder_unittest.cc
rename to ash/common/metrics/pointer_metrics_recorder_unittest.cc
index be1ae6d..ed212cd 100644
--- a/ash/metrics/pointer_metrics_recorder_unittest.cc
+++ b/ash/common/metrics/pointer_metrics_recorder_unittest.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/metrics/pointer_metrics_recorder.h"
+#include "ash/common/metrics/pointer_metrics_recorder.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/shared/app_types.h"
#include "ash/test/ash_test_base.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
#include "base/test/histogram_tester.h"
#include "ui/events/event.h"
#include "ui/views/pointer_watcher.h"
diff --git a/ash/metrics/task_switch_source.h b/ash/common/metrics/task_switch_source.h
similarity index 86%
rename from ash/metrics/task_switch_source.h
rename to ash/common/metrics/task_switch_source.h
index d915281..6b1bf0e 100644
--- a/ash/metrics/task_switch_source.h
+++ b/ash/common/metrics/task_switch_source.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_METRICS_TASK_SWITCH_SOURCE_H_
-#define ASH_METRICS_TASK_SWITCH_SOURCE_H_
+#ifndef ASH_COMMON_METRICS_TASK_SWITCH_SOURCE_H_
+#define ASH_COMMON_METRICS_TASK_SWITCH_SOURCE_H_
namespace ash {
@@ -27,4 +27,4 @@
} // namespace ash
-#endif // ASH_METRICS_TASK_SWITCH_SOURCE_H_
+#endif // ASH_COMMON_METRICS_TASK_SWITCH_SOURCE_H_
diff --git a/ash/metrics/user_metrics_action.h b/ash/common/metrics/user_metrics_action.h
similarity index 96%
rename from ash/metrics/user_metrics_action.h
rename to ash/common/metrics/user_metrics_action.h
index e76b613..0c6917a 100644
--- a/ash/metrics/user_metrics_action.h
+++ b/ash/common/metrics/user_metrics_action.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_METRICS_USER_METRICS_ACTION_H_
-#define ASH_METRICS_USER_METRICS_ACTION_H_
+#ifndef ASH_COMMON_METRICS_USER_METRICS_ACTION_H_
+#define ASH_COMMON_METRICS_USER_METRICS_ACTION_H_
namespace ash {
@@ -147,4 +147,4 @@
} // namespace ash
-#endif // ASH_METRICS_USER_METRICS_ACTION_H_
+#endif // ASH_COMMON_METRICS_USER_METRICS_ACTION_H_
diff --git a/ash/common/mojo_interface_factory.cc b/ash/common/mojo_interface_factory.cc
index 74a87496..f8a6b0fb 100644
--- a/ash/common/mojo_interface_factory.cc
+++ b/ash/common/mojo_interface_factory.cc
@@ -6,20 +6,20 @@
#include <utility>
-#include "ash/accelerators/accelerator_controller.h"
+#include "ash/common/accelerators/accelerator_controller.h"
#include "ash/common/cast_config_controller.h"
#include "ash/common/media_controller.h"
#include "ash/common/new_window_controller.h"
#include "ash/common/session/session_controller.h"
+#include "ash/common/shelf/shelf_controller.h"
#include "ash/common/shell_delegate.h"
#include "ash/common/shutdown_controller.h"
#include "ash/common/wallpaper/wallpaper_controller.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm_shell.h"
-#include "ash/shelf/shelf_controller.h"
#include "ash/system/locale/locale_notification_controller.h"
#include "ash/system/network/vpn_list.h"
#include "ash/system/tray/system_tray_controller.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
#include "base/bind.h"
#include "services/service_manager/public/cpp/interface_registry.h"
#include "ui/app_list/presenter/app_list.h"
diff --git a/ash/common/mus_property_mirror_ash_unittest.cc b/ash/common/mus_property_mirror_ash_unittest.cc
index a869e86..e81f05b0 100644
--- a/ash/common/mus_property_mirror_ash_unittest.cc
+++ b/ash/common/mus_property_mirror_ash_unittest.cc
@@ -6,9 +6,9 @@
#include <string>
+#include "ash/common/test/ash_test.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/window_properties.h"
-#include "ash/test/ash_test.h"
#include "base/strings/string16.h"
#include "base/strings/utf_string_conversions.h"
#include "ui/aura/client/aura_constants.h"
diff --git a/ash/shelf/app_list_button.cc b/ash/common/shelf/app_list_button.cc
similarity index 96%
rename from ash/shelf/app_list_button.cc
rename to ash/common/shelf/app_list_button.cc
index 6d2fb33..c9e3d30 100644
--- a/ash/shelf/app_list_button.cc
+++ b/ash/common/shelf/app_list_button.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/shelf/app_list_button.h"
+#include "ash/common/shelf/app_list_button.h"
+#include "ash/common/shelf/ink_drop_button_listener.h"
+#include "ash/common/shelf/shelf_constants.h"
+#include "ash/common/shelf/shelf_view.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wm_shell.h"
#include "ash/public/cpp/shelf_types.h"
-#include "ash/shelf/ink_drop_button_listener.h"
-#include "ash/shelf/shelf_constants.h"
-#include "ash/shelf/shelf_view.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/strings/grit/ash_strings.h"
#include "ash/system/tray/tray_popup_utils.h"
#include "base/memory/ptr_util.h"
diff --git a/ash/shelf/app_list_button.h b/ash/common/shelf/app_list_button.h
similarity index 94%
rename from ash/shelf/app_list_button.h
rename to ash/common/shelf/app_list_button.h
index 494017b2..d4a0fbe 100644
--- a/ash/shelf/app_list_button.h
+++ b/ash/common/shelf/app_list_button.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SHELF_APP_LIST_BUTTON_H_
-#define ASH_SHELF_APP_LIST_BUTTON_H_
+#ifndef ASH_COMMON_SHELF_APP_LIST_BUTTON_H_
+#define ASH_COMMON_SHELF_APP_LIST_BUTTON_H_
#include "ash/ash_export.h"
#include "base/macros.h"
@@ -69,4 +69,4 @@
} // namespace ash
-#endif // ASH_SHELF_APP_LIST_BUTTON_H_
+#endif // ASH_COMMON_SHELF_APP_LIST_BUTTON_H_
diff --git a/ash/shelf/app_list_shelf_item_delegate.cc b/ash/common/shelf/app_list_shelf_item_delegate.cc
similarity index 94%
rename from ash/shelf/app_list_shelf_item_delegate.cc
rename to ash/common/shelf/app_list_shelf_item_delegate.cc
index b2ba8a2..425ffecc 100644
--- a/ash/shelf/app_list_shelf_item_delegate.cc
+++ b/ash/common/shelf/app_list_shelf_item_delegate.cc
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/shelf/app_list_shelf_item_delegate.h"
+#include "ash/common/shelf/app_list_shelf_item_delegate.h"
+#include "ash/common/shelf/shelf_model.h"
#include "ash/common/wm_shell.h"
-#include "ash/shelf/shelf_model.h"
#include "ash/strings/grit/ash_strings.h"
#include "base/memory/ptr_util.h"
#include "ui/app_list/app_list_switches.h"
diff --git a/ash/shelf/app_list_shelf_item_delegate.h b/ash/common/shelf/app_list_shelf_item_delegate.h
similarity index 82%
rename from ash/shelf/app_list_shelf_item_delegate.h
rename to ash/common/shelf/app_list_shelf_item_delegate.h
index 0f52bf6..88f09d2 100644
--- a/ash/shelf/app_list_shelf_item_delegate.h
+++ b/ash/common/shelf/app_list_shelf_item_delegate.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SHELF_APP_LIST_SHELF_ITEM_DELEGATE_H_
-#define ASH_SHELF_APP_LIST_SHELF_ITEM_DELEGATE_H_
+#ifndef ASH_COMMON_SHELF_APP_LIST_SHELF_ITEM_DELEGATE_H_
+#define ASH_COMMON_SHELF_APP_LIST_SHELF_ITEM_DELEGATE_H_
-#include "ash/shelf/shelf_item_delegate.h"
+#include "ash/common/shelf/shelf_item_delegate.h"
#include "base/macros.h"
namespace ash {
@@ -36,4 +36,4 @@
} // namespace ash
-#endif // ASH_SHELF_APP_LIST_SHELF_ITEM_DELEGATE_H_
+#endif // ASH_COMMON_SHELF_APP_LIST_SHELF_ITEM_DELEGATE_H_
diff --git a/ash/shelf/ink_drop_button_listener.h b/ash/common/shelf/ink_drop_button_listener.h
similarity index 87%
rename from ash/shelf/ink_drop_button_listener.h
rename to ash/common/shelf/ink_drop_button_listener.h
index 48b10ae..4b6e752 100644
--- a/ash/shelf/ink_drop_button_listener.h
+++ b/ash/common/shelf/ink_drop_button_listener.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SHELF_INK_DROP_BUTTON_LISTENER_H_
-#define ASH_SHELF_INK_DROP_BUTTON_LISTENER_H_
+#ifndef ASH_COMMON_SHELF_INK_DROP_BUTTON_LISTENER_H_
+#define ASH_COMMON_SHELF_INK_DROP_BUTTON_LISTENER_H_
#include "ash/ash_export.h"
@@ -38,4 +38,4 @@
} // namespace ash
-#endif // ASH_SHELF_INK_DROP_BUTTON_LISTENER_H_
+#endif // ASH_COMMON_SHELF_INK_DROP_BUTTON_LISTENER_H_
diff --git a/ash/shelf/overflow_bubble.cc b/ash/common/shelf/overflow_bubble.cc
similarity index 91%
rename from ash/shelf/overflow_bubble.cc
rename to ash/common/shelf/overflow_bubble.cc
index 2f09f860..313b3e1 100644
--- a/ash/shelf/overflow_bubble.cc
+++ b/ash/common/shelf/overflow_bubble.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/shelf/overflow_bubble.h"
+#include "ash/common/shelf/overflow_bubble.h"
+#include "ash/common/shelf/overflow_bubble_view.h"
+#include "ash/common/shelf/overflow_button.h"
+#include "ash/common/shelf/shelf_view.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wm_shell.h"
-#include "ash/shelf/overflow_bubble_view.h"
-#include "ash/shelf/overflow_button.h"
-#include "ash/shelf/shelf_view.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/system/tray/tray_background_view.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/views/widget/widget.h"
diff --git a/ash/shelf/overflow_bubble.h b/ash/common/shelf/overflow_bubble.h
similarity index 93%
rename from ash/shelf/overflow_bubble.h
rename to ash/common/shelf/overflow_bubble.h
index d6afdf83..201018c 100644
--- a/ash/shelf/overflow_bubble.h
+++ b/ash/common/shelf/overflow_bubble.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SHELF_OVERFLOW_BUBBLE_H_
-#define ASH_SHELF_OVERFLOW_BUBBLE_H_
+#ifndef ASH_COMMON_SHELF_OVERFLOW_BUBBLE_H_
+#define ASH_COMMON_SHELF_OVERFLOW_BUBBLE_H_
#include "base/macros.h"
#include "ui/views/pointer_watcher.h"
@@ -62,4 +62,4 @@
} // namespace ash
-#endif // ASH_SHELF_OVERFLOW_BUBBLE_H_
+#endif // ASH_COMMON_SHELF_OVERFLOW_BUBBLE_H_
diff --git a/ash/shelf/overflow_bubble_view.cc b/ash/common/shelf/overflow_bubble_view.cc
similarity index 97%
rename from ash/shelf/overflow_bubble_view.cc
rename to ash/common/shelf/overflow_bubble_view.cc
index 80d8f09..ebee64e 100644
--- a/ash/shelf/overflow_bubble_view.cc
+++ b/ash/common/shelf/overflow_bubble_view.cc
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/shelf/overflow_bubble_view.h"
+#include "ash/common/shelf/overflow_bubble_view.h"
#include <algorithm>
+#include "ash/common/shelf/shelf_constants.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/shelf_constants.h"
-#include "ash/shelf/wm_shelf.h"
#include "ui/display/display.h"
#include "ui/display/screen.h"
#include "ui/events/event.h"
diff --git a/ash/shelf/overflow_bubble_view.h b/ash/common/shelf/overflow_bubble_view.h
similarity index 92%
rename from ash/shelf/overflow_bubble_view.h
rename to ash/common/shelf/overflow_bubble_view.h
index 1e2ae83..f9c1678 100644
--- a/ash/shelf/overflow_bubble_view.h
+++ b/ash/common/shelf/overflow_bubble_view.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SHELF_OVERFLOW_BUBBLE_VIEW_H_
-#define ASH_SHELF_OVERFLOW_BUBBLE_VIEW_H_
+#ifndef ASH_COMMON_SHELF_OVERFLOW_BUBBLE_VIEW_H_
+#define ASH_COMMON_SHELF_OVERFLOW_BUBBLE_VIEW_H_
#include "ash/ash_export.h"
#include "base/macros.h"
@@ -66,4 +66,4 @@
} // namespace ash
-#endif // ASH_SHELF_OVERFLOW_BUBBLE_VIEW_H_
+#endif // ASH_COMMON_SHELF_OVERFLOW_BUBBLE_VIEW_H_
diff --git a/ash/shelf/overflow_button.cc b/ash/common/shelf/overflow_button.cc
similarity index 96%
rename from ash/shelf/overflow_button.cc
rename to ash/common/shelf/overflow_button.cc
index e7944aa..ccb585c 100644
--- a/ash/shelf/overflow_button.cc
+++ b/ash/common/shelf/overflow_button.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/shelf/overflow_button.h"
+#include "ash/common/shelf/overflow_button.h"
+#include "ash/common/shelf/shelf_constants.h"
+#include "ash/common/shelf/shelf_view.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/resources/vector_icons/vector_icons.h"
-#include "ash/shelf/shelf_constants.h"
-#include "ash/shelf/shelf_view.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/strings/grit/ash_strings.h"
#include "base/memory/ptr_util.h"
#include "ui/base/l10n/l10n_util.h"
diff --git a/ash/shelf/overflow_button.h b/ash/common/shelf/overflow_button.h
similarity index 93%
rename from ash/shelf/overflow_button.h
rename to ash/common/shelf/overflow_button.h
index aaca229..32bf382 100644
--- a/ash/shelf/overflow_button.h
+++ b/ash/common/shelf/overflow_button.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SHELF_OVERFLOW_BUTTON_H_
-#define ASH_SHELF_OVERFLOW_BUTTON_H_
+#ifndef ASH_COMMON_SHELF_OVERFLOW_BUTTON_H_
+#define ASH_COMMON_SHELF_OVERFLOW_BUTTON_H_
#include "base/macros.h"
#include "ui/gfx/geometry/rect.h"
@@ -64,4 +64,4 @@
} // namespace ash
-#endif // ASH_SHELF_OVERFLOW_BUTTON_H_
+#endif // ASH_COMMON_SHELF_OVERFLOW_BUTTON_H_
diff --git a/ash/shelf/shelf_alignment_menu.cc b/ash/common/shelf/shelf_alignment_menu.cc
similarity index 93%
rename from ash/shelf/shelf_alignment_menu.cc
rename to ash/common/shelf/shelf_alignment_menu.cc
index 5429b4e..12c48b2 100644
--- a/ash/shelf/shelf_alignment_menu.cc
+++ b/ash/common/shelf/shelf_alignment_menu.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/shelf/shelf_alignment_menu.h"
+#include "ash/common/shelf/shelf_alignment_menu.h"
+#include "ash/common/metrics/user_metrics_action.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wm_shell.h"
-#include "ash/metrics/user_metrics_action.h"
#include "ash/public/cpp/shelf_types.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/strings/grit/ash_strings.h"
namespace ash {
diff --git a/ash/shelf/shelf_alignment_menu.h b/ash/common/shelf/shelf_alignment_menu.h
similarity index 87%
rename from ash/shelf/shelf_alignment_menu.h
rename to ash/common/shelf/shelf_alignment_menu.h
index ddbdcda..e315317 100644
--- a/ash/shelf/shelf_alignment_menu.h
+++ b/ash/common/shelf/shelf_alignment_menu.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SHELF_SHELF_ALIGNMENT_MENU_H_
-#define ASH_SHELF_SHELF_ALIGNMENT_MENU_H_
+#ifndef ASH_COMMON_SHELF_SHELF_ALIGNMENT_MENU_H_
+#define ASH_COMMON_SHELF_SHELF_ALIGNMENT_MENU_H_
#include "ash/ash_export.h"
#include "base/macros.h"
@@ -40,4 +40,4 @@
} // namespace ash
-#endif // ASH_SHELF_SHELF_ALIGNMENT_MENU_H_
+#endif // ASH_COMMON_SHELF_SHELF_ALIGNMENT_MENU_H_
diff --git a/ash/shelf/shelf_application_menu_model.cc b/ash/common/shelf/shelf_application_menu_model.cc
similarity index 95%
rename from ash/shelf/shelf_application_menu_model.cc
rename to ash/common/shelf/shelf_application_menu_model.cc
index 672c6a8..7bf323c 100644
--- a/ash/shelf/shelf_application_menu_model.cc
+++ b/ash/common/shelf/shelf_application_menu_model.cc
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/shelf/shelf_application_menu_model.h"
+#include "ash/common/shelf/shelf_application_menu_model.h"
#include <stddef.h>
#include <limits>
#include <utility>
+#include "ash/common/shelf/shelf_item_delegate.h"
#include "ash/public/cpp/shelf_application_menu_item.h"
-#include "ash/shelf/shelf_item_delegate.h"
#include "base/metrics/histogram_macros.h"
namespace {
diff --git a/ash/shelf/shelf_application_menu_model.h b/ash/common/shelf/shelf_application_menu_model.h
similarity index 91%
rename from ash/shelf/shelf_application_menu_model.h
rename to ash/common/shelf/shelf_application_menu_model.h
index 2093ddd7..7abe8b5 100644
--- a/ash/shelf/shelf_application_menu_model.h
+++ b/ash/common/shelf/shelf_application_menu_model.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SHELF_SHELF_APPLICATION_MENU_MODEL_H_
-#define ASH_SHELF_SHELF_APPLICATION_MENU_MODEL_H_
+#ifndef ASH_COMMON_SHELF_SHELF_APPLICATION_MENU_MODEL_H_
+#define ASH_COMMON_SHELF_SHELF_APPLICATION_MENU_MODEL_H_
#include <memory>
#include <vector>
@@ -61,4 +61,4 @@
} // namespace ash
-#endif // ASH_SHELF_SHELF_APPLICATION_MENU_MODEL_H_
+#endif // ASH_COMMON_SHELF_SHELF_APPLICATION_MENU_MODEL_H_
diff --git a/ash/shelf/shelf_application_menu_model_unittest.cc b/ash/common/shelf/shelf_application_menu_model_unittest.cc
similarity index 97%
rename from ash/shelf/shelf_application_menu_model_unittest.cc
rename to ash/common/shelf/shelf_application_menu_model_unittest.cc
index b2b7c0e..aebee58 100644
--- a/ash/shelf/shelf_application_menu_model_unittest.cc
+++ b/ash/common/shelf/shelf_application_menu_model_unittest.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/shelf/shelf_application_menu_model.h"
+#include "ash/common/shelf/shelf_application_menu_model.h"
#include <utility>
+#include "ash/common/test/test_shelf_item_delegate.h"
#include "ash/public/cpp/shelf_application_menu_item.h"
-#include "ash/test/test_shelf_item_delegate.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/ash/shelf/shelf_background_animator.cc b/ash/common/shelf/shelf_background_animator.cc
similarity index 97%
rename from ash/shelf/shelf_background_animator.cc
rename to ash/common/shelf/shelf_background_animator.cc
index 00b3347c..ad0311e 100644
--- a/ash/shelf/shelf_background_animator.cc
+++ b/ash/common/shelf/shelf_background_animator.cc
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/shelf/shelf_background_animator.h"
+#include "ash/common/shelf/shelf_background_animator.h"
#include <algorithm>
#include "ash/animation/animation_change_type.h"
+#include "ash/common/shelf/shelf_background_animator_observer.h"
+#include "ash/common/shelf/shelf_constants.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wallpaper/wallpaper_controller.h"
-#include "ash/shelf/shelf_background_animator_observer.h"
-#include "ash/shelf/shelf_constants.h"
-#include "ash/shelf/wm_shelf.h"
#include "ui/gfx/animation/slide_animation.h"
#include "ui/gfx/color_utils.h"
diff --git a/ash/shelf/shelf_background_animator.h b/ash/common/shelf/shelf_background_animator.h
similarity index 96%
rename from ash/shelf/shelf_background_animator.h
rename to ash/common/shelf/shelf_background_animator.h
index a12fe842..72747494 100644
--- a/ash/shelf/shelf_background_animator.h
+++ b/ash/common/shelf/shelf_background_animator.h
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SHELF_SHELF_BACKGROUND_ANIMATOR_H_
-#define ASH_SHELF_SHELF_BACKGROUND_ANIMATOR_H_
+#ifndef ASH_COMMON_SHELF_SHELF_BACKGROUND_ANIMATOR_H_
+#define ASH_COMMON_SHELF_SHELF_BACKGROUND_ANIMATOR_H_
#include <memory>
#include <vector>
#include "ash/ash_export.h"
+#include "ash/common/shelf/wm_shelf_observer.h"
#include "ash/common/wallpaper/wallpaper_controller_observer.h"
#include "ash/public/cpp/shelf_types.h"
-#include "ash/shelf/wm_shelf_observer.h"
#include "base/macros.h"
#include "base/observer_list.h"
#include "third_party/skia/include/core/SkColor.h"
@@ -184,4 +184,4 @@
} // namespace ash
-#endif // ASH_SHELF_SHELF_BACKGROUND_ANIMATOR_H_
+#endif // ASH_COMMON_SHELF_SHELF_BACKGROUND_ANIMATOR_H_
diff --git a/ash/shelf/shelf_background_animator_observer.h b/ash/common/shelf/shelf_background_animator_observer.h
similarity index 78%
rename from ash/shelf/shelf_background_animator_observer.h
rename to ash/common/shelf/shelf_background_animator_observer.h
index 6c45073..bf8ca105 100644
--- a/ash/shelf/shelf_background_animator_observer.h
+++ b/ash/common/shelf/shelf_background_animator_observer.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SHELF_SHELF_BACKGROUND_ANIMATOR_OBSERVER_H_
-#define ASH_SHELF_SHELF_BACKGROUND_ANIMATOR_OBSERVER_H_
+#ifndef ASH_COMMON_SHELF_SHELF_BACKGROUND_ANIMATOR_OBSERVER_H_
+#define ASH_COMMON_SHELF_SHELF_BACKGROUND_ANIMATOR_OBSERVER_H_
#include "ash/ash_export.h"
#include "third_party/skia/include/core/SkColor.h"
@@ -25,4 +25,4 @@
} // namespace ash
-#endif // ASH_SHELF_SHELF_BACKGROUND_ANIMATOR_OBSERVER_H_
+#endif // ASH_COMMON_SHELF_SHELF_BACKGROUND_ANIMATOR_OBSERVER_H_
diff --git a/ash/shelf/shelf_background_animator_unittest.cc b/ash/common/shelf/shelf_background_animator_unittest.cc
similarity index 98%
rename from ash/shelf/shelf_background_animator_unittest.cc
rename to ash/common/shelf/shelf_background_animator_unittest.cc
index 5431ca6a..9a3784c 100644
--- a/ash/shelf/shelf_background_animator_unittest.cc
+++ b/ash/common/shelf/shelf_background_animator_unittest.cc
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/shelf/shelf_background_animator.h"
+#include "ash/common/shelf/shelf_background_animator.h"
#include <memory>
#include "ash/animation/animation_change_type.h"
+#include "ash/common/shelf/shelf_background_animator_observer.h"
+#include "ash/common/shelf/shelf_constants.h"
#include "ash/common/wallpaper/wallpaper_controller.h"
#include "ash/common/wm_shell.h"
-#include "ash/shelf/shelf_background_animator_observer.h"
-#include "ash/shelf/shelf_constants.h"
#include "base/bind.h"
#include "base/macros.h"
#include "base/test/test_mock_time_task_runner.h"
diff --git a/ash/shelf/shelf_button.cc b/ash/common/shelf/shelf_button.cc
similarity index 98%
rename from ash/shelf/shelf_button.cc
rename to ash/common/shelf/shelf_button.cc
index bcd86583..d5d32ff7 100644
--- a/ash/shelf/shelf_button.cc
+++ b/ash/common/shelf/shelf_button.cc
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/shelf/shelf_button.h"
+#include "ash/common/shelf/shelf_button.h"
#include <algorithm>
#include "ash/common/ash_constants.h"
-#include "ash/shelf/ink_drop_button_listener.h"
-#include "ash/shelf/shelf_constants.h"
-#include "ash/shelf/shelf_view.h"
-#include "ash/shelf/wm_shelf.h"
+#include "ash/common/shelf/ink_drop_button_listener.h"
+#include "ash/common/shelf/shelf_constants.h"
+#include "ash/common/shelf/shelf_view.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "base/memory/ptr_util.h"
#include "base/time/time.h"
#include "skia/ext/image_operations.h"
diff --git a/ash/shelf/shelf_button.h b/ash/common/shelf/shelf_button.h
similarity index 96%
rename from ash/shelf/shelf_button.h
rename to ash/common/shelf/shelf_button.h
index 540d20ac..4f828ea18 100644
--- a/ash/shelf/shelf_button.h
+++ b/ash/common/shelf/shelf_button.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SHELF_SHELF_BUTTON_H_
-#define ASH_SHELF_SHELF_BUTTON_H_
+#ifndef ASH_COMMON_SHELF_SHELF_BUTTON_H_
+#define ASH_COMMON_SHELF_SHELF_BUTTON_H_
#include "ash/ash_export.h"
#include "base/macros.h"
@@ -126,4 +126,4 @@
} // namespace ash
-#endif // ASH_SHELF_SHELF_BUTTON_H_
+#endif // ASH_COMMON_SHELF_SHELF_BUTTON_H_
diff --git a/ash/shelf/shelf_button_pressed_metric_tracker.cc b/ash/common/shelf/shelf_button_pressed_metric_tracker.cc
similarity index 97%
rename from ash/shelf/shelf_button_pressed_metric_tracker.cc
rename to ash/common/shelf/shelf_button_pressed_metric_tracker.cc
index 0724cf6..a27ff74 100644
--- a/ash/shelf/shelf_button_pressed_metric_tracker.cc
+++ b/ash/common/shelf/shelf_button_pressed_metric_tracker.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/shelf/shelf_button_pressed_metric_tracker.h"
+#include "ash/common/shelf/shelf_button_pressed_metric_tracker.h"
#include "ash/common/wm_shell.h"
#include "base/metrics/histogram_macros.h"
diff --git a/ash/shelf/shelf_button_pressed_metric_tracker.h b/ash/common/shelf/shelf_button_pressed_metric_tracker.h
similarity index 91%
rename from ash/shelf/shelf_button_pressed_metric_tracker.h
rename to ash/common/shelf/shelf_button_pressed_metric_tracker.h
index 4c9044b..5cf1991 100644
--- a/ash/shelf/shelf_button_pressed_metric_tracker.h
+++ b/ash/common/shelf/shelf_button_pressed_metric_tracker.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SHELF_SHELF_BUTTON_PRESSED_METRIC_TRACKER_H_
-#define ASH_SHELF_SHELF_BUTTON_PRESSED_METRIC_TRACKER_H_
+#ifndef ASH_COMMON_SHELF_SHELF_BUTTON_PRESSED_METRIC_TRACKER_H_
+#define ASH_COMMON_SHELF_SHELF_BUTTON_PRESSED_METRIC_TRACKER_H_
#include <memory>
#include "ash/ash_export.h"
-#include "ash/shelf/shelf_item_delegate.h"
+#include "ash/common/shelf/shelf_item_delegate.h"
#include "base/macros.h"
#include "base/time/tick_clock.h"
#include "base/time/time.h"
@@ -88,4 +88,4 @@
} // namespace ash
-#endif // ASH_SHELF_SHELF_BUTTON_PRESSED_METRIC_TRACKER_H_
+#endif // ASH_COMMON_SHELF_SHELF_BUTTON_PRESSED_METRIC_TRACKER_H_
diff --git a/ash/shelf/shelf_button_pressed_metric_tracker_unittest.cc b/ash/common/shelf/shelf_button_pressed_metric_tracker_unittest.cc
similarity index 98%
rename from ash/shelf/shelf_button_pressed_metric_tracker_unittest.cc
rename to ash/common/shelf/shelf_button_pressed_metric_tracker_unittest.cc
index 1cc2879..2461306 100644
--- a/ash/shelf/shelf_button_pressed_metric_tracker_unittest.cc
+++ b/ash/common/shelf/shelf_button_pressed_metric_tracker_unittest.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/shelf/shelf_button_pressed_metric_tracker.h"
+#include "ash/common/shelf/shelf_button_pressed_metric_tracker.h"
#include <utility>
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wm_shell.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/shelf_button_pressed_metric_tracker_test_api.h"
#include "ash/test/shelf_view_test_api.h"
diff --git a/ash/shelf/shelf_constants.cc b/ash/common/shelf/shelf_constants.cc
similarity index 96%
rename from ash/shelf/shelf_constants.cc
rename to ash/common/shelf/shelf_constants.cc
index 1d43a73c..80aafcd1 100644
--- a/ash/shelf/shelf_constants.cc
+++ b/ash/common/shelf/shelf_constants.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/shelf/shelf_constants.h"
+#include "ash/common/shelf/shelf_constants.h"
#include "base/logging.h"
#include "third_party/skia/include/core/SkColor.h"
diff --git a/ash/shelf/shelf_constants.h b/ash/common/shelf/shelf_constants.h
similarity index 95%
rename from ash/shelf/shelf_constants.h
rename to ash/common/shelf/shelf_constants.h
index 9be93c81..bc783fe 100644
--- a/ash/shelf/shelf_constants.h
+++ b/ash/common/shelf/shelf_constants.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SHELF_SHELF_CONSTANTS_H_
-#define ASH_SHELF_SHELF_CONSTANTS_H_
+#ifndef ASH_COMMON_SHELF_SHELF_CONSTANTS_H_
+#define ASH_COMMON_SHELF_SHELF_CONSTANTS_H_
#include "ash/ash_export.h"
#include "third_party/skia/include/core/SkColor.h"
@@ -79,4 +79,4 @@
} // namespace ash
-#endif // ASH_SHELF_SHELF_CONSTANTS_H_
+#endif // ASH_COMMON_SHELF_SHELF_CONSTANTS_H_
diff --git a/ash/shelf/shelf_controller.cc b/ash/common/shelf/shelf_controller.cc
similarity index 98%
rename from ash/shelf/shelf_controller.cc
rename to ash/common/shelf/shelf_controller.cc
index 4a0130d..5bfece4 100644
--- a/ash/shelf/shelf_controller.cc
+++ b/ash/common/shelf/shelf_controller.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/shelf/shelf_controller.h"
+#include "ash/common/shelf/shelf_controller.h"
+#include "ash/common/shelf/shelf_item_delegate.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/shelf_item_delegate.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "base/strings/utf_string_conversions.h"
#include "ui/base/models/simple_menu_model.h"
diff --git a/ash/shelf/shelf_controller.h b/ash/common/shelf/shelf_controller.h
similarity index 91%
rename from ash/shelf/shelf_controller.h
rename to ash/common/shelf/shelf_controller.h
index de4a19ac..b058d4f 100644
--- a/ash/shelf/shelf_controller.h
+++ b/ash/common/shelf/shelf_controller.h
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SHELF_SHELF_CONTROLLER_H_
-#define ASH_SHELF_SHELF_CONTROLLER_H_
+#ifndef ASH_COMMON_SHELF_SHELF_CONTROLLER_H_
+#define ASH_COMMON_SHELF_SHELF_CONTROLLER_H_
#include <map>
#include <string>
+#include "ash/common/shelf/shelf_item_types.h"
+#include "ash/common/shelf/shelf_model.h"
#include "ash/public/cpp/shelf_types.h"
#include "ash/public/interfaces/shelf.mojom.h"
-#include "ash/shelf/shelf_item_types.h"
-#include "ash/shelf/shelf_model.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "mojo/public/cpp/bindings/interface_ptr_set.h"
@@ -73,4 +73,4 @@
} // namespace ash
-#endif // ASH_SHELF_SHELF_CONTROLLER_H_
+#endif // ASH_COMMON_SHELF_SHELF_CONTROLLER_H_
diff --git a/ash/shelf/shelf_delegate.h b/ash/common/shelf/shelf_delegate.h
similarity index 90%
rename from ash/shelf/shelf_delegate.h
rename to ash/common/shelf/shelf_delegate.h
index a19facb..8f83b16 100644
--- a/ash/shelf/shelf_delegate.h
+++ b/ash/common/shelf/shelf_delegate.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SHELF_SHELF_DELEGATE_H_
-#define ASH_SHELF_SHELF_DELEGATE_H_
+#ifndef ASH_COMMON_SHELF_SHELF_DELEGATE_H_
+#define ASH_COMMON_SHELF_SHELF_DELEGATE_H_
#include <string>
#include "ash/ash_export.h"
-#include "ash/shelf/shelf_item_types.h"
+#include "ash/common/shelf/shelf_item_types.h"
namespace ash {
@@ -52,4 +52,4 @@
} // namespace ash
-#endif // ASH_SHELF_SHELF_DELEGATE_H_
+#endif // ASH_COMMON_SHELF_SHELF_DELEGATE_H_
diff --git a/ash/shelf/shelf_item_delegate.cc b/ash/common/shelf/shelf_item_delegate.cc
similarity index 91%
rename from ash/shelf/shelf_item_delegate.cc
rename to ash/common/shelf/shelf_item_delegate.cc
index 9eb63c2..bc3ec8c3 100644
--- a/ash/shelf/shelf_item_delegate.cc
+++ b/ash/common/shelf/shelf_item_delegate.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/shelf/shelf_item_delegate.h"
+#include "ash/common/shelf/shelf_item_delegate.h"
#include "ui/display/types/display_constants.h"
diff --git a/ash/shelf/shelf_item_delegate.h b/ash/common/shelf/shelf_item_delegate.h
similarity index 92%
rename from ash/shelf/shelf_item_delegate.h
rename to ash/common/shelf/shelf_item_delegate.h
index 028d588..8ff4aed 100644
--- a/ash/shelf/shelf_item_delegate.h
+++ b/ash/common/shelf/shelf_item_delegate.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SHELF_SHELF_ITEM_DELEGATE_H_
-#define ASH_SHELF_SHELF_ITEM_DELEGATE_H_
+#ifndef ASH_COMMON_SHELF_SHELF_ITEM_DELEGATE_H_
+#define ASH_COMMON_SHELF_SHELF_ITEM_DELEGATE_H_
#include <stdint.h>
@@ -48,4 +48,4 @@
} // namespace ash
-#endif // ASH_SHELF_SHELF_ITEM_DELEGATE_H_
+#endif // ASH_COMMON_SHELF_SHELF_ITEM_DELEGATE_H_
diff --git a/ash/shelf/shelf_item_types.cc b/ash/common/shelf/shelf_item_types.cc
similarity index 86%
rename from ash/shelf/shelf_item_types.cc
rename to ash/common/shelf/shelf_item_types.cc
index 6345fde..36baad1 100644
--- a/ash/shelf/shelf_item_types.cc
+++ b/ash/common/shelf/shelf_item_types.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/shelf/shelf_item_types.h"
+#include "ash/common/shelf/shelf_item_types.h"
namespace ash {
diff --git a/ash/shelf/shelf_item_types.h b/ash/common/shelf/shelf_item_types.h
similarity index 89%
rename from ash/shelf/shelf_item_types.h
rename to ash/common/shelf/shelf_item_types.h
index ab587d3..62d279eb 100644
--- a/ash/shelf/shelf_item_types.h
+++ b/ash/common/shelf/shelf_item_types.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SHELF_SHELF_ITEM_TYPES_H_
-#define ASH_SHELF_SHELF_ITEM_TYPES_H_
+#ifndef ASH_COMMON_SHELF_SHELF_ITEM_TYPES_H_
+#define ASH_COMMON_SHELF_SHELF_ITEM_TYPES_H_
// TODO(msw): Rename these files to shelf_item.*; audit users.
@@ -50,4 +50,4 @@
} // namespace ash
-#endif // ASH_SHELF_SHELF_ITEM_TYPES_H_
+#endif // ASH_COMMON_SHELF_SHELF_ITEM_TYPES_H_
diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/common/shelf/shelf_layout_manager.cc
similarity index 98%
rename from ash/shelf/shelf_layout_manager.cc
rename to ash/common/shelf/shelf_layout_manager.cc
index fcd8036c..5849bb7 100644
--- a/ash/shelf/shelf_layout_manager.cc
+++ b/ash/common/shelf/shelf_layout_manager.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/shelf/shelf_layout_manager.h"
+#include "ash/common/shelf/shelf_layout_manager.h"
#include <algorithm>
#include <cmath>
@@ -11,19 +11,19 @@
#include "ash/animation/animation_change_type.h"
#include "ash/common/session/session_controller.h"
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/shelf/shelf_constants.h"
+#include "ash/common/shelf/shelf_layout_manager_observer.h"
+#include "ash/common/shelf/shelf_widget.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/wm/fullscreen_window_finder.h"
+#include "ash/common/wm/mru_window_tracker.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_screen_util.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/shelf_constants.h"
-#include "ash/shelf/shelf_layout_manager_observer.h"
-#include "ash/shelf/shelf_widget.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/system/status_area_widget.h"
-#include "ash/wm/fullscreen_window_finder.h"
-#include "ash/wm/mru_window_tracker.h"
-#include "ash/wm/window_state.h"
-#include "ash/wm/wm_screen_util.h"
#include "base/auto_reset.h"
#include "base/command_line.h"
#include "base/i18n/rtl.h"
diff --git a/ash/shelf/shelf_layout_manager.h b/ash/common/shelf/shelf_layout_manager.h
similarity index 96%
rename from ash/shelf/shelf_layout_manager.h
rename to ash/common/shelf/shelf_layout_manager.h
index 505cf0e..87f598a 100644
--- a/ash/shelf/shelf_layout_manager.h
+++ b/ash/common/shelf/shelf_layout_manager.h
@@ -2,21 +2,21 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
-#define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
+#ifndef ASH_COMMON_SHELF_SHELF_LAYOUT_MANAGER_H_
+#define ASH_COMMON_SHELF_SHELF_LAYOUT_MANAGER_H_
#include <memory>
#include "ash/ash_export.h"
#include "ash/common/session/session_state_observer.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/shell_observer.h"
+#include "ash/common/wm/dock/docked_window_layout_manager_observer.h"
+#include "ash/common/wm/lock_state_observer.h"
+#include "ash/common/wm/wm_snap_to_pixel_layout_manager.h"
+#include "ash/common/wm/workspace/workspace_types.h"
#include "ash/common/wm_activation_observer.h"
#include "ash/public/cpp/shelf_types.h"
-#include "ash/shelf/wm_shelf.h"
-#include "ash/wm/dock/docked_window_layout_manager_observer.h"
-#include "ash/wm/lock_state_observer.h"
-#include "ash/wm/wm_snap_to_pixel_layout_manager.h"
-#include "ash/wm/workspace/workspace_types.h"
#include "base/macros.h"
#include "base/observer_list.h"
#include "base/timer/timer.h"
@@ -362,4 +362,4 @@
} // namespace ash
-#endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
+#endif // ASH_COMMON_SHELF_SHELF_LAYOUT_MANAGER_H_
diff --git a/ash/shelf/shelf_layout_manager_observer.h b/ash/common/shelf/shelf_layout_manager_observer.h
similarity index 80%
rename from ash/shelf/shelf_layout_manager_observer.h
rename to ash/common/shelf/shelf_layout_manager_observer.h
index 8aac32d..00d03b13 100644
--- a/ash/shelf/shelf_layout_manager_observer.h
+++ b/ash/common/shelf/shelf_layout_manager_observer.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SHELF_SHELF_LAYOUT_MANAGER_OBSERVER_H_
-#define ASH_SHELF_SHELF_LAYOUT_MANAGER_OBSERVER_H_
+#ifndef ASH_COMMON_SHELF_SHELF_LAYOUT_MANAGER_OBSERVER_H_
+#define ASH_COMMON_SHELF_SHELF_LAYOUT_MANAGER_OBSERVER_H_
#include "ash/ash_export.h"
+#include "ash/common/shelf/shelf_background_animator.h"
#include "ash/public/cpp/shelf_types.h"
-#include "ash/shelf/shelf_background_animator.h"
namespace ash {
@@ -33,4 +33,4 @@
} // namespace ash
-#endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_OBSERVER_H_
+#endif // ASH_COMMON_SHELF_SHELF_LAYOUT_MANAGER_OBSERVER_H_
diff --git a/ash/shelf/shelf_locking_manager.cc b/ash/common/shelf/shelf_locking_manager.cc
similarity index 95%
rename from ash/shelf/shelf_locking_manager.cc
rename to ash/common/shelf/shelf_locking_manager.cc
index 362eedc..aabc145 100644
--- a/ash/shelf/shelf_locking_manager.cc
+++ b/ash/common/shelf/shelf_locking_manager.cc
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/shelf/shelf_locking_manager.h"
+#include "ash/common/shelf/shelf_locking_manager.h"
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wm_shell.h"
-#include "ash/shelf/wm_shelf.h"
namespace ash {
diff --git a/ash/shelf/shelf_locking_manager.h b/ash/common/shelf/shelf_locking_manager.h
similarity index 87%
rename from ash/shelf/shelf_locking_manager.h
rename to ash/common/shelf/shelf_locking_manager.h
index b40e2bb..2bf015e 100644
--- a/ash/shelf/shelf_locking_manager.h
+++ b/ash/common/shelf/shelf_locking_manager.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SHELF_SHELF_LOCKING_MANAGER_H_
-#define ASH_SHELF_SHELF_LOCKING_MANAGER_H_
+#ifndef ASH_COMMON_SHELF_SHELF_LOCKING_MANAGER_H_
+#define ASH_COMMON_SHELF_SHELF_LOCKING_MANAGER_H_
#include "ash/ash_export.h"
#include "ash/common/session/session_state_observer.h"
#include "ash/common/shell_observer.h"
+#include "ash/common/wm/lock_state_observer.h"
#include "ash/public/cpp/shelf_types.h"
-#include "ash/wm/lock_state_observer.h"
namespace ash {
@@ -49,4 +49,4 @@
} // namespace ash
-#endif // ASH_SHELF_SHELF_LOCKING_MANAGER_H_
+#endif // ASH_COMMON_SHELF_SHELF_LOCKING_MANAGER_H_
diff --git a/ash/shelf/shelf_locking_manager_unittest.cc b/ash/common/shelf/shelf_locking_manager_unittest.cc
similarity index 96%
rename from ash/shelf/shelf_locking_manager_unittest.cc
rename to ash/common/shelf/shelf_locking_manager_unittest.cc
index 7d57160e..d225a937 100644
--- a/ash/shelf/shelf_locking_manager_unittest.cc
+++ b/ash/common/shelf/shelf_locking_manager_unittest.cc
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/shelf/shelf_locking_manager.h"
+#include "ash/common/shelf/shelf_locking_manager.h"
#include "ash/common/session/session_state_delegate.h"
-#include "ash/shelf/wm_shelf.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/test/ash_test_base.h"
namespace ash {
diff --git a/ash/shelf/shelf_model.cc b/ash/common/shelf/shelf_model.cc
similarity index 97%
rename from ash/shelf/shelf_model.cc
rename to ash/common/shelf/shelf_model.cc
index 7c6e281f..a6844758 100644
--- a/ash/shelf/shelf_model.cc
+++ b/ash/common/shelf/shelf_model.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/shelf/shelf_model.h"
+#include "ash/common/shelf/shelf_model.h"
#include <algorithm>
-#include "ash/shelf/shelf_item_delegate.h"
-#include "ash/shelf/shelf_model_observer.h"
+#include "ash/common/shelf/shelf_item_delegate.h"
+#include "ash/common/shelf/shelf_model_observer.h"
namespace ash {
diff --git a/ash/shelf/shelf_model.h b/ash/common/shelf/shelf_model.h
similarity index 95%
rename from ash/shelf/shelf_model.h
rename to ash/common/shelf/shelf_model.h
index 727e23fa..a5f61e80 100644
--- a/ash/shelf/shelf_model.h
+++ b/ash/common/shelf/shelf_model.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SHELF_SHELF_MODEL_H_
-#define ASH_SHELF_SHELF_MODEL_H_
+#ifndef ASH_COMMON_SHELF_SHELF_MODEL_H_
+#define ASH_COMMON_SHELF_SHELF_MODEL_H_
#include <map>
#include <memory>
#include "ash/ash_export.h"
-#include "ash/shelf/shelf_item_types.h"
+#include "ash/common/shelf/shelf_item_types.h"
#include "base/macros.h"
#include "base/observer_list.h"
@@ -108,4 +108,4 @@
} // namespace ash
-#endif // ASH_SHELF_SHELF_MODEL_H_
+#endif // ASH_COMMON_SHELF_SHELF_MODEL_H_
diff --git a/ash/shelf/shelf_model_observer.h b/ash/common/shelf/shelf_model_observer.h
similarity index 87%
rename from ash/shelf/shelf_model_observer.h
rename to ash/common/shelf/shelf_model_observer.h
index 70e7156..794300d 100644
--- a/ash/shelf/shelf_model_observer.h
+++ b/ash/common/shelf/shelf_model_observer.h
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SHELF_SHELF_MODEL_OBSERVER_H_
-#define ASH_SHELF_SHELF_MODEL_OBSERVER_H_
+#ifndef ASH_COMMON_SHELF_SHELF_MODEL_OBSERVER_H_
+#define ASH_COMMON_SHELF_SHELF_MODEL_OBSERVER_H_
#include "ash/ash_export.h"
-#include "ash/shelf/shelf_item_types.h"
+#include "ash/common/shelf/shelf_item_types.h"
namespace ash {
@@ -43,4 +43,4 @@
} // namespace ash
-#endif // ASH_SHELF_SHELF_MODEL_OBSERVER_H_
+#endif // ASH_COMMON_SHELF_SHELF_MODEL_OBSERVER_H_
diff --git a/ash/shelf/shelf_model_unittest.cc b/ash/common/shelf/shelf_model_unittest.cc
similarity index 98%
rename from ash/shelf/shelf_model_unittest.cc
rename to ash/common/shelf/shelf_model_unittest.cc
index 30e6af8..9589da1 100644
--- a/ash/shelf/shelf_model_unittest.cc
+++ b/ash/common/shelf/shelf_model_unittest.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/shelf/shelf_model.h"
+#include "ash/common/shelf/shelf_model.h"
#include <set>
#include <string>
-#include "ash/shelf/shelf_model_observer.h"
+#include "ash/common/shelf/shelf_model_observer.h"
#include "base/strings/stringprintf.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/ash/shelf/shelf_tooltip_manager.cc b/ash/common/shelf/shelf_tooltip_manager.cc
similarity index 98%
rename from ash/shelf/shelf_tooltip_manager.cc
rename to ash/common/shelf/shelf_tooltip_manager.cc
index 59988c8..8cab3d3 100644
--- a/ash/shelf/shelf_tooltip_manager.cc
+++ b/ash/common/shelf/shelf_tooltip_manager.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/shelf/shelf_tooltip_manager.h"
+#include "ash/common/shelf/shelf_tooltip_manager.h"
+#include "ash/common/shelf/shelf_view.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/shelf_view.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/system/tray/tray_constants.h"
#include "base/bind.h"
#include "base/strings/string16.h"
diff --git a/ash/shelf/shelf_tooltip_manager.h b/ash/common/shelf/shelf_tooltip_manager.h
similarity index 92%
rename from ash/shelf/shelf_tooltip_manager.h
rename to ash/common/shelf/shelf_tooltip_manager.h
index b2619aa..c68a1b0 100644
--- a/ash/shelf/shelf_tooltip_manager.h
+++ b/ash/common/shelf/shelf_tooltip_manager.h
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SHELF_SHELF_TOOLTIP_MANAGER_H_
-#define ASH_SHELF_SHELF_TOOLTIP_MANAGER_H_
+#ifndef ASH_COMMON_SHELF_SHELF_TOOLTIP_MANAGER_H_
+#define ASH_COMMON_SHELF_SHELF_TOOLTIP_MANAGER_H_
#include "ash/ash_export.h"
-#include "ash/shelf/wm_shelf_observer.h"
+#include "ash/common/shelf/wm_shelf_observer.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/timer/timer.h"
@@ -87,4 +87,4 @@
} // namespace ash
-#endif // ASH_SHELF_SHELF_TOOLTIP_MANAGER_H_
+#endif // ASH_COMMON_SHELF_SHELF_TOOLTIP_MANAGER_H_
diff --git a/ash/shelf/shelf_tooltip_manager_unittest.cc b/ash/common/shelf/shelf_tooltip_manager_unittest.cc
similarity index 96%
rename from ash/shelf/shelf_tooltip_manager_unittest.cc
rename to ash/common/shelf/shelf_tooltip_manager_unittest.cc
index 9f308d3..955301fd 100644
--- a/ash/shelf/shelf_tooltip_manager_unittest.cc
+++ b/ash/common/shelf/shelf_tooltip_manager_unittest.cc
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/shelf/shelf_tooltip_manager.h"
+#include "ash/common/shelf/shelf_tooltip_manager.h"
+#include "ash/common/shelf/app_list_button.h"
+#include "ash/common/shelf/shelf_model.h"
+#include "ash/common/shelf/shelf_view.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/test/test_shelf_item_delegate.h"
#include "ash/common/wm_shell.h"
-#include "ash/shelf/app_list_button.h"
-#include "ash/shelf/shelf_model.h"
-#include "ash/shelf/shelf_view.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/shelf_view_test_api.h"
-#include "ash/test/test_shelf_item_delegate.h"
#include "base/memory/ptr_util.h"
#include "ui/events/event_constants.h"
#include "ui/events/test/event_generator.h"
diff --git a/ash/shelf/shelf_view.cc b/ash/common/shelf/shelf_view.cc
similarity index 98%
rename from ash/shelf/shelf_view.cc
rename to ash/common/shelf/shelf_view.cc
index 95e8ced..c46b168b 100644
--- a/ash/shelf/shelf_view.cc
+++ b/ash/common/shelf/shelf_view.cc
@@ -2,30 +2,30 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/shelf/shelf_view.h"
+#include "ash/common/shelf/shelf_view.h"
#include <algorithm>
#include <memory>
#include "ash/common/ash_constants.h"
+#include "ash/common/drag_drop/drag_image_view.h"
#include "ash/common/scoped_root_window_for_new_windows.h"
+#include "ash/common/shelf/app_list_button.h"
+#include "ash/common/shelf/overflow_bubble.h"
+#include "ash/common/shelf/overflow_bubble_view.h"
+#include "ash/common/shelf/overflow_button.h"
+#include "ash/common/shelf/shelf_application_menu_model.h"
+#include "ash/common/shelf/shelf_button.h"
+#include "ash/common/shelf/shelf_constants.h"
+#include "ash/common/shelf/shelf_delegate.h"
+#include "ash/common/shelf/shelf_model.h"
+#include "ash/common/shelf/shelf_widget.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/shell_delegate.h"
+#include "ash/common/wm/root_window_finder.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
-#include "ash/drag_drop/drag_image_view.h"
-#include "ash/shelf/app_list_button.h"
-#include "ash/shelf/overflow_bubble.h"
-#include "ash/shelf/overflow_bubble_view.h"
-#include "ash/shelf/overflow_button.h"
-#include "ash/shelf/shelf_application_menu_model.h"
-#include "ash/shelf/shelf_button.h"
-#include "ash/shelf/shelf_constants.h"
-#include "ash/shelf/shelf_delegate.h"
-#include "ash/shelf/shelf_model.h"
-#include "ash/shelf/shelf_widget.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/strings/grit/ash_strings.h"
-#include "ash/wm/root_window_finder.h"
#include "base/auto_reset.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
diff --git a/ash/shelf/shelf_view.h b/ash/common/shelf/shelf_view.h
similarity index 97%
rename from ash/shelf/shelf_view.h
rename to ash/common/shelf/shelf_view.h
index 1355fc7..3f1858b 100644
--- a/ash/shelf/shelf_view.h
+++ b/ash/common/shelf/shelf_view.h
@@ -2,19 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SHELF_SHELF_VIEW_H_
-#define ASH_SHELF_SHELF_VIEW_H_
+#ifndef ASH_COMMON_SHELF_SHELF_VIEW_H_
+#define ASH_COMMON_SHELF_SHELF_VIEW_H_
#include <memory>
#include <string>
#include <utility>
#include <vector>
-#include "ash/shelf/ink_drop_button_listener.h"
-#include "ash/shelf/shelf_button_pressed_metric_tracker.h"
-#include "ash/shelf/shelf_item_delegate.h"
-#include "ash/shelf/shelf_model_observer.h"
-#include "ash/shelf/shelf_tooltip_manager.h"
+#include "ash/common/shelf/ink_drop_button_listener.h"
+#include "ash/common/shelf/shelf_button_pressed_metric_tracker.h"
+#include "ash/common/shelf/shelf_item_delegate.h"
+#include "ash/common/shelf/shelf_model_observer.h"
+#include "ash/common/shelf/shelf_tooltip_manager.h"
#include "base/macros.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/app_list/views/app_list_drag_and_drop_host.h"
@@ -467,4 +467,4 @@
} // namespace ash
-#endif // ASH_SHELF_SHELF_VIEW_H_
+#endif // ASH_COMMON_SHELF_SHELF_VIEW_H_
diff --git a/ash/shelf/shelf_widget.cc b/ash/common/shelf/shelf_widget.cc
similarity index 96%
rename from ash/shelf/shelf_widget.cc
rename to ash/common/shelf/shelf_widget.cc
index 8568cea6..0bbfb54 100644
--- a/ash/shelf/shelf_widget.cc
+++ b/ash/common/shelf/shelf_widget.cc
@@ -2,22 +2,22 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/shelf/shelf_widget.h"
+#include "ash/common/shelf/shelf_widget.h"
#include "ash/animation/animation_change_type.h"
#include "ash/common/focus_cycler.h"
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/shelf/app_list_button.h"
+#include "ash/common/shelf/shelf_background_animator_observer.h"
+#include "ash/common/shelf/shelf_constants.h"
+#include "ash/common/shelf/shelf_delegate.h"
+#include "ash/common/shelf/shelf_layout_manager.h"
+#include "ash/common/shelf/shelf_view.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/shelf/wm_shelf_util.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/app_list_button.h"
-#include "ash/shelf/shelf_background_animator_observer.h"
-#include "ash/shelf/shelf_constants.h"
-#include "ash/shelf/shelf_delegate.h"
-#include "ash/shelf/shelf_layout_manager.h"
-#include "ash/shelf/shelf_view.h"
-#include "ash/shelf/wm_shelf.h"
-#include "ash/shelf/wm_shelf_util.h"
#include "ash/system/status_area_layout_manager.h"
#include "ash/system/status_area_widget.h"
#include "ash/wm/window_properties.h"
diff --git a/ash/shelf/shelf_widget.h b/ash/common/shelf/shelf_widget.h
similarity index 92%
rename from ash/shelf/shelf_widget.h
rename to ash/common/shelf/shelf_widget.h
index 0b9097cc..e77b9d8 100644
--- a/ash/shelf/shelf_widget.h
+++ b/ash/common/shelf/shelf_widget.h
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SHELF_SHELF_WIDGET_H_
-#define ASH_SHELF_SHELF_WIDGET_H_
+#ifndef ASH_COMMON_SHELF_SHELF_WIDGET_H_
+#define ASH_COMMON_SHELF_SHELF_WIDGET_H_
#include <memory>
#include "ash/ash_export.h"
+#include "ash/common/shelf/shelf_background_animator.h"
+#include "ash/common/shelf/shelf_background_animator_observer.h"
+#include "ash/common/shelf/shelf_layout_manager_observer.h"
#include "ash/public/cpp/shelf_types.h"
-#include "ash/shelf/shelf_background_animator.h"
-#include "ash/shelf/shelf_background_animator_observer.h"
-#include "ash/shelf/shelf_layout_manager_observer.h"
#include "base/macros.h"
#include "ui/views/widget/widget.h"
#include "ui/views/widget/widget_observer.h"
@@ -127,4 +127,4 @@
} // namespace ash
-#endif // ASH_SHELF_SHELF_WIDGET_H_
+#endif // ASH_COMMON_SHELF_SHELF_WIDGET_H_
diff --git a/ash/shelf/shelf_window_watcher.cc b/ash/common/shelf/shelf_window_watcher.cc
similarity index 97%
rename from ash/shelf/shelf_window_watcher.cc
rename to ash/common/shelf/shelf_window_watcher.cc
index 2f607f8..7a00df9d 100644
--- a/ash/shelf/shelf_window_watcher.cc
+++ b/ash/common/shelf/shelf_window_watcher.cc
@@ -2,21 +2,21 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/shelf/shelf_window_watcher.h"
+#include "ash/common/shelf/shelf_window_watcher.h"
#include <memory>
#include <utility>
+#include "ash/common/shelf/shelf_constants.h"
+#include "ash/common/shelf/shelf_model.h"
+#include "ash/common/shelf/shelf_window_watcher_item_delegate.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/public/cpp/window_properties.h"
-#include "ash/shelf/shelf_constants.h"
-#include "ash/shelf/shelf_model.h"
-#include "ash/shelf/shelf_window_watcher_item_delegate.h"
#include "ash/shell.h"
#include "ash/wm/window_properties.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
#include "ui/aura/client/aura_constants.h"
diff --git a/ash/shelf/shelf_window_watcher.h b/ash/common/shelf/shelf_window_watcher.h
similarity index 96%
rename from ash/shelf/shelf_window_watcher.h
rename to ash/common/shelf/shelf_window_watcher.h
index 31c18f2..c683f39 100644
--- a/ash/shelf/shelf_window_watcher.h
+++ b/ash/common/shelf/shelf_window_watcher.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SHELF_SHELF_WINDOW_WATCHER_H_
-#define ASH_SHELF_SHELF_WINDOW_WATCHER_H_
+#ifndef ASH_COMMON_SHELF_SHELF_WINDOW_WATCHER_H_
+#define ASH_COMMON_SHELF_SHELF_WINDOW_WATCHER_H_
#include <set>
@@ -117,4 +117,4 @@
} // namespace ash
-#endif // ASH_SHELF_SHELF_WINDOW_WATCHER_H_
+#endif // ASH_COMMON_SHELF_SHELF_WINDOW_WATCHER_H_
diff --git a/ash/shelf/shelf_window_watcher_item_delegate.cc b/ash/common/shelf/shelf_window_watcher_item_delegate.cc
similarity index 91%
rename from ash/shelf/shelf_window_watcher_item_delegate.cc
rename to ash/common/shelf/shelf_window_watcher_item_delegate.cc
index fbd905b..01f4bd4 100644
--- a/ash/shelf/shelf_window_watcher_item_delegate.cc
+++ b/ash/common/shelf/shelf_window_watcher_item_delegate.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/shelf/shelf_window_watcher_item_delegate.h"
+#include "ash/common/shelf/shelf_window_watcher_item_delegate.h"
+#include "ash/common/shelf/shelf_controller.h"
+#include "ash/common/shelf/shelf_model.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/window_properties.h"
-#include "ash/shelf/shelf_controller.h"
-#include "ash/shelf/shelf_model.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_util.h"
#include "ui/aura/window.h"
#include "ui/events/event_constants.h"
diff --git a/ash/shelf/shelf_window_watcher_item_delegate.h b/ash/common/shelf/shelf_window_watcher_item_delegate.h
similarity index 82%
rename from ash/shelf/shelf_window_watcher_item_delegate.h
rename to ash/common/shelf/shelf_window_watcher_item_delegate.h
index 4fa1d47d..fd61f439 100644
--- a/ash/shelf/shelf_window_watcher_item_delegate.h
+++ b/ash/common/shelf/shelf_window_watcher_item_delegate.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SHELF_SHELF_WINDOW_WATCHER_ITEM_DELEGATE_H_
-#define ASH_SHELF_SHELF_WINDOW_WATCHER_ITEM_DELEGATE_H_
+#ifndef ASH_COMMON_SHELF_SHELF_WINDOW_WATCHER_ITEM_DELEGATE_H_
+#define ASH_COMMON_SHELF_SHELF_WINDOW_WATCHER_ITEM_DELEGATE_H_
-#include "ash/shelf/shelf_item_delegate.h"
+#include "ash/common/shelf/shelf_item_delegate.h"
#include "base/macros.h"
namespace ash {
@@ -38,4 +38,4 @@
} // namespace ash
-#endif // ASH_SHELF_SHELF_WINDOW_WATCHER_ITEM_DELEGATE_H_
+#endif // ASH_COMMON_SHELF_SHELF_WINDOW_WATCHER_ITEM_DELEGATE_H_
diff --git a/ash/shelf/shelf_window_watcher_unittest.cc b/ash/common/shelf/shelf_window_watcher_unittest.cc
similarity index 98%
rename from ash/shelf/shelf_window_watcher_unittest.cc
rename to ash/common/shelf/shelf_window_watcher_unittest.cc
index 3f104c1..f88eaa1 100644
--- a/ash/shelf/shelf_window_watcher_unittest.cc
+++ b/ash/common/shelf/shelf_window_watcher_unittest.cc
@@ -2,19 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/shelf/shelf_window_watcher.h"
+#include "ash/common/shelf/shelf_window_watcher.h"
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/shelf/shelf_item_types.h"
+#include "ash/common/shelf/shelf_model.h"
+#include "ash/common/wm/window_resizer.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/public/cpp/window_properties.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/shelf_item_types.h"
-#include "ash/shelf/shelf_model.h"
#include "ash/test/ash_test_base.h"
-#include "ash/wm/window_resizer.h"
-#include "ash/wm/window_state.h"
#include "ui/base/hit_test.h"
#include "ui/views/widget/widget.h"
diff --git a/ash/shelf/wm_shelf.cc b/ash/common/shelf/wm_shelf.cc
similarity index 96%
rename from ash/shelf/wm_shelf.cc
rename to ash/common/shelf/wm_shelf.cc
index fdd2aeb..456af77 100644
--- a/ash/shelf/wm_shelf.cc
+++ b/ash/common/shelf/wm_shelf.cc
@@ -2,21 +2,21 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/shelf/wm_shelf.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/shelf/shelf_controller.h"
+#include "ash/common/shelf/shelf_delegate.h"
+#include "ash/common/shelf/shelf_item_delegate.h"
+#include "ash/common/shelf/shelf_layout_manager.h"
+#include "ash/common/shelf/shelf_locking_manager.h"
+#include "ash/common/shelf/shelf_model.h"
+#include "ash/common/shelf/shelf_widget.h"
+#include "ash/common/shelf/wm_shelf_observer.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
#include "ash/shelf/shelf_bezel_event_handler.h"
-#include "ash/shelf/shelf_controller.h"
-#include "ash/shelf/shelf_delegate.h"
-#include "ash/shelf/shelf_item_delegate.h"
-#include "ash/shelf/shelf_layout_manager.h"
-#include "ash/shelf/shelf_locking_manager.h"
-#include "ash/shelf/shelf_model.h"
-#include "ash/shelf/shelf_widget.h"
-#include "ash/shelf/wm_shelf_observer.h"
#include "ash/shell.h"
#include "ash/system/tray/system_tray_delegate.h"
#include "base/logging.h"
diff --git a/ash/shelf/wm_shelf.h b/ash/common/shelf/wm_shelf.h
similarity index 97%
rename from ash/shelf/wm_shelf.h
rename to ash/common/shelf/wm_shelf.h
index 491f35e..b2e858a 100644
--- a/ash/shelf/wm_shelf.h
+++ b/ash/common/shelf/wm_shelf.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SHELF_WM_SHELF_H_
-#define ASH_SHELF_WM_SHELF_H_
+#ifndef ASH_COMMON_SHELF_WM_SHELF_H_
+#define ASH_COMMON_SHELF_WM_SHELF_H_
#include <memory>
#include "ash/ash_export.h"
+#include "ash/common/shelf/shelf_layout_manager_observer.h"
#include "ash/public/cpp/shelf_types.h"
-#include "ash/shelf/shelf_layout_manager_observer.h"
#include "base/observer_list.h"
namespace gfx {
@@ -185,4 +185,4 @@
} // namespace ash
-#endif // ASH_SHELF_WM_SHELF_H_
+#endif // ASH_COMMON_SHELF_WM_SHELF_H_
diff --git a/ash/shelf/wm_shelf_observer.h b/ash/common/shelf/wm_shelf_observer.h
similarity index 84%
rename from ash/shelf/wm_shelf_observer.h
rename to ash/common/shelf/wm_shelf_observer.h
index 55033be..d137692 100644
--- a/ash/shelf/wm_shelf_observer.h
+++ b/ash/common/shelf/wm_shelf_observer.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SHELF_WM_SHELF_OBSERVER_H_
-#define ASH_SHELF_WM_SHELF_OBSERVER_H_
+#ifndef ASH_COMMON_SHELF_WM_SHELF_OBSERVER_H_
+#define ASH_COMMON_SHELF_WM_SHELF_OBSERVER_H_
#include "ash/ash_export.h"
#include "ash/public/cpp/shelf_types.h"
@@ -27,4 +27,4 @@
} // namespace ash
-#endif // ASH_SHELF_WM_SHELF_OBSERVER_H_
+#endif // ASH_COMMON_SHELF_WM_SHELF_OBSERVER_H_
diff --git a/ash/shelf/wm_shelf_util.cc b/ash/common/shelf/wm_shelf_util.cc
similarity index 88%
rename from ash/shelf/wm_shelf_util.cc
rename to ash/common/shelf/wm_shelf_util.cc
index 41934c5..05ba442 100644
--- a/ash/shelf/wm_shelf_util.cc
+++ b/ash/common/shelf/wm_shelf_util.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/shelf/wm_shelf_util.h"
+#include "ash/common/shelf/wm_shelf_util.h"
namespace ash {
diff --git a/ash/shelf/wm_shelf_util.h b/ash/common/shelf/wm_shelf_util.h
similarity index 78%
rename from ash/shelf/wm_shelf_util.h
rename to ash/common/shelf/wm_shelf_util.h
index 5176ec9..98bb1ad 100644
--- a/ash/shelf/wm_shelf_util.h
+++ b/ash/common/shelf/wm_shelf_util.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SHELF_WM_SHELF_UTIL_H_
-#define ASH_SHELF_WM_SHELF_UTIL_H_
+#ifndef ASH_COMMON_SHELF_WM_SHELF_UTIL_H_
+#define ASH_COMMON_SHELF_WM_SHELF_UTIL_H_
#include "ash/ash_export.h"
#include "ash/public/cpp/shelf_types.h"
@@ -16,4 +16,4 @@
} // namespace ash
-#endif // ASH_SHELF_WM_SHELF_UTIL_H_
+#endif // ASH_COMMON_SHELF_WM_SHELF_UTIL_H_
diff --git a/ash/test/ash_test.cc b/ash/common/test/ash_test.cc
similarity index 94%
rename from ash/test/ash_test.cc
rename to ash/common/test/ash_test.cc
index f3d7072..126e236 100644
--- a/ash/test/ash_test.cc
+++ b/ash/common/test/ash_test.cc
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/test/ash_test.h"
+#include "ash/common/test/ash_test.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/test/ash_test_impl.h"
+#include "ash/common/test/test_session_state_delegate.h"
+#include "ash/common/test/test_system_tray_delegate.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/system/status_area_widget.h"
-#include "ash/test/ash_test_impl.h"
-#include "ash/test/test_session_state_delegate.h"
-#include "ash/test/test_system_tray_delegate.h"
#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "ui/compositor/layer_type.h"
diff --git a/ash/test/ash_test.h b/ash/common/test/ash_test.h
similarity index 97%
rename from ash/test/ash_test.h
rename to ash/common/test/ash_test.h
index 0eccb70d..d91c4d6 100644
--- a/ash/test/ash_test.h
+++ b/ash/common/test/ash_test.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_TEST_ASH_TEST_H_
-#define ASH_TEST_ASH_TEST_H_
+#ifndef ASH_COMMON_TEST_ASH_TEST_H_
+#define ASH_COMMON_TEST_ASH_TEST_H_
#include <memory>
#include <string>
@@ -146,4 +146,4 @@
} // namespace ash
-#endif // ASH_TEST_ASH_TEST_H_
+#endif // ASH_COMMON_TEST_ASH_TEST_H_
diff --git a/ash/test/ash_test_impl.h b/ash/common/test/ash_test_impl.h
similarity index 92%
rename from ash/test/ash_test_impl.h
rename to ash/common/test/ash_test_impl.h
index f1ba7f7..8984dfbf 100644
--- a/ash/test/ash_test_impl.h
+++ b/ash/common/test/ash_test_impl.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_TEST_ASH_TEST_IMPL_H_
-#define ASH_TEST_ASH_TEST_IMPL_H_
+#ifndef ASH_COMMON_TEST_ASH_TEST_IMPL_H_
+#define ASH_COMMON_TEST_ASH_TEST_IMPL_H_
#include <memory>
#include <string>
@@ -57,4 +57,4 @@
} // namespace ash
-#endif // ASH_TEST_ASH_TEST_IMPL_H_
+#endif // ASH_COMMON_TEST_ASH_TEST_IMPL_H_
diff --git a/ash/test/test_palette_delegate.cc b/ash/common/test/test_palette_delegate.cc
similarity index 95%
rename from ash/test/test_palette_delegate.cc
rename to ash/common/test/test_palette_delegate.cc
index 49881d3..ab5692f 100644
--- a/ash/test/test_palette_delegate.cc
+++ b/ash/common/test/test_palette_delegate.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/test/test_palette_delegate.h"
+#include "ash/common/test/test_palette_delegate.h"
namespace ash {
diff --git a/ash/test/test_palette_delegate.h b/ash/common/test/test_palette_delegate.h
similarity index 92%
rename from ash/test/test_palette_delegate.h
rename to ash/common/test/test_palette_delegate.h
index e70e09d..f0fc5e55 100644
--- a/ash/test/test_palette_delegate.h
+++ b/ash/common/test/test_palette_delegate.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_TEST_TEST_PALETTE_DELEGATE_H_
-#define ASH_TEST_TEST_PALETTE_DELEGATE_H_
+#ifndef ASH_COMMON_TEST_TEST_PALETTE_DELEGATE_H_
+#define ASH_COMMON_TEST_TEST_PALETTE_DELEGATE_H_
#include "ash/common/palette_delegate.h"
#include "base/macros.h"
@@ -66,4 +66,4 @@
} // namespace ash
-#endif // ASH_TEST_TEST_PALETTE_DELEGATE_H_
+#endif // ASH_COMMON_TEST_TEST_PALETTE_DELEGATE_H_
diff --git a/ash/test/test_session_state_delegate.cc b/ash/common/test/test_session_state_delegate.cc
similarity index 98%
rename from ash/test/test_session_state_delegate.cc
rename to ash/common/test/test_session_state_delegate.cc
index 00834bd..265c048 100644
--- a/ash/test/test_session_state_delegate.cc
+++ b/ash/common/test/test_session_state_delegate.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/test/test_session_state_delegate.h"
+#include "ash/common/test/test_session_state_delegate.h"
#include <algorithm>
#include <string>
diff --git a/ash/test/test_session_state_delegate.h b/ash/common/test/test_session_state_delegate.h
similarity index 95%
rename from ash/test/test_session_state_delegate.h
rename to ash/common/test/test_session_state_delegate.h
index 35fe677..eb71d540 100644
--- a/ash/test/test_session_state_delegate.h
+++ b/ash/common/test/test_session_state_delegate.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_TEST_TEST_SESSION_STATE_DELEGATE_H_
-#define ASH_TEST_TEST_SESSION_STATE_DELEGATE_H_
+#ifndef ASH_COMMON_TEST_TEST_SESSION_STATE_DELEGATE_H_
+#define ASH_COMMON_TEST_TEST_SESSION_STATE_DELEGATE_H_
#include <memory>
#include <vector>
@@ -119,4 +119,4 @@
} // namespace test
} // namespace ash
-#endif // ASH_TEST_TEST_SESSION_STATE_DELEGATE_H_
+#endif // ASH_COMMON_TEST_TEST_SESSION_STATE_DELEGATE_H_
diff --git a/ash/test/test_shelf_delegate.cc b/ash/common/test/test_shelf_delegate.cc
similarity index 96%
rename from ash/test/test_shelf_delegate.cc
rename to ash/common/test/test_shelf_delegate.cc
index 1fbdd16e..ee762fd 100644
--- a/ash/test/test_shelf_delegate.cc
+++ b/ash/common/test/test_shelf_delegate.cc
@@ -2,17 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/test/test_shelf_delegate.h"
+#include "ash/common/test/test_shelf_delegate.h"
#include <utility>
+#include "ash/common/shelf/shelf_model.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/shell_observer.h"
+#include "ash/common/test/test_shelf_item_delegate.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/shelf_model.h"
-#include "ash/shelf/wm_shelf.h"
-#include "ash/test/test_shelf_item_delegate.h"
#include "ash/wm/window_properties.h"
#include "base/memory/ptr_util.h"
#include "ui/aura/window.h"
diff --git a/ash/test/test_shelf_delegate.h b/ash/common/test/test_shelf_delegate.h
similarity index 93%
rename from ash/test/test_shelf_delegate.h
rename to ash/common/test/test_shelf_delegate.h
index d9e14ca..a334848 100644
--- a/ash/test/test_shelf_delegate.h
+++ b/ash/common/test/test_shelf_delegate.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_TEST_TEST_SHELF_DELEGATE_H_
-#define ASH_TEST_TEST_SHELF_DELEGATE_H_
+#ifndef ASH_COMMON_TEST_TEST_SHELF_DELEGATE_H_
+#define ASH_COMMON_TEST_TEST_SHELF_DELEGATE_H_
#include <map>
#include <set>
#include <string>
-#include "ash/shelf/shelf_delegate.h"
+#include "ash/common/shelf/shelf_delegate.h"
#include "base/macros.h"
#include "ui/aura/window_observer.h"
@@ -83,4 +83,4 @@
} // namespace test
} // namespace ash
-#endif // ASH_TEST_TEST_SHELF_DELEGATE_H_
+#endif // ASH_COMMON_TEST_TEST_SHELF_DELEGATE_H_
diff --git a/ash/test/test_shelf_item_delegate.cc b/ash/common/test/test_shelf_item_delegate.cc
similarity index 96%
rename from ash/test/test_shelf_item_delegate.cc
rename to ash/common/test/test_shelf_item_delegate.cc
index d70d384..31e22c8 100644
--- a/ash/test/test_shelf_item_delegate.cc
+++ b/ash/common/test/test_shelf_item_delegate.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/test/test_shelf_item_delegate.h"
+#include "ash/common/test/test_shelf_item_delegate.h"
#include "ash/common/wm_window.h"
#include "ash/wm/window_util.h"
diff --git a/ash/test/test_shelf_item_delegate.h b/ash/common/test/test_shelf_item_delegate.h
similarity index 82%
rename from ash/test/test_shelf_item_delegate.h
rename to ash/common/test/test_shelf_item_delegate.h
index 24360e4..6e2f8b5 100644
--- a/ash/test/test_shelf_item_delegate.h
+++ b/ash/common/test/test_shelf_item_delegate.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_TEST_TEST_SHELF_ITEM_DELEGATE_H_
-#define ASH_TEST_TEST_SHELF_ITEM_DELEGATE_H_
+#ifndef ASH_COMMON_TEST_TEST_SHELF_ITEM_DELEGATE_H_
+#define ASH_COMMON_TEST_TEST_SHELF_ITEM_DELEGATE_H_
-#include "ash/shelf/shelf_item_delegate.h"
+#include "ash/common/shelf/shelf_item_delegate.h"
#include "base/macros.h"
namespace ash {
@@ -38,4 +38,4 @@
} // namespace test
} // namespace ash
-#endif // ASH_TEST_TEST_SHELF_ITEM_DELEGATE_H_
+#endif // ASH_COMMON_TEST_TEST_SHELF_ITEM_DELEGATE_H_
diff --git a/ash/test/test_system_tray_delegate.cc b/ash/common/test/test_system_tray_delegate.cc
similarity index 97%
rename from ash/test/test_system_tray_delegate.cc
rename to ash/common/test/test_system_tray_delegate.cc
index 524058b0e..84b240c33 100644
--- a/ash/test/test_system_tray_delegate.cc
+++ b/ash/common/test/test_system_tray_delegate.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/test/test_system_tray_delegate.h"
+#include "ash/common/test/test_system_tray_delegate.h"
#include <string>
diff --git a/ash/test/test_system_tray_delegate.h b/ash/common/test/test_system_tray_delegate.h
similarity index 93%
rename from ash/test/test_system_tray_delegate.h
rename to ash/common/test/test_system_tray_delegate.h
index 8dc944f..b8ed42f 100644
--- a/ash/test/test_system_tray_delegate.h
+++ b/ash/common/test/test_system_tray_delegate.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_
-#define ASH_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_
+#ifndef ASH_COMMON_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_
+#define ASH_COMMON_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_
#include "ash/system/tray/default_system_tray_delegate.h"
#include "ash/system/tray/ime_info.h"
@@ -73,4 +73,4 @@
} // namespace test
} // namespace ash
-#endif // ASH_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_
+#endif // ASH_COMMON_TEST_TEST_SYSTEM_TRAY_DELEGATE_H_
diff --git a/ash/test/wm_shell_test_api.cc b/ash/common/test/wm_shell_test_api.cc
similarity index 92%
rename from ash/test/wm_shell_test_api.cc
rename to ash/common/test/wm_shell_test_api.cc
index 35f4b1e..e48b444 100644
--- a/ash/test/wm_shell_test_api.cc
+++ b/ash/common/test/wm_shell_test_api.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/test/wm_shell_test_api.h"
+#include "ash/common/test/wm_shell_test_api.h"
#include <utility>
diff --git a/ash/test/wm_shell_test_api.h b/ash/common/test/wm_shell_test_api.h
similarity index 79%
rename from ash/test/wm_shell_test_api.h
rename to ash/common/test/wm_shell_test_api.h
index d4be5cf..07ab6fff 100644
--- a/ash/test/wm_shell_test_api.h
+++ b/ash/common/test/wm_shell_test_api.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_TEST_WM_SHELL_TEST_API_H_
-#define ASH_TEST_WM_SHELL_TEST_API_H_
+#ifndef ASH_COMMON_TEST_WM_SHELL_TEST_API_H_
+#define ASH_COMMON_TEST_WM_SHELL_TEST_API_H_
#include <memory>
@@ -27,4 +27,4 @@
} // namespace ash
-#endif // ASH_TEST_WM_SHELL_TEST_API_H_
+#endif // ASH_COMMON_TEST_WM_SHELL_TEST_API_H_
diff --git a/ash/test/workspace_event_handler_test_helper.cc b/ash/common/test/workspace_event_handler_test_helper.cc
similarity index 86%
rename from ash/test/workspace_event_handler_test_helper.cc
rename to ash/common/test/workspace_event_handler_test_helper.cc
index fe7b1d9..865ffbf 100644
--- a/ash/test/workspace_event_handler_test_helper.cc
+++ b/ash/common/test/workspace_event_handler_test_helper.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/test/workspace_event_handler_test_helper.h"
+#include "ash/common/test/workspace_event_handler_test_helper.h"
namespace ash {
diff --git a/ash/test/workspace_event_handler_test_helper.h b/ash/common/test/workspace_event_handler_test_helper.h
similarity index 71%
rename from ash/test/workspace_event_handler_test_helper.h
rename to ash/common/test/workspace_event_handler_test_helper.h
index 0360328..a090eee7 100644
--- a/ash/test/workspace_event_handler_test_helper.h
+++ b/ash/common/test/workspace_event_handler_test_helper.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_TEST_WORKSPACE_EVENT_HANDLER_TEST_HELPER_H_
-#define ASH_TEST_WORKSPACE_EVENT_HANDLER_TEST_HELPER_H_
+#ifndef ASH_COMMON_TEST_WORKSPACE_EVENT_HANDLER_TEST_HELPER_H_
+#define ASH_COMMON_TEST_WORKSPACE_EVENT_HANDLER_TEST_HELPER_H_
-#include "ash/wm/workspace/workspace_event_handler.h"
+#include "ash/common/wm/workspace/workspace_event_handler.h"
#include "base/macros.h"
@@ -28,4 +28,4 @@
} // namespace ash
-#endif // ASH_TEST_WORKSPACE_EVENT_HANDLER_TEST_HELPER_H_
+#endif // ASH_COMMON_TEST_WORKSPACE_EVENT_HANDLER_TEST_HELPER_H_
diff --git a/ash/common/wallpaper/wallpaper_view.cc b/ash/common/wallpaper/wallpaper_view.cc
index f3ad6ae3..2aed6b6 100644
--- a/ash/common/wallpaper/wallpaper_view.cc
+++ b/ash/common/wallpaper/wallpaper_view.cc
@@ -8,10 +8,10 @@
#include "ash/common/wallpaper/wallpaper_controller.h"
#include "ash/common/wallpaper/wallpaper_delegate.h"
#include "ash/common/wallpaper/wallpaper_widget_controller.h"
+#include "ash/common/wm/overview/window_selector_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/root_window_controller.h"
-#include "ash/wm/overview/window_selector_controller.h"
#include "ui/display/display.h"
#include "ui/display/manager/managed_display_info.h"
#include "ui/display/screen.h"
diff --git a/ash/common/wm/OWNERS b/ash/common/wm/OWNERS
new file mode 100644
index 0000000..6310ae0
--- /dev/null
+++ b/ash/common/wm/OWNERS
@@ -0,0 +1,3 @@
[email protected]
[email protected]
[email protected]
diff --git a/ash/wm/always_on_top_controller.cc b/ash/common/wm/always_on_top_controller.cc
similarity index 95%
rename from ash/wm/always_on_top_controller.cc
rename to ash/common/wm/always_on_top_controller.cc
index 90ee7a1..d115f01 100644
--- a/ash/wm/always_on_top_controller.cc
+++ b/ash/common/wm/always_on_top_controller.cc
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/always_on_top_controller.h"
+#include "ash/common/wm/always_on_top_controller.h"
+#include "ash/common/wm/workspace/workspace_layout_manager.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
-#include "ash/wm/workspace/workspace_layout_manager.h"
#include "base/memory/ptr_util.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/window.h"
diff --git a/ash/wm/always_on_top_controller.h b/ash/common/wm/always_on_top_controller.h
similarity index 90%
rename from ash/wm/always_on_top_controller.h
rename to ash/common/wm/always_on_top_controller.h
index 4f33eeee..bdf1446 100644
--- a/ash/wm/always_on_top_controller.h
+++ b/ash/common/wm/always_on_top_controller.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_ALWAYS_ON_TOP_CONTROLLER_H_
-#define ASH_WM_ALWAYS_ON_TOP_CONTROLLER_H_
+#ifndef ASH_COMMON_WM_ALWAYS_ON_TOP_CONTROLLER_H_
+#define ASH_COMMON_WM_ALWAYS_ON_TOP_CONTROLLER_H_
#include <memory>
@@ -48,4 +48,4 @@
} // namepsace ash
-#endif // ASH_WM_ALWAYS_ON_TOP_CONTROLLER_H_
+#endif // ASH_COMMON_WM_ALWAYS_ON_TOP_CONTROLLER_H_
diff --git a/ash/wm/container_finder.cc b/ash/common/wm/container_finder.cc
similarity index 95%
rename from ash/wm/container_finder.cc
rename to ash/common/wm/container_finder.cc
index 0efd32d..ece5ca95 100644
--- a/ash/wm/container_finder.cc
+++ b/ash/common/wm/container_finder.cc
@@ -2,17 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/container_finder.h"
+#include "ash/common/wm/container_finder.h"
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/wm/always_on_top_controller.h"
+#include "ash/common/wm/root_window_finder.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/public/cpp/window_properties.h"
#include "ash/root_window_controller.h"
-#include "ash/wm/always_on_top_controller.h"
-#include "ash/wm/root_window_finder.h"
-#include "ash/wm/window_state.h"
#include "ui/gfx/geometry/rect.h"
namespace ash {
diff --git a/ash/wm/container_finder.h b/ash/common/wm/container_finder.h
similarity index 89%
rename from ash/wm/container_finder.h
rename to ash/common/wm/container_finder.h
index 7f90806..a54e57a 100644
--- a/ash/wm/container_finder.h
+++ b/ash/common/wm/container_finder.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_CONTAINER_FINDER_H_
-#define ASH_WM_CONTAINER_FINDER_H_
+#ifndef ASH_COMMON_WM_CONTAINER_FINDER_H_
+#define ASH_COMMON_WM_CONTAINER_FINDER_H_
#include <vector>
@@ -39,4 +39,4 @@
} // namespace wm
} // namespace ash
-#endif // ASH_WM_CONTAINER_FINDER_H_
+#endif // ASH_COMMON_WM_CONTAINER_FINDER_H_
diff --git a/ash/wm/container_finder_unittest.cc b/ash/common/wm/container_finder_unittest.cc
similarity index 92%
rename from ash/wm/container_finder_unittest.cc
rename to ash/common/wm/container_finder_unittest.cc
index 7692c82..cf9f96d 100644
--- a/ash/wm/container_finder_unittest.cc
+++ b/ash/common/wm/container_finder_unittest.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/container_finder.h"
+#include "ash/common/wm/container_finder.h"
#include <memory>
+#include "ash/common/test/ash_test.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
-#include "ash/test/ash_test.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/views/widget/widget.h"
diff --git a/ash/wm/default_state.cc b/ash/common/wm/default_state.cc
similarity index 98%
rename from ash/wm/default_state.cc
rename to ash/common/wm/default_state.cc
index 404786e..8149d7f 100644
--- a/ash/wm/default_state.cc
+++ b/ash/common/wm/default_state.cc
@@ -2,22 +2,22 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/default_state.h"
+#include "ash/common/wm/default_state.h"
#include "ash/common/ash_switches.h"
+#include "ash/common/wm/dock/docked_window_layout_manager.h"
+#include "ash/common/wm/window_animation_types.h"
+#include "ash/common/wm/window_parenting_utils.h"
+#include "ash/common/wm/window_positioning_utils.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/window_state_delegate.h"
+#include "ash/common/wm/window_state_util.h"
+#include "ash/common/wm/wm_event.h"
+#include "ash/common/wm/wm_screen_util.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
-#include "ash/wm/dock/docked_window_layout_manager.h"
-#include "ash/wm/window_animation_types.h"
-#include "ash/wm/window_parenting_utils.h"
-#include "ash/wm/window_positioning_utils.h"
-#include "ash/wm/window_state.h"
-#include "ash/wm/window_state_delegate.h"
-#include "ash/wm/window_state_util.h"
-#include "ash/wm/wm_event.h"
-#include "ash/wm/wm_screen_util.h"
#include "ui/display/display.h"
#include "ui/display/screen.h"
diff --git a/ash/wm/default_state.h b/ash/common/wm/default_state.h
similarity index 94%
rename from ash/wm/default_state.h
rename to ash/common/wm/default_state.h
index d48da36..b7cee4c0 100644
--- a/ash/wm/default_state.h
+++ b/ash/common/wm/default_state.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_DEFAULT_STATE_H_
-#define ASH_WM_DEFAULT_STATE_H_
+#ifndef ASH_COMMON_WM_DEFAULT_STATE_H_
+#define ASH_COMMON_WM_DEFAULT_STATE_H_
-#include "ash/wm/window_state.h"
+#include "ash/common/wm/window_state.h"
#include "base/macros.h"
#include "ui/display/display.h"
#include "ui/gfx/geometry/rect.h"
@@ -79,4 +79,4 @@
} // namespace wm
} // namespace ash
-#endif // ASH_WM_DEFAULT_STATE_H_
+#endif // ASH_COMMON_WM_DEFAULT_STATE_H_
diff --git a/ash/wm/default_window_resizer.cc b/ash/common/wm/default_window_resizer.cc
similarity index 93%
rename from ash/wm/default_window_resizer.cc
rename to ash/common/wm/default_window_resizer.cc
index 98943add..6a6102a 100644
--- a/ash/wm/default_window_resizer.cc
+++ b/ash/common/wm/default_window_resizer.cc
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/default_window_resizer.h"
+#include "ash/common/wm/default_window_resizer.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
-#include "ash/wm/window_state.h"
namespace ash {
diff --git a/ash/wm/default_window_resizer.h b/ash/common/wm/default_window_resizer.h
similarity index 87%
rename from ash/wm/default_window_resizer.h
rename to ash/common/wm/default_window_resizer.h
index 7919a638..34022ca 100644
--- a/ash/wm/default_window_resizer.h
+++ b/ash/common/wm/default_window_resizer.h
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_DEFAULT_WINDOW_RESIZER_H_
-#define ASH_WM_DEFAULT_WINDOW_RESIZER_H_
+#ifndef ASH_COMMON_WM_DEFAULT_WINDOW_RESIZER_H_
+#define ASH_COMMON_WM_DEFAULT_WINDOW_RESIZER_H_
#include "ash/ash_export.h"
-#include "ash/wm/window_resizer.h"
+#include "ash/common/wm/window_resizer.h"
#include "base/macros.h"
namespace ash {
@@ -48,4 +48,4 @@
} // namespace aura
-#endif // ASH_WM_DEFAULT_WINDOW_RESIZER_H_
+#endif // ASH_COMMON_WM_DEFAULT_WINDOW_RESIZER_H_
diff --git a/ash/wm/dock/dock_types.h b/ash/common/wm/dock/dock_types.h
similarity index 93%
rename from ash/wm/dock/dock_types.h
rename to ash/common/wm/dock/dock_types.h
index 8ca97f1..02e8b450 100644
--- a/ash/wm/dock/dock_types.h
+++ b/ash/common/wm/dock/dock_types.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_DOCK_DOCK_TYPES_H_
-#define ASH_WM_DOCK_DOCK_TYPES_H_
+#ifndef ASH_COMMON_WM_DOCK_DOCK_TYPES_H_
+#define ASH_COMMON_WM_DOCK_DOCK_TYPES_H_
namespace ash {
@@ -50,4 +50,4 @@
} // namespace ash
-#endif // ASH_WM_DOCK_DOCK_TYPES_H_
+#endif // ASH_COMMON_WM_DOCK_DOCK_TYPES_H_
diff --git a/ash/wm/dock/docked_window_layout_manager.cc b/ash/common/wm/dock/docked_window_layout_manager.cc
similarity index 98%
rename from ash/wm/dock/docked_window_layout_manager.cc
rename to ash/common/wm/dock/docked_window_layout_manager.cc
index 86ddad13..fb373ec 100644
--- a/ash/wm/dock/docked_window_layout_manager.cc
+++ b/ash/common/wm/dock/docked_window_layout_manager.cc
@@ -2,24 +2,24 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/dock/docked_window_layout_manager.h"
+#include "ash/common/wm/dock/docked_window_layout_manager.h"
#include "ash/animation/animation_change_type.h"
+#include "ash/common/shelf/shelf_background_animator.h"
+#include "ash/common/shelf/shelf_background_animator_observer.h"
+#include "ash/common/shelf/shelf_constants.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/shelf/wm_shelf_observer.h"
+#include "ash/common/wm/overview/window_selector_controller.h"
+#include "ash/common/wm/window_animation_types.h"
+#include "ash/common/wm/window_parenting_utils.h"
+#include "ash/common/wm/window_resizer.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/resources/grit/ash_resources.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/shelf_background_animator.h"
-#include "ash/shelf/shelf_background_animator_observer.h"
-#include "ash/shelf/shelf_constants.h"
-#include "ash/shelf/wm_shelf.h"
-#include "ash/shelf/wm_shelf_observer.h"
-#include "ash/wm/overview/window_selector_controller.h"
-#include "ash/wm/window_animation_types.h"
-#include "ash/wm/window_parenting_utils.h"
-#include "ash/wm/window_resizer.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "base/auto_reset.h"
#include "base/metrics/histogram_macros.h"
diff --git a/ash/wm/dock/docked_window_layout_manager.h b/ash/common/wm/dock/docked_window_layout_manager.h
similarity index 96%
rename from ash/wm/dock/docked_window_layout_manager.h
rename to ash/common/wm/dock/docked_window_layout_manager.h
index 956a21c..a3f5784d 100644
--- a/ash/wm/dock/docked_window_layout_manager.h
+++ b/ash/common/wm/dock/docked_window_layout_manager.h
@@ -2,18 +2,18 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_
-#define ASH_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_
+#ifndef ASH_COMMON_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_
+#define ASH_COMMON_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_
#include <memory>
#include "ash/ash_export.h"
#include "ash/common/shell_observer.h"
+#include "ash/common/wm/dock/dock_types.h"
+#include "ash/common/wm/dock/docked_window_layout_manager_observer.h"
+#include "ash/common/wm/window_state_observer.h"
+#include "ash/common/wm/wm_snap_to_pixel_layout_manager.h"
#include "ash/common/wm_activation_observer.h"
-#include "ash/wm/dock/dock_types.h"
-#include "ash/wm/dock/docked_window_layout_manager_observer.h"
-#include "ash/wm/window_state_observer.h"
-#include "ash/wm/wm_snap_to_pixel_layout_manager.h"
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "base/observer_list.h"
@@ -319,4 +319,4 @@
} // namespace ash
-#endif // ASH_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_
+#endif // ASH_COMMON_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_
diff --git a/ash/wm/dock/docked_window_layout_manager_observer.h b/ash/common/wm/dock/docked_window_layout_manager_observer.h
similarity index 82%
rename from ash/wm/dock/docked_window_layout_manager_observer.h
rename to ash/common/wm/dock/docked_window_layout_manager_observer.h
index 34d6546..5a3484f 100644
--- a/ash/wm/dock/docked_window_layout_manager_observer.h
+++ b/ash/common/wm/dock/docked_window_layout_manager_observer.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_OBSERVER_H_
-#define ASH_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_OBSERVER_H_
+#ifndef ASH_COMMON_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_OBSERVER_H_
+#define ASH_COMMON_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_OBSERVER_H_
#include "ash/ash_export.h"
@@ -36,4 +36,4 @@
} // namespace ash
-#endif // ASH_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_OBSERVER_H_
+#endif // ASH_COMMON_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_OBSERVER_H_
diff --git a/ash/wm/dock/docked_window_resizer.cc b/ash/common/wm/dock/docked_window_resizer.cc
similarity index 97%
rename from ash/wm/dock/docked_window_resizer.cc
rename to ash/common/wm/dock/docked_window_resizer.cc
index 68f4da5..f2ea238 100644
--- a/ash/wm/dock/docked_window_resizer.cc
+++ b/ash/common/wm/dock/docked_window_resizer.cc
@@ -2,18 +2,18 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/dock/docked_window_resizer.h"
+#include "ash/common/wm/dock/docked_window_resizer.h"
+#include "ash/common/wm/dock/docked_window_layout_manager.h"
+#include "ash/common/wm/window_parenting_utils.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_event.h"
+#include "ash/common/wm/workspace/magnetism_matcher.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/public/cpp/window_properties.h"
#include "ash/root_window_controller.h"
#include "ash/shell.h"
-#include "ash/wm/dock/docked_window_layout_manager.h"
-#include "ash/wm/window_parenting_utils.h"
-#include "ash/wm/window_state.h"
-#include "ash/wm/wm_event.h"
-#include "ash/wm/workspace/magnetism_matcher.h"
#include "ui/base/hit_test.h"
#include "ui/base/ui_base_types.h"
#include "ui/display/display.h"
diff --git a/ash/wm/dock/docked_window_resizer.h b/ash/common/wm/dock/docked_window_resizer.h
similarity index 93%
rename from ash/wm/dock/docked_window_resizer.h
rename to ash/common/wm/dock/docked_window_resizer.h
index e1144b4a..277bde8 100644
--- a/ash/wm/dock/docked_window_resizer.h
+++ b/ash/common/wm/dock/docked_window_resizer.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_DOCK_DOCKED_WINDOW_RESIZER_H_
-#define ASH_WM_DOCK_DOCKED_WINDOW_RESIZER_H_
+#ifndef ASH_COMMON_WM_DOCK_DOCKED_WINDOW_RESIZER_H_
+#define ASH_COMMON_WM_DOCK_DOCKED_WINDOW_RESIZER_H_
#include <memory>
#include "ash/ash_export.h"
-#include "ash/wm/dock/dock_types.h"
-#include "ash/wm/window_resizer.h"
+#include "ash/common/wm/dock/dock_types.h"
+#include "ash/common/wm/window_resizer.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
@@ -98,4 +98,4 @@
} // namespace ash
-#endif // ASH_WM_DOCK_DOCKED_WINDOW_RESIZER_H_
+#endif // ASH_COMMON_WM_DOCK_DOCKED_WINDOW_RESIZER_H_
diff --git a/ash/wm/drag_details.cc b/ash/common/wm/drag_details.cc
similarity index 96%
rename from ash/wm/drag_details.cc
rename to ash/common/wm/drag_details.cc
index 97dce25b..4a91826 100644
--- a/ash/wm/drag_details.cc
+++ b/ash/common/wm/drag_details.cc
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/drag_details.h"
+#include "ash/common/wm/drag_details.h"
+#include "ash/common/wm/window_resizer.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/window_properties.h"
-#include "ash/wm/window_resizer.h"
#include "ui/aura/window.h"
#include "ui/base/hit_test.h"
#include "ui/compositor/layer.h"
diff --git a/ash/wm/drag_details.h b/ash/common/wm/drag_details.h
similarity index 91%
rename from ash/wm/drag_details.h
rename to ash/common/wm/drag_details.h
index 6f7d596f..0ea810d 100644
--- a/ash/wm/drag_details.h
+++ b/ash/common/wm/drag_details.h
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_DRAG_DETAILS_H_
-#define ASH_WM_DRAG_DETAILS_H_
+#ifndef ASH_COMMON_WM_DRAG_DETAILS_H_
+#define ASH_COMMON_WM_DRAG_DETAILS_H_
#include "ash/ash_export.h"
-#include "ash/wm/wm_types.h"
+#include "ash/common/wm/wm_types.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/wm/public/window_move_client.h"
@@ -61,4 +61,4 @@
} // namespace ash
-#endif // ASH_WM_DRAG_DETAILS_H_
+#endif // ASH_COMMON_WM_DRAG_DETAILS_H_
diff --git a/ash/wm/focus_rules.cc b/ash/common/wm/focus_rules.cc
similarity index 95%
rename from ash/wm/focus_rules.cc
rename to ash/common/wm/focus_rules.cc
index bfe3df6..e0634e62 100644
--- a/ash/wm/focus_rules.cc
+++ b/ash/common/wm/focus_rules.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/focus_rules.h"
+#include "ash/common/wm/focus_rules.h"
#include "ash/common/shell_delegate.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
-#include "ash/wm/window_state.h"
namespace ash {
diff --git a/ash/wm/focus_rules.h b/ash/common/wm/focus_rules.h
similarity index 82%
rename from ash/wm/focus_rules.h
rename to ash/common/wm/focus_rules.h
index bd3e62f..cd54d32 100644
--- a/ash/wm/focus_rules.h
+++ b/ash/common/wm/focus_rules.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_FOCUS_RULES_H_
-#define ASH_WM_FOCUS_RULES_H_
+#ifndef ASH_COMMON_WM_FOCUS_RULES_H_
+#define ASH_COMMON_WM_FOCUS_RULES_H_
#include "ash/ash_export.h"
@@ -19,4 +19,4 @@
} // namespace ash
-#endif // ASH_WM_FOCUS_RULES_H_
+#endif // ASH_COMMON_WM_FOCUS_RULES_H_
diff --git a/ash/wm/fullscreen_window_finder.cc b/ash/common/wm/fullscreen_window_finder.cc
similarity index 92%
rename from ash/wm/fullscreen_window_finder.cc
rename to ash/common/wm/fullscreen_window_finder.cc
index 90704f4..ee1bef34 100644
--- a/ash/wm/fullscreen_window_finder.cc
+++ b/ash/common/wm/fullscreen_window_finder.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/fullscreen_window_finder.h"
+#include "ash/common/wm/fullscreen_window_finder.h"
+#include "ash/common/wm/switchable_windows.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
-#include "ash/wm/switchable_windows.h"
-#include "ash/wm/window_state.h"
#include "ui/compositor/layer.h"
namespace ash {
diff --git a/ash/wm/fullscreen_window_finder.h b/ash/common/wm/fullscreen_window_finder.h
similarity index 76%
rename from ash/wm/fullscreen_window_finder.h
rename to ash/common/wm/fullscreen_window_finder.h
index 3831eb4..f5c78b9 100644
--- a/ash/wm/fullscreen_window_finder.h
+++ b/ash/common/wm/fullscreen_window_finder.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_FULLSCREEN_WINDOW_FINDER_H_
-#define ASH_WM_FULLSCREEN_WINDOW_FINDER_H_
+#ifndef ASH_COMMON_WM_FULLSCREEN_WINDOW_FINDER_H_
+#define ASH_COMMON_WM_FULLSCREEN_WINDOW_FINDER_H_
#include "ash/ash_export.h"
@@ -20,4 +20,4 @@
} // namespace wm
} // namespace ash
-#endif // ASH_WM_FULLSCREEN_WINDOW_FINDER_H_
+#endif // ASH_COMMON_WM_FULLSCREEN_WINDOW_FINDER_H_
diff --git a/ash/wm/immersive_context_ash.cc b/ash/common/wm/immersive_context_ash.cc
similarity index 94%
rename from ash/wm/immersive_context_ash.cc
rename to ash/common/wm/immersive_context_ash.cc
index 2cfabb4..c1cff55 100644
--- a/ash/wm/immersive_context_ash.cc
+++ b/ash/common/wm/immersive_context_ash.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/immersive_context_ash.h"
+#include "ash/common/wm/immersive_context_ash.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/shared/immersive_fullscreen_controller.h"
-#include "ash/shelf/wm_shelf.h"
-#include "ash/wm/window_state.h"
#include "base/logging.h"
#include "ui/display/display.h"
#include "ui/display/screen.h"
diff --git a/ash/wm/immersive_context_ash.h b/ash/common/wm/immersive_context_ash.h
similarity index 88%
rename from ash/wm/immersive_context_ash.h
rename to ash/common/wm/immersive_context_ash.h
index 71098e1..7beed73 100644
--- a/ash/wm/immersive_context_ash.h
+++ b/ash/common/wm/immersive_context_ash.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_IMMERSIVE_CONTEXT_ASH_H_
-#define ASH_WM_IMMERSIVE_CONTEXT_ASH_H_
+#ifndef ASH_COMMON_WM_IMMERSIVE_CONTEXT_ASH_H_
+#define ASH_COMMON_WM_IMMERSIVE_CONTEXT_ASH_H_
#include "ash/shared/immersive_context.h"
#include "base/macros.h"
@@ -33,4 +33,4 @@
} // namespace ash
-#endif // ASH_WM_IMMERSIVE_CONTEXT_ASH_H_
+#endif // ASH_COMMON_WM_IMMERSIVE_CONTEXT_ASH_H_
diff --git a/ash/wm/lock_layout_manager.cc b/ash/common/wm/lock_layout_manager.cc
similarity index 95%
rename from ash/wm/lock_layout_manager.cc
rename to ash/common/wm/lock_layout_manager.cc
index d6b7766..d66c5d42 100644
--- a/ash/wm/lock_layout_manager.cc
+++ b/ash/common/wm/lock_layout_manager.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/lock_layout_manager.h"
+#include "ash/common/wm/lock_layout_manager.h"
+#include "ash/common/wm/lock_window_state.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_event.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
-#include "ash/wm/lock_window_state.h"
-#include "ash/wm/window_state.h"
-#include "ash/wm/wm_event.h"
#include "ui/events/event.h"
#include "ui/keyboard/keyboard_controller.h"
#include "ui/keyboard/keyboard_util.h"
diff --git a/ash/wm/lock_layout_manager.h b/ash/common/wm/lock_layout_manager.h
similarity index 92%
rename from ash/wm/lock_layout_manager.h
rename to ash/common/wm/lock_layout_manager.h
index dc08d23d..9ba7473 100644
--- a/ash/wm/lock_layout_manager.h
+++ b/ash/common/wm/lock_layout_manager.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_LOCK_LAYOUT_MANAGER_H_
-#define ASH_WM_LOCK_LAYOUT_MANAGER_H_
+#ifndef ASH_COMMON_WM_LOCK_LAYOUT_MANAGER_H_
+#define ASH_COMMON_WM_LOCK_LAYOUT_MANAGER_H_
#include "ash/ash_export.h"
#include "ash/common/shell_observer.h"
-#include "ash/wm/wm_snap_to_pixel_layout_manager.h"
-#include "ash/wm/wm_types.h"
+#include "ash/common/wm/wm_snap_to_pixel_layout_manager.h"
+#include "ash/common/wm/wm_types.h"
#include "base/macros.h"
#include "ui/aura/window_observer.h"
#include "ui/gfx/geometry/rect.h"
@@ -82,4 +82,4 @@
} // namespace ash
-#endif // ASH_WM_LOCK_LAYOUT_MANAGER_H_
+#endif // ASH_COMMON_WM_LOCK_LAYOUT_MANAGER_H_
diff --git a/ash/wm/lock_state_observer.h b/ash/common/wm/lock_state_observer.h
similarity index 81%
rename from ash/wm/lock_state_observer.h
rename to ash/common/wm/lock_state_observer.h
index d247e82..a7d30fa0 100644
--- a/ash/wm/lock_state_observer.h
+++ b/ash/common/wm/lock_state_observer.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_LOCK_STATE_OBSERVER_H_
-#define ASH_WM_LOCK_STATE_OBSERVER_H_
+#ifndef ASH_COMMON_WM_LOCK_STATE_OBSERVER_H_
+#define ASH_COMMON_WM_LOCK_STATE_OBSERVER_H_
#include "ash/ash_export.h"
@@ -25,4 +25,4 @@
} // namespace ash
-#endif // ASH_WM_LOCK_STATE_OBSERVER_H_
+#endif // ASH_COMMON_WM_LOCK_STATE_OBSERVER_H_
diff --git a/ash/wm/lock_window_state.cc b/ash/common/wm/lock_window_state.cc
similarity index 94%
rename from ash/wm/lock_window_state.cc
rename to ash/common/wm/lock_window_state.cc
index 7b36315..63af76d6 100644
--- a/ash/wm/lock_window_state.cc
+++ b/ash/common/wm/lock_window_state.cc
@@ -2,19 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/lock_window_state.h"
+#include "ash/common/wm/lock_window_state.h"
#include <utility>
+#include "ash/common/wm/lock_layout_manager.h"
+#include "ash/common/wm/window_animation_types.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/window_state_delegate.h"
+#include "ash/common/wm/window_state_util.h"
+#include "ash/common/wm/wm_event.h"
+#include "ash/common/wm/wm_screen_util.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
-#include "ash/wm/lock_layout_manager.h"
-#include "ash/wm/window_animation_types.h"
-#include "ash/wm/window_state.h"
-#include "ash/wm/window_state_delegate.h"
-#include "ash/wm/window_state_util.h"
-#include "ash/wm/wm_event.h"
-#include "ash/wm/wm_screen_util.h"
#include "base/memory/ptr_util.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/keyboard/keyboard_controller.h"
diff --git a/ash/wm/lock_window_state.h b/ash/common/wm/lock_window_state.h
similarity index 92%
rename from ash/wm/lock_window_state.h
rename to ash/common/wm/lock_window_state.h
index 9a164ca..e8abfc7 100644
--- a/ash/wm/lock_window_state.h
+++ b/ash/common/wm/lock_window_state.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_LOCK_WINDOW_STATE_H_
-#define ASH_WM_LOCK_WINDOW_STATE_H_
+#ifndef ASH_COMMON_WM_LOCK_WINDOW_STATE_H_
+#define ASH_COMMON_WM_LOCK_WINDOW_STATE_H_
-#include "ash/wm/window_state.h"
+#include "ash/common/wm/window_state.h"
#include "base/macros.h"
namespace ash {
@@ -56,4 +56,4 @@
} // namespace ash
-#endif // ASH_WM_LOCK_WINDOW_STATE_H_
+#endif // ASH_COMMON_WM_LOCK_WINDOW_STATE_H_
diff --git a/ash/common/wm/maximize_mode/OWNERS b/ash/common/wm/maximize_mode/OWNERS
new file mode 100644
index 0000000..0debac9
--- /dev/null
+++ b/ash/common/wm/maximize_mode/OWNERS
@@ -0,0 +1,2 @@
[email protected]
+
diff --git a/ash/wm/maximize_mode/maximize_mode_controller.cc b/ash/common/wm/maximize_mode/maximize_mode_controller.cc
similarity index 98%
rename from ash/wm/maximize_mode/maximize_mode_controller.cc
rename to ash/common/wm/maximize_mode/maximize_mode_controller.cc
index 7b1d9c2..6ea28be 100644
--- a/ash/wm/maximize_mode/maximize_mode_controller.cc
+++ b/ash/common/wm/maximize_mode/maximize_mode_controller.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include <utility>
#include "ash/common/ash_switches.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_window_manager.h"
+#include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"
#include "ash/common/wm_shell.h"
-#include "ash/wm/maximize_mode/maximize_mode_window_manager.h"
-#include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"
#include "base/command_line.h"
#include "base/metrics/histogram_macros.h"
#include "base/time/default_tick_clock.h"
diff --git a/ash/wm/maximize_mode/maximize_mode_controller.h b/ash/common/wm/maximize_mode/maximize_mode_controller.h
similarity index 97%
rename from ash/wm/maximize_mode/maximize_mode_controller.h
rename to ash/common/wm/maximize_mode/maximize_mode_controller.h
index 4d9a217f..32650fe 100644
--- a/ash/wm/maximize_mode/maximize_mode_controller.h
+++ b/ash/common/wm/maximize_mode/maximize_mode_controller.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_CONTROLLER_H_
-#define ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_CONTROLLER_H_
+#ifndef ASH_COMMON_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_CONTROLLER_H_
+#define ASH_COMMON_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_CONTROLLER_H_
#include <memory>
@@ -189,4 +189,4 @@
} // namespace ash
-#endif // ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_CONTROLLER_H_
+#endif // ASH_COMMON_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_CONTROLLER_H_
diff --git a/ash/wm/maximize_mode/maximize_mode_event_handler.cc b/ash/common/wm/maximize_mode/maximize_mode_event_handler.cc
similarity index 93%
rename from ash/wm/maximize_mode/maximize_mode_event_handler.cc
rename to ash/common/wm/maximize_mode/maximize_mode_event_handler.cc
index cfe077c0..b337050 100644
--- a/ash/wm/maximize_mode/maximize_mode_event_handler.cc
+++ b/ash/common/wm/maximize_mode/maximize_mode_event_handler.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/maximize_mode/maximize_mode_event_handler.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h"
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_event.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/system/tray/system_tray_delegate.h"
-#include "ash/wm/window_state.h"
-#include "ash/wm/wm_event.h"
#include "ui/events/event.h"
namespace ash {
diff --git a/ash/wm/maximize_mode/maximize_mode_event_handler.h b/ash/common/wm/maximize_mode/maximize_mode_event_handler.h
similarity index 80%
rename from ash/wm/maximize_mode/maximize_mode_event_handler.h
rename to ash/common/wm/maximize_mode/maximize_mode_event_handler.h
index 658be05..bb7d6b5 100644
--- a/ash/wm/maximize_mode/maximize_mode_event_handler.h
+++ b/ash/common/wm/maximize_mode/maximize_mode_event_handler.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_EVENT_HANDLER_H_
-#define ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_EVENT_HANDLER_H_
+#ifndef ASH_COMMON_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_EVENT_HANDLER_H_
+#define ASH_COMMON_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_EVENT_HANDLER_H_
#include "base/macros.h"
@@ -34,4 +34,4 @@
} // namespace wm
} // namespace ash
-#endif // ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_EVENT_HANDLER_H_
+#endif // ASH_COMMON_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_EVENT_HANDLER_H_
diff --git a/ash/wm/maximize_mode/maximize_mode_window_manager.cc b/ash/common/wm/maximize_mode/maximize_mode_window_manager.cc
similarity index 95%
rename from ash/wm/maximize_mode/maximize_mode_window_manager.cc
rename to ash/common/wm/maximize_mode/maximize_mode_window_manager.cc
index 3b92f3c..9cafa32 100644
--- a/ash/wm/maximize_mode/maximize_mode_window_manager.cc
+++ b/ash/common/wm/maximize_mode/maximize_mode_window_manager.cc
@@ -2,24 +2,24 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/maximize_mode/maximize_mode_window_manager.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_window_manager.h"
#include "ash/common/ash_switches.h"
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_window_state.h"
+#include "ash/common/wm/maximize_mode/workspace_backdrop_delegate.h"
+#include "ash/common/wm/mru_window_tracker.h"
+#include "ash/common/wm/overview/window_selector_controller.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_event.h"
+#include "ash/common/wm/workspace_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
#include "ash/shell.h"
-#include "ash/wm/maximize_mode/maximize_mode_event_handler.h"
-#include "ash/wm/maximize_mode/maximize_mode_window_state.h"
-#include "ash/wm/maximize_mode/workspace_backdrop_delegate.h"
-#include "ash/wm/mru_window_tracker.h"
-#include "ash/wm/overview/window_selector_controller.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
-#include "ash/wm/wm_event.h"
-#include "ash/wm/workspace_controller.h"
#include "base/command_line.h"
#include "base/memory/ptr_util.h"
#include "base/stl_util.h"
diff --git a/ash/wm/maximize_mode/maximize_mode_window_manager.h b/ash/common/wm/maximize_mode/maximize_mode_window_manager.h
similarity index 95%
rename from ash/wm/maximize_mode/maximize_mode_window_manager.h
rename to ash/common/wm/maximize_mode/maximize_mode_window_manager.h
index d1a532a3b..4033c522 100644
--- a/ash/wm/maximize_mode/maximize_mode_window_manager.h
+++ b/ash/common/wm/maximize_mode/maximize_mode_window_manager.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_MANAGER_H_
-#define ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_MANAGER_H_
+#ifndef ASH_COMMON_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_MANAGER_H_
+#define ASH_COMMON_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_MANAGER_H_
#include <stdint.h>
@@ -12,7 +12,7 @@
#include "ash/ash_export.h"
#include "ash/common/shell_observer.h"
-#include "ash/wm/window_state.h"
+#include "ash/common/wm/window_state.h"
#include "base/macros.h"
#include "ui/aura/window_observer.h"
#include "ui/display/display_observer.h"
@@ -138,4 +138,4 @@
} // namespace ash
-#endif // ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_MANAGER_H_
+#endif // ASH_COMMON_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_MANAGER_H_
diff --git a/ash/wm/maximize_mode/maximize_mode_window_state.cc b/ash/common/wm/maximize_mode/maximize_mode_window_state.cc
similarity index 97%
rename from ash/wm/maximize_mode/maximize_mode_window_state.cc
rename to ash/common/wm/maximize_mode/maximize_mode_window_state.cc
index 8021bc49..fc240bb7 100644
--- a/ash/wm/maximize_mode/maximize_mode_window_state.cc
+++ b/ash/common/wm/maximize_mode/maximize_mode_window_state.cc
@@ -2,18 +2,18 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/maximize_mode/maximize_mode_window_state.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_window_state.h"
#include <utility>
+#include "ash/common/wm/maximize_mode/maximize_mode_window_manager.h"
+#include "ash/common/wm/window_animation_types.h"
+#include "ash/common/wm/window_state_util.h"
+#include "ash/common/wm/wm_event.h"
+#include "ash/common/wm/wm_screen_util.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
-#include "ash/wm/maximize_mode/maximize_mode_window_manager.h"
-#include "ash/wm/window_animation_types.h"
-#include "ash/wm/window_state_util.h"
-#include "ash/wm/wm_event.h"
-#include "ash/wm/wm_screen_util.h"
#include "ui/compositor/layer.h"
#include "ui/gfx/geometry/rect.h"
diff --git a/ash/wm/maximize_mode/maximize_mode_window_state.h b/ash/common/wm/maximize_mode/maximize_mode_window_state.h
similarity index 92%
rename from ash/wm/maximize_mode/maximize_mode_window_state.h
rename to ash/common/wm/maximize_mode/maximize_mode_window_state.h
index fe0878f..62f5b86 100644
--- a/ash/wm/maximize_mode/maximize_mode_window_state.h
+++ b/ash/common/wm/maximize_mode/maximize_mode_window_state.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_STATE_H_
-#define ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_STATE_H_
+#ifndef ASH_COMMON_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_STATE_H_
+#define ASH_COMMON_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_STATE_H_
#include <memory>
-#include "ash/wm/window_state.h"
+#include "ash/common/wm/window_state.h"
#include "base/macros.h"
namespace ash {
@@ -85,4 +85,4 @@
} // namespace ash
-#endif // ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_STATE_H_
+#endif // ASH_COMMON_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_WINDOW_STATE_H_
diff --git a/ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h b/ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h
new file mode 100644
index 0000000..cfad8ee
--- /dev/null
+++ b/ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h
@@ -0,0 +1,17 @@
+// 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.
+
+#ifndef ASH_COMMON_WM_MAXIMIZE_MODE_SCOPED_DISABLE_INTERNAL_MOUSE_AND_KEYBOARD_H_
+#define ASH_COMMON_WM_MAXIMIZE_MODE_SCOPED_DISABLE_INTERNAL_MOUSE_AND_KEYBOARD_H_
+
+namespace ash {
+
+class ScopedDisableInternalMouseAndKeyboard {
+ public:
+ virtual ~ScopedDisableInternalMouseAndKeyboard() {}
+};
+
+} // namespace ash
+
+#endif // ASH_COMMON_WM_MAXIMIZE_MODE_SCOPED_DISABLE_INTERNAL_MOUSE_AND_KEYBOARD_H_
diff --git a/ash/wm/maximize_mode/workspace_backdrop_delegate.cc b/ash/common/wm/maximize_mode/workspace_backdrop_delegate.cc
similarity index 97%
rename from ash/wm/maximize_mode/workspace_backdrop_delegate.cc
rename to ash/common/wm/maximize_mode/workspace_backdrop_delegate.cc
index 95c4596..51113c24 100644
--- a/ash/wm/maximize_mode/workspace_backdrop_delegate.cc
+++ b/ash/common/wm/maximize_mode/workspace_backdrop_delegate.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/maximize_mode/workspace_backdrop_delegate.h"
+#include "ash/common/wm/maximize_mode/workspace_backdrop_delegate.h"
+#include "ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
-#include "ash/wm/workspace/workspace_layout_manager_backdrop_delegate.h"
#include "base/auto_reset.h"
#include "ui/aura/window_observer.h"
#include "ui/compositor/layer.h"
diff --git a/ash/wm/maximize_mode/workspace_backdrop_delegate.h b/ash/common/wm/maximize_mode/workspace_backdrop_delegate.h
similarity index 87%
rename from ash/wm/maximize_mode/workspace_backdrop_delegate.h
rename to ash/common/wm/maximize_mode/workspace_backdrop_delegate.h
index a7e574d..4145c2cb 100644
--- a/ash/wm/maximize_mode/workspace_backdrop_delegate.h
+++ b/ash/common/wm/maximize_mode/workspace_backdrop_delegate.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_MAXIMIZE_MODE_WORKSPACE_BACKDROP_DELEGATE_H_
-#define ASH_WM_MAXIMIZE_MODE_WORKSPACE_BACKDROP_DELEGATE_H_
+#ifndef ASH_COMMON_WM_MAXIMIZE_MODE_WORKSPACE_BACKDROP_DELEGATE_H_
+#define ASH_COMMON_WM_MAXIMIZE_MODE_WORKSPACE_BACKDROP_DELEGATE_H_
#include <memory>
#include "ash/ash_export.h"
-#include "ash/wm/workspace/workspace_layout_manager_backdrop_delegate.h"
+#include "ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h"
#include "base/macros.h"
namespace views {
@@ -70,4 +70,4 @@
} // namespace ash
-#endif // ASH_WM_MAXIMIZE_MODE_WORKSPACE_BACKDROP_DELEGATE_H_
+#endif // ASH_COMMON_WM_MAXIMIZE_MODE_WORKSPACE_BACKDROP_DELEGATE_H_
diff --git a/ash/wm/mru_window_tracker.cc b/ash/common/wm/mru_window_tracker.cc
similarity index 96%
rename from ash/wm/mru_window_tracker.cc
rename to ash/common/wm/mru_window_tracker.cc
index c9e59805..df687d8 100644
--- a/ash/wm/mru_window_tracker.cc
+++ b/ash/common/wm/mru_window_tracker.cc
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/mru_window_tracker.h"
+#include "ash/common/wm/mru_window_tracker.h"
#include <algorithm>
+#include "ash/common/wm/focus_rules.h"
+#include "ash/common/wm/switchable_windows.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
-#include "ash/wm/focus_rules.h"
-#include "ash/wm/switchable_windows.h"
-#include "ash/wm/window_state.h"
#include "base/bind.h"
#include "ui/aura/window.h"
diff --git a/ash/wm/mru_window_tracker.h b/ash/common/wm/mru_window_tracker.h
similarity index 93%
rename from ash/wm/mru_window_tracker.h
rename to ash/common/wm/mru_window_tracker.h
index 76ec2db..1c820e3 100644
--- a/ash/wm/mru_window_tracker.h
+++ b/ash/common/wm/mru_window_tracker.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_MRU_WINDOW_TRACKER_H_
-#define ASH_WM_MRU_WINDOW_TRACKER_H_
+#ifndef ASH_COMMON_WM_MRU_WINDOW_TRACKER_H_
+#define ASH_COMMON_WM_MRU_WINDOW_TRACKER_H_
#include <list>
#include <vector>
@@ -65,4 +65,4 @@
} // namespace ash
-#endif // ASH_WM_MRU_WINDOW_TRACKER_H_
+#endif // ASH_COMMON_WM_MRU_WINDOW_TRACKER_H_
diff --git a/ash/wm/mru_window_tracker_unittest.cc b/ash/common/wm/mru_window_tracker_unittest.cc
similarity index 96%
rename from ash/wm/mru_window_tracker_unittest.cc
rename to ash/common/wm/mru_window_tracker_unittest.cc
index 3e83708..cf92338fb 100644
--- a/ash/wm/mru_window_tracker_unittest.cc
+++ b/ash/common/wm/mru_window_tracker_unittest.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/mru_window_tracker.h"
+#include "ash/common/wm/mru_window_tracker.h"
+#include "ash/common/test/ash_test.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
-#include "ash/test/ash_test.h"
-#include "ash/wm/window_state.h"
#include "ui/base/hit_test.h"
namespace ash {
diff --git a/ash/wm/overview/cleanup_animation_observer.cc b/ash/common/wm/overview/cleanup_animation_observer.cc
similarity index 93%
rename from ash/wm/overview/cleanup_animation_observer.cc
rename to ash/common/wm/overview/cleanup_animation_observer.cc
index 32f9c98..9feed4c 100644
--- a/ash/wm/overview/cleanup_animation_observer.cc
+++ b/ash/common/wm/overview/cleanup_animation_observer.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/overview/cleanup_animation_observer.h"
+#include "ash/common/wm/overview/cleanup_animation_observer.h"
#include "ui/views/widget/widget.h"
diff --git a/ash/wm/overview/cleanup_animation_observer.h b/ash/common/wm/overview/cleanup_animation_observer.h
similarity index 82%
rename from ash/wm/overview/cleanup_animation_observer.h
rename to ash/common/wm/overview/cleanup_animation_observer.h
index 06e5757e..a3ad4ffd 100644
--- a/ash/wm/overview/cleanup_animation_observer.h
+++ b/ash/common/wm/overview/cleanup_animation_observer.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_OVERVIEW_CLEANUP_ANIMATION_OBSERVER_H_
-#define ASH_WM_OVERVIEW_CLEANUP_ANIMATION_OBSERVER_H_
+#ifndef ASH_COMMON_WM_OVERVIEW_CLEANUP_ANIMATION_OBSERVER_H_
+#define ASH_COMMON_WM_OVERVIEW_CLEANUP_ANIMATION_OBSERVER_H_
#include <memory>
#include "ash/ash_export.h"
-#include "ash/wm/overview/window_selector_delegate.h"
+#include "ash/common/wm/overview/window_selector_delegate.h"
#include "base/macros.h"
#include "ui/compositor/layer_animation_observer.h"
@@ -45,4 +45,4 @@
} // namespace ash
-#endif // ASH_WM_OVERVIEW_CLEANUP_ANIMATION_OBSERVER_H_
+#endif // ASH_COMMON_WM_OVERVIEW_CLEANUP_ANIMATION_OBSERVER_H_
diff --git a/ash/wm/overview/cleanup_animation_observer_unittest.cc b/ash/common/wm/overview/cleanup_animation_observer_unittest.cc
similarity index 97%
rename from ash/wm/overview/cleanup_animation_observer_unittest.cc
rename to ash/common/wm/overview/cleanup_animation_observer_unittest.cc
index 4a16de6..a4db1ed 100644
--- a/ash/wm/overview/cleanup_animation_observer_unittest.cc
+++ b/ash/common/wm/overview/cleanup_animation_observer_unittest.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/overview/cleanup_animation_observer.h"
+#include "ash/common/wm/overview/cleanup_animation_observer.h"
#include <vector>
+#include "ash/common/wm/overview/window_selector_delegate.h"
#include "ash/common/wm_window.h"
#include "ash/test/ash_test_base.h"
-#include "ash/wm/overview/window_selector_delegate.h"
#include "ui/compositor/layer_animation_observer.h"
#include "ui/compositor/scoped_animation_duration_scale_mode.h"
#include "ui/compositor/scoped_layer_animation_settings.h"
diff --git a/ash/wm/overview/overview_animation_type.h b/ash/common/wm/overview/overview_animation_type.h
similarity index 87%
rename from ash/wm/overview/overview_animation_type.h
rename to ash/common/wm/overview/overview_animation_type.h
index 089277e..4f8f03f31 100644
--- a/ash/wm/overview/overview_animation_type.h
+++ b/ash/common/wm/overview/overview_animation_type.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_OVERVIEW_OVERVIEW_ANIMATION_TYPE_H_
-#define ASH_WM_OVERVIEW_OVERVIEW_ANIMATION_TYPE_H_
+#ifndef ASH_COMMON_WM_OVERVIEW_OVERVIEW_ANIMATION_TYPE_H_
+#define ASH_COMMON_WM_OVERVIEW_OVERVIEW_ANIMATION_TYPE_H_
namespace ash {
@@ -32,4 +32,4 @@
} // namespace ash
-#endif // ASH_WM_OVERVIEW_OVERVIEW_ANIMATION_TYPE_H_
+#endif // ASH_COMMON_WM_OVERVIEW_OVERVIEW_ANIMATION_TYPE_H_
diff --git a/ash/wm/overview/scoped_overview_animation_settings.h b/ash/common/wm/overview/scoped_overview_animation_settings.h
similarity index 73%
rename from ash/wm/overview/scoped_overview_animation_settings.h
rename to ash/common/wm/overview/scoped_overview_animation_settings.h
index a8898bfb..a5176ed 100644
--- a/ash/wm/overview/scoped_overview_animation_settings.h
+++ b/ash/common/wm/overview/scoped_overview_animation_settings.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_H_
-#define ASH_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_H_
+#ifndef ASH_COMMON_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_H_
+#define ASH_COMMON_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_H_
namespace ui {
class ImplicitAnimationObserver;
@@ -21,4 +21,4 @@
} // namespace ash
-#endif // ASH_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_H_
+#endif // ASH_COMMON_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_H_
diff --git a/ash/wm/overview/scoped_overview_animation_settings_factory.cc b/ash/common/wm/overview/scoped_overview_animation_settings_factory.cc
similarity index 90%
rename from ash/wm/overview/scoped_overview_animation_settings_factory.cc
rename to ash/common/wm/overview/scoped_overview_animation_settings_factory.cc
index 5efc30d6..ebe5f528 100644
--- a/ash/wm/overview/scoped_overview_animation_settings_factory.cc
+++ b/ash/common/wm/overview/scoped_overview_animation_settings_factory.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/overview/scoped_overview_animation_settings_factory.h"
+#include "ash/common/wm/overview/scoped_overview_animation_settings_factory.h"
#include "base/logging.h"
diff --git a/ash/wm/overview/scoped_overview_animation_settings_factory.h b/ash/common/wm/overview/scoped_overview_animation_settings_factory.h
similarity index 73%
rename from ash/wm/overview/scoped_overview_animation_settings_factory.h
rename to ash/common/wm/overview/scoped_overview_animation_settings_factory.h
index cb23ce3..e0340e1 100644
--- a/ash/wm/overview/scoped_overview_animation_settings_factory.h
+++ b/ash/common/wm/overview/scoped_overview_animation_settings_factory.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_FACTORY_H_
-#define ASH_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_FACTORY_H_
+#ifndef ASH_COMMON_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_FACTORY_H_
+#define ASH_COMMON_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_FACTORY_H_
#include <memory>
-#include "ash/wm/overview/overview_animation_type.h"
+#include "ash/common/wm/overview/overview_animation_type.h"
namespace ash {
@@ -33,4 +33,4 @@
} // namespace ash
-#endif // ASH_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_FACTORY_H_
+#endif // ASH_COMMON_WM_OVERVIEW_SCOPED_OVERVIEW_ANIMATION_SETTINGS_FACTORY_H_
diff --git a/ash/wm/overview/scoped_transform_overview_window.cc b/ash/common/wm/overview/scoped_transform_overview_window.cc
similarity index 97%
rename from ash/wm/overview/scoped_transform_overview_window.cc
rename to ash/common/wm/overview/scoped_transform_overview_window.cc
index 99810eb..db63b3d 100644
--- a/ash/wm/overview/scoped_transform_overview_window.cc
+++ b/ash/common/wm/overview/scoped_transform_overview_window.cc
@@ -2,18 +2,18 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/overview/scoped_transform_overview_window.h"
+#include "ash/common/wm/overview/scoped_transform_overview_window.h"
#include <algorithm>
#include <vector>
+#include "ash/common/wm/overview/scoped_overview_animation_settings.h"
+#include "ash/common/wm/overview/scoped_overview_animation_settings_factory.h"
+#include "ash/common/wm/overview/window_selector_item.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/root_window_controller.h"
-#include "ash/wm/overview/scoped_overview_animation_settings.h"
-#include "ash/wm/overview/scoped_overview_animation_settings_factory.h"
-#include "ash/wm/overview/window_selector_item.h"
-#include "ash/wm/window_state.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "base/single_thread_task_runner.h"
diff --git a/ash/wm/overview/scoped_transform_overview_window.h b/ash/common/wm/overview/scoped_transform_overview_window.h
similarity index 96%
rename from ash/wm/overview/scoped_transform_overview_window.h
rename to ash/common/wm/overview/scoped_transform_overview_window.h
index f57a5cb..c197e64 100644
--- a/ash/wm/overview/scoped_transform_overview_window.h
+++ b/ash/common/wm/overview/scoped_transform_overview_window.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_OVERVIEW_SCOPED_TRANSFORM_OVERVIEW_WINDOW_H_
-#define ASH_WM_OVERVIEW_SCOPED_TRANSFORM_OVERVIEW_WINDOW_H_
+#ifndef ASH_COMMON_WM_OVERVIEW_SCOPED_TRANSFORM_OVERVIEW_WINDOW_H_
+#define ASH_COMMON_WM_OVERVIEW_SCOPED_TRANSFORM_OVERVIEW_WINDOW_H_
#include <memory>
#include <vector>
#include "ash/ash_export.h"
-#include "ash/wm/overview/overview_animation_type.h"
+#include "ash/common/wm/overview/overview_animation_type.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "third_party/skia/include/core/SkColor.h"
@@ -195,4 +195,4 @@
} // namespace ash
-#endif // ASH_WM_OVERVIEW_SCOPED_TRANSFORM_OVERVIEW_WINDOW_H_
+#endif // ASH_COMMON_WM_OVERVIEW_SCOPED_TRANSFORM_OVERVIEW_WINDOW_H_
diff --git a/ash/wm/overview/window_grid.cc b/ash/common/wm/overview/window_grid.cc
similarity index 97%
rename from ash/wm/overview/window_grid.cc
rename to ash/common/wm/overview/window_grid.cc
index 8b2a68d..eced1f5 100644
--- a/ash/wm/overview/window_grid.cc
+++ b/ash/common/wm/overview/window_grid.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/overview/window_grid.h"
+#include "ash/common/wm/overview/window_grid.h"
#include <algorithm>
#include <functional>
@@ -11,20 +11,20 @@
#include <vector>
#include "ash/common/ash_switches.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/wm/overview/cleanup_animation_observer.h"
+#include "ash/common/wm/overview/scoped_overview_animation_settings.h"
+#include "ash/common/wm/overview/scoped_overview_animation_settings_factory.h"
+#include "ash/common/wm/overview/window_selector.h"
+#include "ash/common/wm/overview/window_selector_delegate.h"
+#include "ash/common/wm/overview/window_selector_item.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_screen_util.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shelf_types.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/wm_shelf.h"
-#include "ash/wm/overview/cleanup_animation_observer.h"
-#include "ash/wm/overview/scoped_overview_animation_settings.h"
-#include "ash/wm/overview/scoped_overview_animation_settings_factory.h"
-#include "ash/wm/overview/window_selector.h"
-#include "ash/wm/overview/window_selector_delegate.h"
-#include "ash/wm/overview/window_selector_item.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
-#include "ash/wm/wm_screen_util.h"
#include "base/command_line.h"
#include "base/i18n/string_search.h"
#include "base/memory/ptr_util.h"
diff --git a/ash/wm/overview/window_grid.h b/ash/common/wm/overview/window_grid.h
similarity index 96%
rename from ash/wm/overview/window_grid.h
rename to ash/common/wm/overview/window_grid.h
index e7d7115..67f4f56 100644
--- a/ash/wm/overview/window_grid.h
+++ b/ash/common/wm/overview/window_grid.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_OVERVIEW_WINDOW_GRID_H_
-#define ASH_WM_OVERVIEW_WINDOW_GRID_H_
+#ifndef ASH_COMMON_WM_OVERVIEW_WINDOW_GRID_H_
+#define ASH_COMMON_WM_OVERVIEW_WINDOW_GRID_H_
#include <stddef.h>
@@ -11,8 +11,8 @@
#include <set>
#include <vector>
-#include "ash/wm/overview/window_selector.h"
-#include "ash/wm/window_state_observer.h"
+#include "ash/common/wm/overview/window_selector.h"
+#include "ash/common/wm/window_state_observer.h"
#include "base/macros.h"
#include "base/scoped_observer.h"
#include "ui/aura/window_observer.h"
@@ -195,4 +195,4 @@
} // namespace ash
-#endif // ASH_WM_OVERVIEW_WINDOW_GRID_H_
+#endif // ASH_COMMON_WM_OVERVIEW_WINDOW_GRID_H_
diff --git a/ash/wm/overview/window_selector.cc b/ash/common/wm/overview/window_selector.cc
similarity index 97%
rename from ash/wm/overview/window_selector.cc
rename to ash/common/wm/overview/window_selector.cc
index ac05f0a..1905eaf 100644
--- a/ash/wm/overview/window_selector.cc
+++ b/ash/common/wm/overview/window_selector.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/overview/window_selector.h"
+#include "ash/common/wm/overview/window_selector.h"
#include <algorithm>
#include <functional>
@@ -12,20 +12,20 @@
#include "ash/common/accessibility_delegate.h"
#include "ash/common/accessibility_types.h"
+#include "ash/common/metrics/user_metrics_action.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/wm/mru_window_tracker.h"
+#include "ash/common/wm/overview/window_grid.h"
+#include "ash/common/wm/overview/window_selector_delegate.h"
+#include "ash/common/wm/overview/window_selector_item.h"
+#include "ash/common/wm/panels/panel_layout_manager.h"
+#include "ash/common/wm/switchable_windows.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_screen_util.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
-#include "ash/metrics/user_metrics_action.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/wm_shelf.h"
-#include "ash/wm/mru_window_tracker.h"
-#include "ash/wm/overview/window_grid.h"
-#include "ash/wm/overview/window_selector_delegate.h"
-#include "ash/wm/overview/window_selector_item.h"
-#include "ash/wm/panels/panel_layout_manager.h"
-#include "ash/wm/switchable_windows.h"
-#include "ash/wm/window_state.h"
-#include "ash/wm/wm_screen_util.h"
#include "base/auto_reset.h"
#include "base/command_line.h"
#include "base/metrics/histogram_macros.h"
diff --git a/ash/wm/overview/window_selector.h b/ash/common/wm/overview/window_selector.h
similarity index 97%
rename from ash/wm/overview/window_selector.h
rename to ash/common/wm/overview/window_selector.h
index 31b980f..a5cb743 100644
--- a/ash/wm/overview/window_selector.h
+++ b/ash/common/wm/overview/window_selector.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_OVERVIEW_WINDOW_SELECTOR_H_
-#define ASH_WM_OVERVIEW_WINDOW_SELECTOR_H_
+#ifndef ASH_COMMON_WM_OVERVIEW_WINDOW_SELECTOR_H_
+#define ASH_COMMON_WM_OVERVIEW_WINDOW_SELECTOR_H_
#include <stddef.h>
#include <stdint.h>
@@ -197,4 +197,4 @@
} // namespace ash
-#endif // ASH_WM_OVERVIEW_WINDOW_SELECTOR_H_
+#endif // ASH_COMMON_WM_OVERVIEW_WINDOW_SELECTOR_H_
diff --git a/ash/wm/overview/window_selector_controller.cc b/ash/common/wm/overview/window_selector_controller.cc
similarity index 95%
rename from ash/wm/overview/window_selector_controller.cc
rename to ash/common/wm/overview/window_selector_controller.cc
index f74771f..8aa0d24 100644
--- a/ash/wm/overview/window_selector_controller.cc
+++ b/ash/common/wm/overview/window_selector_controller.cc
@@ -2,17 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/overview/window_selector_controller.h"
+#include "ash/common/wm/overview/window_selector_controller.h"
#include <vector>
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/wm/mru_window_tracker.h"
+#include "ash/common/wm/overview/window_selector.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/system/tray/system_tray_delegate.h"
-#include "ash/wm/mru_window_tracker.h"
-#include "ash/wm/overview/window_selector.h"
-#include "ash/wm/window_state.h"
#include "base/metrics/histogram_macros.h"
namespace ash {
diff --git a/ash/wm/overview/window_selector_controller.h b/ash/common/wm/overview/window_selector_controller.h
similarity index 88%
rename from ash/wm/overview/window_selector_controller.h
rename to ash/common/wm/overview/window_selector_controller.h
index 83dcdb3..830ee92 100644
--- a/ash/wm/overview/window_selector_controller.h
+++ b/ash/common/wm/overview/window_selector_controller.h
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_OVERVIEW_WINDOW_SELECTOR_CONTROLLER_H_
-#define ASH_WM_OVERVIEW_WINDOW_SELECTOR_CONTROLLER_H_
+#ifndef ASH_COMMON_WM_OVERVIEW_WINDOW_SELECTOR_CONTROLLER_H_
+#define ASH_COMMON_WM_OVERVIEW_WINDOW_SELECTOR_CONTROLLER_H_
#include <list>
#include <memory>
#include <vector>
#include "ash/ash_export.h"
-#include "ash/wm/overview/window_selector.h"
-#include "ash/wm/overview/window_selector_delegate.h"
+#include "ash/common/wm/overview/window_selector.h"
+#include "ash/common/wm/overview/window_selector_delegate.h"
#include "base/macros.h"
#include "base/time/time.h"
@@ -75,4 +75,4 @@
} // namespace ash
-#endif // ASH_WM_OVERVIEW_WINDOW_SELECTOR_CONTROLLER_H_
+#endif // ASH_COMMON_WM_OVERVIEW_WINDOW_SELECTOR_CONTROLLER_H_
diff --git a/ash/wm/overview/window_selector_delegate.h b/ash/common/wm/overview/window_selector_delegate.h
similarity index 90%
rename from ash/wm/overview/window_selector_delegate.h
rename to ash/common/wm/overview/window_selector_delegate.h
index 021cede..655198d3 100644
--- a/ash/wm/overview/window_selector_delegate.h
+++ b/ash/common/wm/overview/window_selector_delegate.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_OVERVIEW_WINDOW_SELECTOR_DELEGATE_H_
-#define ASH_WM_OVERVIEW_WINDOW_SELECTOR_DELEGATE_H_
+#ifndef ASH_COMMON_WM_OVERVIEW_WINDOW_SELECTOR_DELEGATE_H_
+#define ASH_COMMON_WM_OVERVIEW_WINDOW_SELECTOR_DELEGATE_H_
#include "ash/ash_export.h"
#include "base/compiler_specific.h"
@@ -51,4 +51,4 @@
} // namespace ash
-#endif // ASH_WM_OVERVIEW_WINDOW_SELECTOR_DELEGATE_H_
+#endif // ASH_COMMON_WM_OVERVIEW_WINDOW_SELECTOR_DELEGATE_H_
diff --git a/ash/wm/overview/window_selector_item.cc b/ash/common/wm/overview/window_selector_item.cc
similarity index 97%
rename from ash/wm/overview/window_selector_item.cc
rename to ash/common/wm/overview/window_selector_item.cc
index 34dd1e5..f6a7b94 100644
--- a/ash/wm/overview/window_selector_item.cc
+++ b/ash/common/wm/overview/window_selector_item.cc
@@ -2,27 +2,27 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/overview/window_selector_item.h"
+#include "ash/common/wm/overview/window_selector_item.h"
#include <algorithm>
#include <vector>
#include "ash/common/material_design/material_design_controller.h"
+#include "ash/common/metrics/user_metrics_action.h"
+#include "ash/common/wm/overview/cleanup_animation_observer.h"
+#include "ash/common/wm/overview/overview_animation_type.h"
+#include "ash/common/wm/overview/scoped_overview_animation_settings.h"
+#include "ash/common/wm/overview/scoped_overview_animation_settings_factory.h"
+#include "ash/common/wm/overview/scoped_transform_overview_window.h"
+#include "ash/common/wm/overview/window_selector.h"
+#include "ash/common/wm/overview/window_selector_controller.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
-#include "ash/metrics/user_metrics_action.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/resources/vector_icons/vector_icons.h"
#include "ash/root_window_controller.h"
#include "ash/strings/grit/ash_strings.h"
-#include "ash/wm/overview/cleanup_animation_observer.h"
-#include "ash/wm/overview/overview_animation_type.h"
-#include "ash/wm/overview/scoped_overview_animation_settings.h"
-#include "ash/wm/overview/scoped_overview_animation_settings_factory.h"
-#include "ash/wm/overview/scoped_transform_overview_window.h"
-#include "ash/wm/overview/window_selector.h"
-#include "ash/wm/overview/window_selector_controller.h"
-#include "ash/wm/window_state.h"
#include "base/auto_reset.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/ash/wm/overview/window_selector_item.h b/ash/common/wm/overview/window_selector_item.h
similarity index 96%
rename from ash/wm/overview/window_selector_item.h
rename to ash/common/wm/overview/window_selector_item.h
index 7d58e72..097cc8b4 100644
--- a/ash/wm/overview/window_selector_item.h
+++ b/ash/common/wm/overview/window_selector_item.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_
-#define ASH_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_
+#ifndef ASH_COMMON_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_
+#define ASH_COMMON_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_
#include <memory>
#include "ash/ash_export.h"
-#include "ash/wm/overview/scoped_transform_overview_window.h"
+#include "ash/common/wm/overview/scoped_transform_overview_window.h"
#include "base/macros.h"
#include "ui/aura/window_observer.h"
#include "ui/gfx/geometry/insets.h"
@@ -221,4 +221,4 @@
} // namespace ash
-#endif // ASH_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_
+#endif // ASH_COMMON_WM_OVERVIEW_WINDOW_SELECTOR_ITEM_H_
diff --git a/ash/common/wm/panels/OWNERS b/ash/common/wm/panels/OWNERS
new file mode 100644
index 0000000..aa215c7
--- /dev/null
+++ b/ash/common/wm/panels/OWNERS
@@ -0,0 +1 @@
[email protected]
diff --git a/ash/wm/panels/panel_frame_view.cc b/ash/common/wm/panels/panel_frame_view.cc
similarity index 95%
rename from ash/wm/panels/panel_frame_view.cc
rename to ash/common/wm/panels/panel_frame_view.cc
index 5f7fe58..67ef90c 100644
--- a/ash/wm/panels/panel_frame_view.cc
+++ b/ash/common/wm/panels/panel_frame_view.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/panels/panel_frame_view.h"
+#include "ash/common/wm/panels/panel_frame_view.h"
+#include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h"
+#include "ash/common/frame/default_header_painter.h"
+#include "ash/common/frame/frame_border_hit_test.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
-#include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
-#include "ash/frame/default_header_painter.h"
-#include "ash/frame/frame_border_hit_test.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/window.h"
#include "ui/base/hit_test.h"
diff --git a/ash/wm/panels/panel_frame_view.h b/ash/common/wm/panels/panel_frame_view.h
similarity index 93%
rename from ash/wm/panels/panel_frame_view.h
rename to ash/common/wm/panels/panel_frame_view.h
index 37e4af3..6a1f2758 100644
--- a/ash/wm/panels/panel_frame_view.h
+++ b/ash/common/wm/panels/panel_frame_view.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_PANELS_PANEL_FRAME_VIEW_H_
-#define ASH_WM_PANELS_PANEL_FRAME_VIEW_H_
+#ifndef ASH_COMMON_WM_PANELS_PANEL_FRAME_VIEW_H_
+#define ASH_COMMON_WM_PANELS_PANEL_FRAME_VIEW_H_
#include <memory>
@@ -80,4 +80,4 @@
};
}
-#endif // ASH_WM_PANELS_PANEL_FRAME_VIEW_H_
+#endif // ASH_COMMON_WM_PANELS_PANEL_FRAME_VIEW_H_
diff --git a/ash/wm/panels/panel_layout_manager.cc b/ash/common/wm/panels/panel_layout_manager.cc
similarity index 98%
rename from ash/wm/panels/panel_layout_manager.cc
rename to ash/common/wm/panels/panel_layout_manager.cc
index 0ab5e965..eb8dd67 100644
--- a/ash/wm/panels/panel_layout_manager.cc
+++ b/ash/common/wm/panels/panel_layout_manager.cc
@@ -2,24 +2,24 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/panels/panel_layout_manager.h"
+#include "ash/common/wm/panels/panel_layout_manager.h"
#include <algorithm>
#include <map>
#include <utility>
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/shelf/wm_shelf_util.h"
+#include "ash/common/wm/overview/window_selector_controller.h"
+#include "ash/common/wm/window_animation_types.h"
+#include "ash/common/wm/window_parenting_utils.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/public/cpp/window_properties.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/wm_shelf.h"
-#include "ash/shelf/wm_shelf_util.h"
-#include "ash/wm/overview/window_selector_controller.h"
-#include "ash/wm/window_animation_types.h"
-#include "ash/wm/window_parenting_utils.h"
#include "ash/wm/window_properties.h"
-#include "ash/wm/window_state.h"
#include "base/auto_reset.h"
#include "third_party/skia/include/core/SkColor.h"
#include "third_party/skia/include/core/SkPath.h"
diff --git a/ash/wm/panels/panel_layout_manager.h b/ash/common/wm/panels/panel_layout_manager.h
similarity index 95%
rename from ash/wm/panels/panel_layout_manager.h
rename to ash/common/wm/panels/panel_layout_manager.h
index 7a435bb..ff1047e 100644
--- a/ash/wm/panels/panel_layout_manager.h
+++ b/ash/common/wm/panels/panel_layout_manager.h
@@ -2,20 +2,20 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_
-#define ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_
+#ifndef ASH_COMMON_WM_PANELS_PANEL_LAYOUT_MANAGER_H_
+#define ASH_COMMON_WM_PANELS_PANEL_LAYOUT_MANAGER_H_
#include <list>
#include <memory>
#include "ash/ash_export.h"
+#include "ash/common/shelf/wm_shelf_observer.h"
#include "ash/common/shell_observer.h"
+#include "ash/common/wm/window_state_observer.h"
#include "ash/common/wm_activation_observer.h"
#include "ash/common/wm_display_observer.h"
#include "ash/common/wm_layout_manager.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/wm_shelf_observer.h"
-#include "ash/wm/window_state_observer.h"
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
@@ -202,4 +202,4 @@
} // namespace ash
-#endif // ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_
+#endif // ASH_COMMON_WM_PANELS_PANEL_LAYOUT_MANAGER_H_
diff --git a/ash/wm/panels/panel_window_resizer.cc b/ash/common/wm/panels/panel_window_resizer.cc
similarity index 96%
rename from ash/wm/panels/panel_window_resizer.cc
rename to ash/common/wm/panels/panel_window_resizer.cc
index b7a051d8..e4047eb8 100644
--- a/ash/wm/panels/panel_window_resizer.cc
+++ b/ash/common/wm/panels/panel_window_resizer.cc
@@ -2,17 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/panels/panel_window_resizer.h"
+#include "ash/common/wm/panels/panel_window_resizer.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/wm/panels/panel_layout_manager.h"
+#include "ash/common/wm/window_parenting_utils.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/public/cpp/window_properties.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
-#include "ash/wm/panels/panel_layout_manager.h"
-#include "ash/wm/window_parenting_utils.h"
-#include "ash/wm/window_state.h"
#include "ui/base/hit_test.h"
#include "ui/base/ui_base_types.h"
#include "ui/display/display.h"
diff --git a/ash/wm/panels/panel_window_resizer.h b/ash/common/wm/panels/panel_window_resizer.h
similarity index 92%
rename from ash/wm/panels/panel_window_resizer.h
rename to ash/common/wm/panels/panel_window_resizer.h
index 09aef19..dd8deed 100644
--- a/ash/wm/panels/panel_window_resizer.h
+++ b/ash/common/wm/panels/panel_window_resizer.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_PANELS_PANEL_WINDOW_RESIZER_H_
-#define ASH_WM_PANELS_PANEL_WINDOW_RESIZER_H_
+#ifndef ASH_COMMON_WM_PANELS_PANEL_WINDOW_RESIZER_H_
+#define ASH_COMMON_WM_PANELS_PANEL_WINDOW_RESIZER_H_
#include <memory>
#include "ash/ash_export.h"
-#include "ash/wm/window_resizer.h"
+#include "ash/common/wm/window_resizer.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
@@ -84,4 +84,4 @@
} // namespace ash
-#endif // ASH_WM_PANELS_PANEL_WINDOW_RESIZER_H_
+#endif // ASH_COMMON_WM_PANELS_PANEL_WINDOW_RESIZER_H_
diff --git a/ash/wm/root_window_finder.cc b/ash/common/wm/root_window_finder.cc
similarity index 96%
rename from ash/wm/root_window_finder.cc
rename to ash/common/wm/root_window_finder.cc
index ae1224b..87c2da3 100644
--- a/ash/wm/root_window_finder.cc
+++ b/ash/common/wm/root_window_finder.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/root_window_finder.h"
+#include "ash/common/wm/root_window_finder.h"
#include "ash/common/wm_window.h"
#include "ash/root_window_controller.h"
diff --git a/ash/wm/root_window_finder.h b/ash/common/wm/root_window_finder.h
similarity index 84%
rename from ash/wm/root_window_finder.h
rename to ash/common/wm/root_window_finder.h
index ce568bf..bfda8c9 100644
--- a/ash/wm/root_window_finder.h
+++ b/ash/common/wm/root_window_finder.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_ROOT_WINDOW_FINDER_H_
-#define ASH_WM_ROOT_WINDOW_FINDER_H_
+#ifndef ASH_COMMON_WM_ROOT_WINDOW_FINDER_H_
+#define ASH_COMMON_WM_ROOT_WINDOW_FINDER_H_
#include "ash/ash_export.h"
@@ -30,4 +30,4 @@
} // namespace wm
} // namespace ash
-#endif // ASH_WM_ROOT_WINDOW_FINDER_H_
+#endif // ASH_COMMON_WM_ROOT_WINDOW_FINDER_H_
diff --git a/ash/wm/root_window_layout_manager.cc b/ash/common/wm/root_window_layout_manager.cc
similarity index 97%
rename from ash/wm/root_window_layout_manager.cc
rename to ash/common/wm/root_window_layout_manager.cc
index 240f153a..15ec3fb 100644
--- a/ash/wm/root_window_layout_manager.cc
+++ b/ash/common/wm/root_window_layout_manager.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/root_window_layout_manager.h"
+#include "ash/common/wm/root_window_layout_manager.h"
#include "ash/common/wm_window.h"
#include "ui/aura/window.h"
diff --git a/ash/wm/root_window_layout_manager.h b/ash/common/wm/root_window_layout_manager.h
similarity index 87%
rename from ash/wm/root_window_layout_manager.h
rename to ash/common/wm/root_window_layout_manager.h
index 3f93c0b..677dfc8 100644
--- a/ash/wm/root_window_layout_manager.h
+++ b/ash/common/wm/root_window_layout_manager.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_ROOT_WINDOW_LAYOUT_MANAGER_H_
-#define ASH_WM_ROOT_WINDOW_LAYOUT_MANAGER_H_
+#ifndef ASH_COMMON_WM_ROOT_WINDOW_LAYOUT_MANAGER_H_
+#define ASH_COMMON_WM_ROOT_WINDOW_LAYOUT_MANAGER_H_
#include "ash/common/wm_layout_manager.h"
#include "base/macros.h"
@@ -37,4 +37,4 @@
} // namespace wm
} // namespace ash
-#endif // ASH_WM_ROOT_WINDOW_LAYOUT_MANAGER_H_
+#endif // ASH_COMMON_WM_ROOT_WINDOW_LAYOUT_MANAGER_H_
diff --git a/ash/wm/screen_dimmer.cc b/ash/common/wm/screen_dimmer.cc
similarity index 94%
rename from ash/wm/screen_dimmer.cc
rename to ash/common/wm/screen_dimmer.cc
index abc0eea..2b697fa 100644
--- a/ash/wm/screen_dimmer.cc
+++ b/ash/common/wm/screen_dimmer.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/screen_dimmer.h"
+#include "ash/common/wm/screen_dimmer.h"
+#include "ash/common/wm/container_finder.h"
+#include "ash/common/wm/window_dimmer.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/common/wm_window_user_data.h"
#include "ash/public/cpp/shell_window_ids.h"
-#include "ash/wm/container_finder.h"
-#include "ash/wm/window_dimmer.h"
#include "base/memory/ptr_util.h"
namespace ash {
diff --git a/ash/wm/screen_dimmer.h b/ash/common/wm/screen_dimmer.h
similarity index 94%
rename from ash/wm/screen_dimmer.h
rename to ash/common/wm/screen_dimmer.h
index 90064bfe..1667b05 100644
--- a/ash/wm/screen_dimmer.h
+++ b/ash/common/wm/screen_dimmer.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_SCREEN_DIMMER_H_
-#define ASH_WM_SCREEN_DIMMER_H_
+#ifndef ASH_COMMON_WM_SCREEN_DIMMER_H_
+#define ASH_COMMON_WM_SCREEN_DIMMER_H_
#include <memory>
#include <vector>
@@ -77,4 +77,4 @@
} // namespace ash
-#endif // ASH_WM_SCREEN_DIMMER_H_
+#endif // ASH_COMMON_WM_SCREEN_DIMMER_H_
diff --git a/ash/wm/switchable_windows.cc b/ash/common/wm/switchable_windows.cc
similarity index 95%
rename from ash/wm/switchable_windows.cc
rename to ash/common/wm/switchable_windows.cc
index 7eb572d4..efa1a9a 100644
--- a/ash/wm/switchable_windows.cc
+++ b/ash/common/wm/switchable_windows.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/switchable_windows.h"
+#include "ash/common/wm/switchable_windows.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
diff --git a/ash/wm/switchable_windows.h b/ash/common/wm/switchable_windows.h
similarity index 84%
rename from ash/wm/switchable_windows.h
rename to ash/common/wm/switchable_windows.h
index 4fc868a2..e960a2f 100644
--- a/ash/wm/switchable_windows.h
+++ b/ash/common/wm/switchable_windows.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_SWITCHABLE_WINDOWS_H_
-#define ASH_WM_SWITCHABLE_WINDOWS_H_
+#ifndef ASH_COMMON_WM_SWITCHABLE_WINDOWS_H_
+#define ASH_COMMON_WM_SWITCHABLE_WINDOWS_H_
#include <stddef.h>
@@ -28,4 +28,4 @@
} // namespace wm
} // namespace ash
-#endif // ASH_WM_SWITCHABLE_WINDOWS_H_
+#endif // ASH_COMMON_WM_SWITCHABLE_WINDOWS_H_
diff --git a/ash/wm/system_modal_container_layout_manager.cc b/ash/common/wm/system_modal_container_layout_manager.cc
similarity index 98%
rename from ash/wm/system_modal_container_layout_manager.cc
rename to ash/common/wm/system_modal_container_layout_manager.cc
index 46226cec..d6d8d040 100644
--- a/ash/wm/system_modal_container_layout_manager.cc
+++ b/ash/common/wm/system_modal_container_layout_manager.cc
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/system_modal_container_layout_manager.h"
+#include "ash/common/wm/system_modal_container_layout_manager.h"
#include <cmath>
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/wm/window_dimmer.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
-#include "ash/wm/window_dimmer.h"
#include "base/memory/ptr_util.h"
#include "base/stl_util.h"
#include "ui/aura/client/aura_constants.h"
diff --git a/ash/wm/system_modal_container_layout_manager.h b/ash/common/wm/system_modal_container_layout_manager.h
similarity index 93%
rename from ash/wm/system_modal_container_layout_manager.h
rename to ash/common/wm/system_modal_container_layout_manager.h
index 3e9a4230..171b0f46 100644
--- a/ash/wm/system_modal_container_layout_manager.h
+++ b/ash/common/wm/system_modal_container_layout_manager.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_SYSTEM_MODAL_CONTAINER_LAYOUT_MANAGER_H_
-#define ASH_WM_SYSTEM_MODAL_CONTAINER_LAYOUT_MANAGER_H_
+#ifndef ASH_COMMON_WM_SYSTEM_MODAL_CONTAINER_LAYOUT_MANAGER_H_
+#define ASH_COMMON_WM_SYSTEM_MODAL_CONTAINER_LAYOUT_MANAGER_H_
#include <memory>
#include <set>
#include <vector>
#include "ash/ash_export.h"
-#include "ash/wm/wm_snap_to_pixel_layout_manager.h"
+#include "ash/common/wm/wm_snap_to_pixel_layout_manager.h"
#include "base/macros.h"
#include "ui/aura/window_observer.h"
#include "ui/keyboard/keyboard_controller_observer.h"
@@ -113,4 +113,4 @@
} // namespace ash
-#endif // ASH_WM_SYSTEM_MODAL_CONTAINER_LAYOUT_MANAGER_H_
+#endif // ASH_COMMON_WM_SYSTEM_MODAL_CONTAINER_LAYOUT_MANAGER_H_
diff --git a/ash/wm/window_animation_types.h b/ash/common/wm/window_animation_types.h
similarity index 81%
rename from ash/wm/window_animation_types.h
rename to ash/common/wm/window_animation_types.h
index eb30c35..4ea91c4 100644
--- a/ash/wm/window_animation_types.h
+++ b/ash/common/wm/window_animation_types.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_WINDOW_ANIMATION_TYPES_H_
-#define ASH_WM_WINDOW_ANIMATION_TYPES_H_
+#ifndef ASH_COMMON_WM_WINDOW_ANIMATION_TYPES_H_
+#define ASH_COMMON_WM_WINDOW_ANIMATION_TYPES_H_
#include "ui/wm/core/window_animations.h"
@@ -23,4 +23,4 @@
} // namespace wm
} // namespace ash
-#endif // ASH_WM_WINDOW_ANIMATION_TYPES_H_
+#endif // ASH_COMMON_WM_WINDOW_ANIMATION_TYPES_H_
diff --git a/ash/wm/window_cycle_controller.cc b/ash/common/wm/window_cycle_controller.cc
similarity index 93%
rename from ash/wm/window_cycle_controller.cc
rename to ash/common/wm/window_cycle_controller.cc
index f00183c..686290e5 100644
--- a/ash/wm/window_cycle_controller.cc
+++ b/ash/common/wm/window_cycle_controller.cc
@@ -2,17 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/window_cycle_controller.h"
+#include "ash/common/wm/window_cycle_controller.h"
+#include "ash/common/metrics/task_switch_source.h"
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/wm/mru_window_tracker.h"
+#include "ash/common/wm/window_cycle_event_filter.h"
+#include "ash/common/wm/window_cycle_list.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
-#include "ash/metrics/task_switch_source.h"
#include "ash/public/cpp/shell_window_ids.h"
-#include "ash/wm/mru_window_tracker.h"
-#include "ash/wm/window_cycle_event_filter.h"
-#include "ash/wm/window_cycle_list.h"
-#include "ash/wm/window_state.h"
#include "base/metrics/histogram_macros.h"
namespace ash {
diff --git a/ash/wm/window_cycle_controller.h b/ash/common/wm/window_cycle_controller.h
similarity index 94%
rename from ash/wm/window_cycle_controller.h
rename to ash/common/wm/window_cycle_controller.h
index 65b354ce..87eedd9 100644
--- a/ash/wm/window_cycle_controller.h
+++ b/ash/common/wm/window_cycle_controller.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_WINDOW_CYCLE_CONTROLLER_H_
-#define ASH_WM_WINDOW_CYCLE_CONTROLLER_H_
+#ifndef ASH_COMMON_WM_WINDOW_CYCLE_CONTROLLER_H_
+#define ASH_COMMON_WM_WINDOW_CYCLE_CONTROLLER_H_
#include <memory>
@@ -79,4 +79,4 @@
} // namespace ash
-#endif // ASH_WM_WINDOW_CYCLE_CONTROLLER_H_
+#endif // ASH_COMMON_WM_WINDOW_CYCLE_CONTROLLER_H_
diff --git a/ash/wm/window_cycle_event_filter.h b/ash/common/wm/window_cycle_event_filter.h
similarity index 75%
rename from ash/wm/window_cycle_event_filter.h
rename to ash/common/wm/window_cycle_event_filter.h
index 711aca2..119179f 100644
--- a/ash/wm/window_cycle_event_filter.h
+++ b/ash/common/wm/window_cycle_event_filter.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_WINDOW_CYCLE_EVENT_FILTER_H_
-#define ASH_WM_WINDOW_CYCLE_EVENT_FILTER_H_
+#ifndef ASH_COMMON_WM_WINDOW_CYCLE_EVENT_FILTER_H_
+#define ASH_COMMON_WM_WINDOW_CYCLE_EVENT_FILTER_H_
#include "ash/ash_export.h"
@@ -18,4 +18,4 @@
} // namepsace ash
-#endif // ASH_WM_WINDOW_CYCLE_EVENT_FILTER_H_
+#endif // ASH_COMMON_WM_WINDOW_CYCLE_EVENT_FILTER_H_
diff --git a/ash/wm/window_cycle_list.cc b/ash/common/wm/window_cycle_list.cc
similarity index 98%
rename from ash/wm/window_cycle_list.cc
rename to ash/common/wm/window_cycle_list.cc
index 0f1ea9a..78c7a77 100644
--- a/ash/wm/window_cycle_list.cc
+++ b/ash/common/wm/window_cycle_list.cc
@@ -2,17 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/window_cycle_list.h"
+#include "ash/common/wm/window_cycle_list.h"
#include <list>
#include <map>
+#include "ash/common/wm/mru_window_tracker.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
-#include "ash/wm/mru_window_tracker.h"
-#include "ash/wm/window_state.h"
#include "base/command_line.h"
#include "ui/accessibility/ax_node_data.h"
#include "ui/compositor/scoped_layer_animation_settings.h"
diff --git a/ash/wm/window_cycle_list.h b/ash/common/wm/window_cycle_list.h
similarity index 94%
rename from ash/wm/window_cycle_list.h
rename to ash/common/wm/window_cycle_list.h
index bbc06481..36e89409 100644
--- a/ash/wm/window_cycle_list.h
+++ b/ash/common/wm/window_cycle_list.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_WINDOW_CYCLE_LIST_H_
-#define ASH_WM_WINDOW_CYCLE_LIST_H_
+#ifndef ASH_COMMON_WM_WINDOW_CYCLE_LIST_H_
+#define ASH_COMMON_WM_WINDOW_CYCLE_LIST_H_
#include <memory>
#include <vector>
#include "ash/ash_export.h"
-#include "ash/wm/window_cycle_controller.h"
+#include "ash/common/wm/window_cycle_controller.h"
#include "base/macros.h"
#include "base/scoped_observer.h"
#include "base/timer/timer.h"
@@ -107,4 +107,4 @@
} // namespace ash
-#endif // ASH_WM_WINDOW_CYCLE_LIST_H_
+#endif // ASH_COMMON_WM_WINDOW_CYCLE_LIST_H_
diff --git a/ash/wm/window_dimmer.cc b/ash/common/wm/window_dimmer.cc
similarity index 98%
rename from ash/wm/window_dimmer.cc
rename to ash/common/wm/window_dimmer.cc
index b43c2a8..c90d806 100644
--- a/ash/wm/window_dimmer.cc
+++ b/ash/common/wm/window_dimmer.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/window_dimmer.h"
+#include "ash/common/wm/window_dimmer.h"
#include <memory>
diff --git a/ash/wm/window_dimmer.h b/ash/common/wm/window_dimmer.h
similarity index 100%
rename from ash/wm/window_dimmer.h
rename to ash/common/wm/window_dimmer.h
diff --git a/ash/wm/window_parenting_utils.cc b/ash/common/wm/window_parenting_utils.cc
similarity index 94%
rename from ash/wm/window_parenting_utils.cc
rename to ash/common/wm/window_parenting_utils.cc
index edf4c835..8a868a22 100644
--- a/ash/wm/window_parenting_utils.cc
+++ b/ash/common/wm/window_parenting_utils.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/window_parenting_utils.h"
+#include "ash/common/wm/window_parenting_utils.h"
#include "ash/common/wm_window.h"
diff --git a/ash/wm/window_parenting_utils.h b/ash/common/wm/window_parenting_utils.h
similarity index 86%
rename from ash/wm/window_parenting_utils.h
rename to ash/common/wm/window_parenting_utils.h
index 86f5f8b..864e0aa1 100644
--- a/ash/wm/window_parenting_utils.h
+++ b/ash/common/wm/window_parenting_utils.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_WINDOW_PARENTING_UTILS_H_
-#define ASH_WM_WINDOW_PARENTING_UTILS_H_
+#ifndef ASH_COMMON_WM_WINDOW_PARENTING_UTILS_H_
+#define ASH_COMMON_WM_WINDOW_PARENTING_UTILS_H_
namespace ash {
@@ -27,4 +27,4 @@
} // namespace wm
} // namespace ash
-#endif // ASH_WM_WINDOW_PARENTING_UTILS_H_
+#endif // ASH_COMMON_WM_WINDOW_PARENTING_UTILS_H_
diff --git a/ash/wm/window_positioner.cc b/ash/common/wm/window_positioner.cc
similarity index 98%
rename from ash/wm/window_positioner.cc
rename to ash/common/wm/window_positioner.cc
index b58b153..dcea7bf 100644
--- a/ash/wm/window_positioner.cc
+++ b/ash/common/wm/window_positioner.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/window_positioner.h"
+#include "ash/common/wm/window_positioner.h"
+#include "ash/common/wm/mru_window_tracker.h"
+#include "ash/common/wm/window_positioning_utils.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_screen_util.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
-#include "ash/wm/mru_window_tracker.h"
-#include "ash/wm/window_positioning_utils.h"
-#include "ash/wm/window_state.h"
-#include "ash/wm/wm_screen_util.h"
#include "ui/compositor/layer.h"
#include "ui/display/display.h"
#include "ui/display/screen.h"
diff --git a/ash/wm/window_positioner.h b/ash/common/wm/window_positioner.h
similarity index 96%
rename from ash/wm/window_positioner.h
rename to ash/common/wm/window_positioner.h
index ade2c25a..85cdfd614 100644
--- a/ash/wm/window_positioner.h
+++ b/ash/common/wm/window_positioner.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_WINDOW_POSITIONER_H_
-#define ASH_WM_WINDOW_POSITIONER_H_
+#ifndef ASH_COMMON_WM_WINDOW_POSITIONER_H_
+#define ASH_COMMON_WM_WINDOW_POSITIONER_H_
#include "ash/ash_export.h"
#include "base/macros.h"
@@ -128,4 +128,4 @@
} // namespace ash
-#endif // ASH_WM_WINDOW_POSITIONER_H_
+#endif // ASH_COMMON_WM_WINDOW_POSITIONER_H_
diff --git a/ash/wm/window_positioning_utils.cc b/ash/common/wm/window_positioning_utils.cc
similarity index 96%
rename from ash/wm/window_positioning_utils.cc
rename to ash/common/wm/window_positioning_utils.cc
index 84000a6..babed2f4 100644
--- a/ash/wm/window_positioning_utils.cc
+++ b/ash/common/wm/window_positioning_utils.cc
@@ -2,18 +2,18 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/window_positioning_utils.h"
+#include "ash/common/wm/window_positioning_utils.h"
#include <algorithm>
+#include "ash/common/wm/system_modal_container_layout_manager.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_event.h"
+#include "ash/common/wm/wm_screen_util.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/root_window_controller.h"
#include "ash/shell.h"
-#include "ash/wm/system_modal_container_layout_manager.h"
-#include "ash/wm/window_state.h"
-#include "ash/wm/wm_event.h"
-#include "ash/wm/wm_screen_util.h"
#include "ui/aura/window_tracker.h"
#include "ui/display/display.h"
#include "ui/display/types/display_constants.h"
diff --git a/ash/wm/window_positioning_utils.h b/ash/common/wm/window_positioning_utils.h
similarity index 92%
rename from ash/wm/window_positioning_utils.h
rename to ash/common/wm/window_positioning_utils.h
index d8cd861c7..e515c5b 100644
--- a/ash/wm/window_positioning_utils.h
+++ b/ash/common/wm/window_positioning_utils.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_WINDOW_POSITIONING_UTILS_H_
-#define ASH_WM_WINDOW_POSITIONING_UTILS_H_
+#ifndef ASH_COMMON_WM_WINDOW_POSITIONING_UTILS_H_
+#define ASH_COMMON_WM_WINDOW_POSITIONING_UTILS_H_
#include "ash/ash_export.h"
@@ -67,4 +67,4 @@
} // namespace wm
} // namespace ash
-#endif // ASH_WM_WINDOW_POSITIONING_UTILS_H_
+#endif // ASH_COMMON_WM_WINDOW_POSITIONING_UTILS_H_
diff --git a/ash/wm/window_resizer.cc b/ash/common/wm/window_resizer.cc
similarity index 97%
rename from ash/wm/window_resizer.cc
rename to ash/common/wm/window_resizer.cc
index 5aa2fd6..bb96876 100644
--- a/ash/wm/window_resizer.cc
+++ b/ash/common/wm/window_resizer.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/window_resizer.h"
+#include "ash/common/wm/window_resizer.h"
+#include "ash/common/wm/dock/docked_window_layout_manager.h"
+#include "ash/common/wm/root_window_finder.h"
+#include "ash/common/wm/window_positioning_utils.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_window.h"
-#include "ash/wm/dock/docked_window_layout_manager.h"
-#include "ash/wm/root_window_finder.h"
-#include "ash/wm/window_positioning_utils.h"
-#include "ash/wm/window_state.h"
#include "ui/base/hit_test.h"
#include "ui/base/ui_base_types.h"
#include "ui/display/display.h"
diff --git a/ash/wm/window_resizer.h b/ash/common/wm/window_resizer.h
similarity index 94%
rename from ash/wm/window_resizer.h
rename to ash/common/wm/window_resizer.h
index d0d8d8b..1caf9338 100644
--- a/ash/wm/window_resizer.h
+++ b/ash/common/wm/window_resizer.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_WINDOW_RESIZER_H_
-#define ASH_WM_WINDOW_RESIZER_H_
+#ifndef ASH_COMMON_WM_WINDOW_RESIZER_H_
+#define ASH_COMMON_WM_WINDOW_RESIZER_H_
#include <memory>
#include "ash/ash_export.h"
-#include "ash/wm/drag_details.h"
-#include "ash/wm/window_state.h"
+#include "ash/common/wm/drag_details.h"
+#include "ash/common/wm/window_state.h"
#include "base/macros.h"
#include "ui/wm/public/window_move_client.h"
@@ -107,4 +107,4 @@
} // namespace ash
-#endif // ASH_WM_WINDOW_RESIZER_H_
+#endif // ASH_COMMON_WM_WINDOW_RESIZER_H_
diff --git a/ash/wm/window_state.cc b/ash/common/wm/window_state.cc
similarity index 97%
rename from ash/wm/window_state.cc
rename to ash/common/wm/window_state.cc
index 324c3111..fbfa933 100644
--- a/ash/wm/window_state.cc
+++ b/ash/common/wm/window_state.cc
@@ -2,17 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/window_state.h"
+#include "ash/common/wm/window_state.h"
#include <utility>
+#include "ash/common/wm/default_state.h"
+#include "ash/common/wm/window_positioning_utils.h"
+#include "ash/common/wm/window_state_delegate.h"
+#include "ash/common/wm/window_state_observer.h"
+#include "ash/common/wm/wm_event.h"
+#include "ash/common/wm/wm_screen_util.h"
#include "ash/common/wm_window.h"
-#include "ash/wm/default_state.h"
-#include "ash/wm/window_positioning_utils.h"
-#include "ash/wm/window_state_delegate.h"
-#include "ash/wm/window_state_observer.h"
-#include "ash/wm/wm_event.h"
-#include "ash/wm/wm_screen_util.h"
#include "base/auto_reset.h"
namespace ash {
diff --git a/ash/wm/window_state.h b/ash/common/wm/window_state.h
similarity index 98%
rename from ash/wm/window_state.h
rename to ash/common/wm/window_state.h
index 37cf627..53a5c15 100644
--- a/ash/wm/window_state.h
+++ b/ash/common/wm/window_state.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_WINDOW_STATE_H_
-#define ASH_WM_WINDOW_STATE_H_
+#ifndef ASH_COMMON_WM_WINDOW_STATE_H_
+#define ASH_COMMON_WM_WINDOW_STATE_H_
#include <memory>
#include "ash/ash_export.h"
-#include "ash/wm/drag_details.h"
-#include "ash/wm/wm_types.h"
+#include "ash/common/wm/drag_details.h"
+#include "ash/common/wm/wm_types.h"
#include "base/gtest_prod_util.h"
#include "base/macros.h"
#include "base/observer_list.h"
@@ -394,4 +394,4 @@
} // namespace wm
} // namespace ash
-#endif // ASH_WM_WINDOW_STATE_H_
+#endif // ASH_COMMON_WM_WINDOW_STATE_H_
diff --git a/ash/wm/window_state_delegate.cc b/ash/common/wm/window_state_delegate.cc
similarity index 91%
rename from ash/wm/window_state_delegate.cc
rename to ash/common/wm/window_state_delegate.cc
index 5346b4b..0c3fe59 100644
--- a/ash/wm/window_state_delegate.cc
+++ b/ash/common/wm/window_state_delegate.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/window_state_delegate.h"
+#include "ash/common/wm/window_state_delegate.h"
namespace ash {
namespace wm {
diff --git a/ash/wm/window_state_delegate.h b/ash/common/wm/window_state_delegate.h
similarity index 89%
rename from ash/wm/window_state_delegate.h
rename to ash/common/wm/window_state_delegate.h
index 7912efe..11bd17f 100644
--- a/ash/wm/window_state_delegate.h
+++ b/ash/common/wm/window_state_delegate.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_WINDOW_STATE_DELEGATE_H_
-#define ASH_WM_WINDOW_STATE_DELEGATE_H_
+#ifndef ASH_COMMON_WM_WINDOW_STATE_DELEGATE_H_
+#define ASH_COMMON_WM_WINDOW_STATE_DELEGATE_H_
#include "ash/ash_export.h"
#include "base/macros.h"
@@ -37,4 +37,4 @@
} // namespace wm
} // namespace ash
-#endif // ASH_WM_WINDOW_STATE_DELEGATE_H_
+#endif // ASH_COMMON_WM_WINDOW_STATE_DELEGATE_H_
diff --git a/ash/wm/window_state_observer.h b/ash/common/wm/window_state_observer.h
similarity index 88%
rename from ash/wm/window_state_observer.h
rename to ash/common/wm/window_state_observer.h
index e18cb32..7bfec4e1 100644
--- a/ash/wm/window_state_observer.h
+++ b/ash/common/wm/window_state_observer.h
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_WINDOW_STATE_OBSERVER_H_
-#define ASH_WM_WINDOW_STATE_OBSERVER_H_
+#ifndef ASH_COMMON_WM_WINDOW_STATE_OBSERVER_H_
+#define ASH_COMMON_WM_WINDOW_STATE_OBSERVER_H_
#include "ash/ash_export.h"
-#include "ash/wm/wm_types.h"
+#include "ash/common/wm/wm_types.h"
namespace ash {
namespace wm {
@@ -39,4 +39,4 @@
} // namespace wm
} // namespace ash
-#endif // ASH_WM_WINDOW_STATE_OBSERVER_H_
+#endif // ASH_COMMON_WM_WINDOW_STATE_OBSERVER_H_
diff --git a/ash/wm/window_state_util.cc b/ash/common/wm/window_state_util.cc
similarity index 84%
rename from ash/wm/window_state_util.cc
rename to ash/common/wm/window_state_util.cc
index f83de561..cea13eb 100644
--- a/ash/wm/window_state_util.cc
+++ b/ash/common/wm/window_state_util.cc
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/window_state_util.h"
+#include "ash/common/wm/window_state_util.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/window_state_delegate.h"
#include "ash/common/wm_window.h"
-#include "ash/wm/window_state.h"
-#include "ash/wm/window_state_delegate.h"
namespace ash {
namespace wm {
diff --git a/ash/wm/window_state_util.h b/ash/common/wm/window_state_util.h
similarity index 79%
rename from ash/wm/window_state_util.h
rename to ash/common/wm/window_state_util.h
index aa603de..33bb590d 100644
--- a/ash/wm/window_state_util.h
+++ b/ash/common/wm/window_state_util.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_WINDOW_STATE_UTIL_H_
-#define ASH_WM_WINDOW_STATE_UTIL_H_
+#ifndef ASH_COMMON_WM_WINDOW_STATE_UTIL_H_
+#define ASH_COMMON_WM_WINDOW_STATE_UTIL_H_
#include "ash/ash_export.h"
@@ -19,4 +19,4 @@
} // namespace wm
} // namespace ash
-#endif // ASH_WM_WINDOW_STATE_UTIL_H_
+#endif // ASH_COMMON_WM_WINDOW_STATE_UTIL_H_
diff --git a/ash/wm/wm_event.cc b/ash/common/wm/wm_event.cc
similarity index 92%
rename from ash/wm/wm_event.cc
rename to ash/common/wm/wm_event.cc
index da5b77d..f4c03643 100644
--- a/ash/wm/wm_event.cc
+++ b/ash/common/wm/wm_event.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/wm_event.h"
+#include "ash/common/wm/wm_event.h"
namespace ash {
namespace wm {
diff --git a/ash/wm/wm_event.h b/ash/common/wm/wm_event.h
similarity index 96%
rename from ash/wm/wm_event.h
rename to ash/common/wm/wm_event.h
index c6b6f96..e26ba78 100644
--- a/ash/wm/wm_event.h
+++ b/ash/common/wm/wm_event.h
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_WM_EVENT_H_
-#define ASH_WM_WM_EVENT_H_
+#ifndef ASH_COMMON_WM_WM_EVENT_H_
+#define ASH_COMMON_WM_WM_EVENT_H_
#include "ash/ash_export.h"
-#include "ash/wm/wm_types.h"
+#include "ash/common/wm/wm_types.h"
#include "base/macros.h"
#include "ui/gfx/geometry/rect.h"
@@ -126,4 +126,4 @@
} // namespace wm
} // namespace ash
-#endif // ASH_WM_WM_EVENT_H_
+#endif // ASH_COMMON_WM_WM_EVENT_H_
diff --git a/ash/wm/wm_screen_util.cc b/ash/common/wm/wm_screen_util.cc
similarity index 96%
rename from ash/wm/wm_screen_util.cc
rename to ash/common/wm/wm_screen_util.cc
index 77ae246..768556a6 100644
--- a/ash/wm/wm_screen_util.cc
+++ b/ash/common/wm/wm_screen_util.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/wm_screen_util.h"
+#include "ash/common/wm/wm_screen_util.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
diff --git a/ash/wm/wm_screen_util.h b/ash/common/wm/wm_screen_util.h
similarity index 87%
rename from ash/wm/wm_screen_util.h
rename to ash/common/wm/wm_screen_util.h
index 7d2c083..dc18200 100644
--- a/ash/wm/wm_screen_util.h
+++ b/ash/common/wm/wm_screen_util.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_WM_SCREEN_UTIL_H_
-#define ASH_WM_WM_SCREEN_UTIL_H_
+#ifndef ASH_COMMON_WM_WM_SCREEN_UTIL_H_
+#define ASH_COMMON_WM_WM_SCREEN_UTIL_H_
#include "ash/ash_export.h"
@@ -30,4 +30,4 @@
} // namespace wm
} // namespace ash
-#endif // ASH_WM_WM_SCREEN_UTIL_H_
+#endif // ASH_COMMON_WM_WM_SCREEN_UTIL_H_
diff --git a/ash/wm/wm_snap_to_pixel_layout_manager.cc b/ash/common/wm/wm_snap_to_pixel_layout_manager.cc
similarity index 96%
rename from ash/wm/wm_snap_to_pixel_layout_manager.cc
rename to ash/common/wm/wm_snap_to_pixel_layout_manager.cc
index 740a099..79afc89 100644
--- a/ash/wm/wm_snap_to_pixel_layout_manager.cc
+++ b/ash/common/wm/wm_snap_to_pixel_layout_manager.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/wm_snap_to_pixel_layout_manager.h"
+#include "ash/common/wm/wm_snap_to_pixel_layout_manager.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
diff --git a/ash/wm/wm_snap_to_pixel_layout_manager.h b/ash/common/wm/wm_snap_to_pixel_layout_manager.h
similarity index 87%
rename from ash/wm/wm_snap_to_pixel_layout_manager.h
rename to ash/common/wm/wm_snap_to_pixel_layout_manager.h
index da98f023..7cf38ca 100644
--- a/ash/wm/wm_snap_to_pixel_layout_manager.h
+++ b/ash/common/wm/wm_snap_to_pixel_layout_manager.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_WM_SNAP_TO_PIXEL_LAYOUT_MANAGER_H_
-#define ASH_WM_WM_SNAP_TO_PIXEL_LAYOUT_MANAGER_H_
+#ifndef ASH_COMMON_WM_WM_SNAP_TO_PIXEL_LAYOUT_MANAGER_H_
+#define ASH_COMMON_WM_WM_SNAP_TO_PIXEL_LAYOUT_MANAGER_H_
#include "ash/ash_export.h"
#include "ash/common/wm_layout_manager.h"
@@ -40,4 +40,4 @@
} // namespace wm
} // namespace ash
-#endif // ASH_WM_WM_SNAP_TO_PIXEL_LAYOUT_MANAGER_H_
+#endif // ASH_COMMON_WM_WM_SNAP_TO_PIXEL_LAYOUT_MANAGER_H_
diff --git a/ash/wm/wm_toplevel_window_event_handler.cc b/ash/common/wm/wm_toplevel_window_event_handler.cc
similarity index 98%
rename from ash/wm/wm_toplevel_window_event_handler.cc
rename to ash/common/wm/wm_toplevel_window_event_handler.cc
index 6c4eac1..5e670b9 100644
--- a/ash/wm/wm_toplevel_window_event_handler.cc
+++ b/ash/common/wm/wm_toplevel_window_event_handler.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/wm_toplevel_window_event_handler.h"
+#include "ash/common/wm/wm_toplevel_window_event_handler.h"
+#include "ash/common/wm/window_resizer.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/window_state_observer.h"
+#include "ash/common/wm/wm_event.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
-#include "ash/wm/window_resizer.h"
-#include "ash/wm/window_state.h"
-#include "ash/wm/window_state_observer.h"
-#include "ash/wm/wm_event.h"
#include "ui/aura/window.h"
#include "ui/aura/window_observer.h"
#include "ui/base/hit_test.h"
diff --git a/ash/wm/wm_toplevel_window_event_handler.h b/ash/common/wm/wm_toplevel_window_event_handler.h
similarity index 94%
rename from ash/wm/wm_toplevel_window_event_handler.h
rename to ash/common/wm/wm_toplevel_window_event_handler.h
index 0327b5f..161b627 100644
--- a/ash/wm/wm_toplevel_window_event_handler.h
+++ b/ash/common/wm/wm_toplevel_window_event_handler.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_WM_TOPLEVEL_WINDOW_EVENT_HANDLER_H_
-#define ASH_WM_WM_TOPLEVEL_WINDOW_EVENT_HANDLER_H_
+#ifndef ASH_COMMON_WM_WM_TOPLEVEL_WINDOW_EVENT_HANDLER_H_
+#define ASH_COMMON_WM_WM_TOPLEVEL_WINDOW_EVENT_HANDLER_H_
#include <memory>
#include "ash/ash_export.h"
+#include "ash/common/wm/wm_types.h"
#include "ash/common/wm_display_observer.h"
-#include "ash/wm/wm_types.h"
#include "base/callback.h"
#include "base/macros.h"
#include "ui/gfx/geometry/rect.h"
@@ -125,4 +125,4 @@
} // namespace wm
} // namespace ash
-#endif // ASH_WM_WM_TOPLEVEL_WINDOW_EVENT_HANDLER_H_
+#endif // ASH_COMMON_WM_WM_TOPLEVEL_WINDOW_EVENT_HANDLER_H_
diff --git a/ash/wm/wm_types.cc b/ash/common/wm/wm_types.cc
similarity index 97%
rename from ash/wm/wm_types.cc
rename to ash/common/wm/wm_types.cc
index 1466775..4deed1a 100644
--- a/ash/wm/wm_types.cc
+++ b/ash/common/wm/wm_types.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/wm_types.h"
+#include "ash/common/wm/wm_types.h"
#include "base/logging.h"
diff --git a/ash/wm/wm_types.h b/ash/common/wm/wm_types.h
similarity index 95%
rename from ash/wm/wm_types.h
rename to ash/common/wm/wm_types.h
index d237f39..ad886d8c 100644
--- a/ash/wm/wm_types.h
+++ b/ash/common/wm/wm_types.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_WM_TYPES_H_
-#define ASH_WM_WM_TYPES_H_
+#ifndef ASH_COMMON_WM_WM_TYPES_H_
+#define ASH_COMMON_WM_WM_TYPES_H_
#include "ash/ash_export.h"
#include "ui/base/ui_base_types.h"
@@ -63,4 +63,4 @@
} // namespace wm
} // namespace ash
-#endif // ASH_WM_WM_TYPES_H_
+#endif // ASH_COMMON_WM_WM_TYPES_H_
diff --git a/ash/wm/wm_window_animations.cc b/ash/common/wm/wm_window_animations.cc
similarity index 94%
rename from ash/wm/wm_window_animations.cc
rename to ash/common/wm/wm_window_animations.cc
index e21cc70a..64b431f 100644
--- a/ash/wm/wm_window_animations.cc
+++ b/ash/common/wm/wm_window_animations.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/wm_window_animations.h"
+#include "ash/common/wm/wm_window_animations.h"
#include "ui/compositor/layer.h"
#include "ui/gfx/transform.h"
diff --git a/ash/wm/wm_window_animations.h b/ash/common/wm/wm_window_animations.h
similarity index 84%
rename from ash/wm/wm_window_animations.h
rename to ash/common/wm/wm_window_animations.h
index 860e51e..d704304 100644
--- a/ash/wm/wm_window_animations.h
+++ b/ash/common/wm/wm_window_animations.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_WM_WINDOW_ANIMATIONS_H_
-#define ASH_WM_WM_WINDOW_ANIMATIONS_H_
+#ifndef ASH_COMMON_WM_WM_WINDOW_ANIMATIONS_H_
+#define ASH_COMMON_WM_WM_WINDOW_ANIMATIONS_H_
#include "ash/ash_export.h"
@@ -29,4 +29,4 @@
} // namespace ash
-#endif // ASH_WM_WM_WINDOW_ANIMATIONS_H_
+#endif // ASH_COMMON_WM_WM_WINDOW_ANIMATIONS_H_
diff --git a/ash/wm/workspace/magnetism_matcher.cc b/ash/common/wm/workspace/magnetism_matcher.cc
similarity index 98%
rename from ash/wm/workspace/magnetism_matcher.cc
rename to ash/common/wm/workspace/magnetism_matcher.cc
index d7870ff..e428d96 100644
--- a/ash/wm/workspace/magnetism_matcher.cc
+++ b/ash/common/wm/workspace/magnetism_matcher.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/workspace/magnetism_matcher.h"
+#include "ash/common/wm/workspace/magnetism_matcher.h"
#include <algorithm>
#include <cmath>
diff --git a/ash/wm/workspace/magnetism_matcher.h b/ash/common/wm/workspace/magnetism_matcher.h
similarity index 97%
rename from ash/wm/workspace/magnetism_matcher.h
rename to ash/common/wm/workspace/magnetism_matcher.h
index ef8a18d..034f9c3 100644
--- a/ash/wm/workspace/magnetism_matcher.h
+++ b/ash/common/wm/workspace/magnetism_matcher.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_WORKSPACE_MAGNETISM_MATCHER_H_
-#define ASH_WM_WORKSPACE_MAGNETISM_MATCHER_H_
+#ifndef ASH_COMMON_WM_WORKSPACE_MAGNETISM_MATCHER_H_
+#define ASH_COMMON_WM_WORKSPACE_MAGNETISM_MATCHER_H_
#include <stdint.h>
@@ -189,4 +189,4 @@
} // namespace ash
-#endif // ASH_WM_WORKSPACE_MAGNETISM_MATCHER_H_
+#endif // ASH_COMMON_WM_WORKSPACE_MAGNETISM_MATCHER_H_
diff --git a/ash/wm/workspace/multi_window_resize_controller.cc b/ash/common/wm/workspace/multi_window_resize_controller.cc
similarity index 99%
rename from ash/wm/workspace/multi_window_resize_controller.cc
rename to ash/common/wm/workspace/multi_window_resize_controller.cc
index 6e026131..48879e8 100644
--- a/ash/wm/workspace/multi_window_resize_controller.cc
+++ b/ash/common/wm/workspace/multi_window_resize_controller.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/workspace/multi_window_resize_controller.h"
+#include "ash/common/wm/workspace/multi_window_resize_controller.h"
+#include "ash/common/wm/workspace/workspace_window_resizer.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/resources/grit/ash_resources.h"
#include "ash/root_window_controller.h"
-#include "ash/wm/workspace/workspace_window_resizer.h"
#include "ui/base/cursor/cursor.h"
#include "ui/base/hit_test.h"
#include "ui/base/resource/resource_bundle.h"
diff --git a/ash/wm/workspace/multi_window_resize_controller.h b/ash/common/wm/workspace/multi_window_resize_controller.h
similarity index 96%
rename from ash/wm/workspace/multi_window_resize_controller.h
rename to ash/common/wm/workspace/multi_window_resize_controller.h
index e7609bc..48bd35a6 100644
--- a/ash/wm/workspace/multi_window_resize_controller.h
+++ b/ash/common/wm/workspace/multi_window_resize_controller.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_WORKSPACE_MULTI_WINDOW_RESIZE_CONTROLLER_H_
-#define ASH_WM_WORKSPACE_MULTI_WINDOW_RESIZE_CONTROLLER_H_
+#ifndef ASH_COMMON_WM_WORKSPACE_MULTI_WINDOW_RESIZE_CONTROLLER_H_
+#define ASH_COMMON_WM_WORKSPACE_MULTI_WINDOW_RESIZE_CONTROLLER_H_
#include <memory>
#include <vector>
@@ -177,4 +177,4 @@
} // namespace ash
-#endif // ASH_WM_WORKSPACE_MULTI_WINDOW_RESIZE_CONTROLLER_H_
+#endif // ASH_COMMON_WM_WORKSPACE_MULTI_WINDOW_RESIZE_CONTROLLER_H_
diff --git a/ash/wm/workspace/phantom_window_controller.cc b/ash/common/wm/workspace/phantom_window_controller.cc
similarity index 97%
rename from ash/wm/workspace/phantom_window_controller.cc
rename to ash/common/wm/workspace/phantom_window_controller.cc
index 5cb8b4d..af75b3c 100644
--- a/ash/wm/workspace/phantom_window_controller.cc
+++ b/ash/common/wm/workspace/phantom_window_controller.cc
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/workspace/phantom_window_controller.h"
+#include "ash/common/wm/workspace/phantom_window_controller.h"
#include <math.h>
+#include "ash/common/wm/root_window_finder.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/resources/grit/ash_resources.h"
#include "ash/root_window_controller.h"
-#include "ash/wm/root_window_finder.h"
#include "ui/compositor/layer.h"
#include "ui/compositor/scoped_layer_animation_settings.h"
#include "ui/views/background.h"
diff --git a/ash/wm/workspace/phantom_window_controller.h b/ash/common/wm/workspace/phantom_window_controller.h
similarity index 88%
rename from ash/wm/workspace/phantom_window_controller.h
rename to ash/common/wm/workspace/phantom_window_controller.h
index 4a43aba..6ac7da2 100644
--- a/ash/wm/workspace/phantom_window_controller.h
+++ b/ash/common/wm/workspace/phantom_window_controller.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_WORKSPACE_PHANTOM_WINDOW_CONTROLLER_H_
-#define ASH_WM_WORKSPACE_PHANTOM_WINDOW_CONTROLLER_H_
+#ifndef ASH_COMMON_WM_WORKSPACE_PHANTOM_WINDOW_CONTROLLER_H_
+#define ASH_COMMON_WM_WORKSPACE_PHANTOM_WINDOW_CONTROLLER_H_
#include <memory>
@@ -54,4 +54,4 @@
} // namespace ash
-#endif // ASH_WM_WORKSPACE_PHANTOM_WINDOW_CONTROLLER_H_
+#endif // ASH_COMMON_WM_WORKSPACE_PHANTOM_WINDOW_CONTROLLER_H_
diff --git a/ash/wm/workspace/two_step_edge_cycler.cc b/ash/common/wm/workspace/two_step_edge_cycler.cc
similarity index 96%
rename from ash/wm/workspace/two_step_edge_cycler.cc
rename to ash/common/wm/workspace/two_step_edge_cycler.cc
index f8485e01..9e87de9 100644
--- a/ash/wm/workspace/two_step_edge_cycler.cc
+++ b/ash/common/wm/workspace/two_step_edge_cycler.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/workspace/two_step_edge_cycler.h"
+#include "ash/common/wm/workspace/two_step_edge_cycler.h"
#include <cstdlib>
diff --git a/ash/wm/workspace/two_step_edge_cycler.h b/ash/common/wm/workspace/two_step_edge_cycler.h
similarity index 90%
rename from ash/wm/workspace/two_step_edge_cycler.h
rename to ash/common/wm/workspace/two_step_edge_cycler.h
index d6aca87ee..64743eb1 100644
--- a/ash/wm/workspace/two_step_edge_cycler.h
+++ b/ash/common/wm/workspace/two_step_edge_cycler.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_WORKSPACE_TWO_STEP_EDGE_CYCLER_H_
-#define ASH_WM_WORKSPACE_TWO_STEP_EDGE_CYCLER_H_
+#ifndef ASH_COMMON_WM_WORKSPACE_TWO_STEP_EDGE_CYCLER_H_
+#define ASH_COMMON_WM_WORKSPACE_TWO_STEP_EDGE_CYCLER_H_
#include "ash/ash_export.h"
#include "base/macros.h"
@@ -58,4 +58,4 @@
} // namespace ash
-#endif // ASH_WM_WORKSPACE_TWO_STEP_EDGE_CYCLER_H_
+#endif // ASH_COMMON_WM_WORKSPACE_TWO_STEP_EDGE_CYCLER_H_
diff --git a/ash/wm/workspace/workspace_event_handler.cc b/ash/common/wm/workspace/workspace_event_handler.cc
similarity index 96%
rename from ash/wm/workspace/workspace_event_handler.cc
rename to ash/common/wm/workspace/workspace_event_handler.cc
index e5e96cb0..0e26b16 100644
--- a/ash/wm/workspace/workspace_event_handler.cc
+++ b/ash/common/wm/workspace/workspace_event_handler.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/workspace/workspace_event_handler.h"
+#include "ash/common/wm/workspace/workspace_event_handler.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_event.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
-#include "ash/wm/window_state.h"
-#include "ash/wm/wm_event.h"
#include "ui/base/hit_test.h"
#include "ui/events/event.h"
diff --git a/ash/wm/workspace/workspace_event_handler.h b/ash/common/wm/workspace/workspace_event_handler.h
similarity index 88%
rename from ash/wm/workspace/workspace_event_handler.h
rename to ash/common/wm/workspace/workspace_event_handler.h
index d400eeb..eca5650 100644
--- a/ash/wm/workspace/workspace_event_handler.h
+++ b/ash/common/wm/workspace/workspace_event_handler.h
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_WORKSPACE_WORKSPACE_EVENT_HANDLER_H_
-#define ASH_WM_WORKSPACE_WORKSPACE_EVENT_HANDLER_H_
+#ifndef ASH_COMMON_WM_WORKSPACE_WORKSPACE_EVENT_HANDLER_H_
+#define ASH_COMMON_WM_WORKSPACE_WORKSPACE_EVENT_HANDLER_H_
#include "ash/ash_export.h"
-#include "ash/wm/workspace/multi_window_resize_controller.h"
+#include "ash/common/wm/workspace/multi_window_resize_controller.h"
#include "base/macros.h"
namespace ui {
@@ -58,4 +58,4 @@
} // namespace ash
-#endif // ASH_WM_WORKSPACE_WORKSPACE_EVENT_HANDLER_H_
+#endif // ASH_COMMON_WM_WORKSPACE_WORKSPACE_EVENT_HANDLER_H_
diff --git a/ash/wm/workspace/workspace_layout_manager.cc b/ash/common/wm/workspace/workspace_layout_manager.cc
similarity index 96%
rename from ash/wm/workspace/workspace_layout_manager.cc
rename to ash/common/wm/workspace/workspace_layout_manager.cc
index ebfec663..055ff85 100644
--- a/ash/wm/workspace/workspace_layout_manager.cc
+++ b/ash/common/wm/workspace/workspace_layout_manager.cc
@@ -2,25 +2,25 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/workspace/workspace_layout_manager.h"
+#include "ash/common/wm/workspace/workspace_layout_manager.h"
#include <algorithm>
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/wm/always_on_top_controller.h"
+#include "ash/common/wm/fullscreen_window_finder.h"
+#include "ash/common/wm/window_positioner.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_event.h"
+#include "ash/common/wm/wm_screen_util.h"
+#include "ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/wm_shelf.h"
-#include "ash/wm/always_on_top_controller.h"
-#include "ash/wm/fullscreen_window_finder.h"
-#include "ash/wm/window_positioner.h"
#include "ash/wm/window_properties.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
-#include "ash/wm/wm_event.h"
-#include "ash/wm/wm_screen_util.h"
-#include "ash/wm/workspace/workspace_layout_manager_backdrop_delegate.h"
#include "base/command_line.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/base/ui_base_switches.h"
diff --git a/ash/wm/workspace/workspace_layout_manager.h b/ash/common/wm/workspace/workspace_layout_manager.h
similarity index 94%
rename from ash/wm/workspace/workspace_layout_manager.h
rename to ash/common/wm/workspace/workspace_layout_manager.h
index e9410937..85413a71 100644
--- a/ash/wm/workspace/workspace_layout_manager.h
+++ b/ash/common/wm/workspace/workspace_layout_manager.h
@@ -2,18 +2,18 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_
-#define ASH_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_
+#ifndef ASH_COMMON_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_
+#define ASH_COMMON_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_
#include <memory>
#include <set>
#include "ash/ash_export.h"
#include "ash/common/shell_observer.h"
+#include "ash/common/wm/window_state_observer.h"
+#include "ash/common/wm/wm_types.h"
#include "ash/common/wm_activation_observer.h"
#include "ash/common/wm_layout_manager.h"
-#include "ash/wm/window_state_observer.h"
-#include "ash/wm/wm_types.h"
#include "base/macros.h"
#include "ui/aura/window_observer.h"
#include "ui/display/display_observer.h"
@@ -138,4 +138,4 @@
} // namespace ash
-#endif // ASH_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_
+#endif // ASH_COMMON_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_
diff --git a/ash/wm/workspace/workspace_layout_manager_backdrop_delegate.h b/ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h
similarity index 82%
rename from ash/wm/workspace/workspace_layout_manager_backdrop_delegate.h
rename to ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h
index ed20222..ec4fe68 100644
--- a/ash/wm/workspace/workspace_layout_manager_backdrop_delegate.h
+++ b/ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_BACKDROP_DELEGATE_H_
-#define ASH_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_BACKDROP_DELEGATE_H_
+#ifndef ASH_COMMON_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_BACKDROP_DELEGATE_H_
+#define ASH_COMMON_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_BACKDROP_DELEGATE_H_
#include "ash/ash_export.h"
-#include "ash/wm/wm_types.h"
+#include "ash/common/wm/wm_types.h"
namespace ash {
@@ -45,4 +45,4 @@
} // namespace ash
-#endif // ASH_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_BACKDROP_DELEGATE_H_
+#endif // ASH_COMMON_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_BACKDROP_DELEGATE_H_
diff --git a/ash/wm/workspace/workspace_layout_manager_unittest.cc b/ash/common/wm/workspace/workspace_layout_manager_unittest.cc
similarity index 98%
rename from ash/wm/workspace/workspace_layout_manager_unittest.cc
rename to ash/common/wm/workspace/workspace_layout_manager_unittest.cc
index 5035364..5ca89034 100644
--- a/ash/wm/workspace/workspace_layout_manager_unittest.cc
+++ b/ash/common/wm/workspace/workspace_layout_manager_unittest.cc
@@ -2,29 +2,29 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/workspace/workspace_layout_manager.h"
+#include "ash/common/wm/workspace/workspace_layout_manager.h"
#include <string>
#include <utility>
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/shelf/shelf_constants.h"
+#include "ash/common/shelf/shelf_layout_manager.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/shell_observer.h"
+#include "ash/common/test/ash_test.h"
+#include "ash/common/test/test_session_state_delegate.h"
+#include "ash/common/wm/fullscreen_window_finder.h"
+#include "ash/common/wm/maximize_mode/workspace_backdrop_delegate.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_event.h"
+#include "ash/common/wm/wm_screen_util.h"
+#include "ash/common/wm/workspace/workspace_window_resizer.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/shelf_constants.h"
-#include "ash/shelf/shelf_layout_manager.h"
-#include "ash/shelf/wm_shelf.h"
-#include "ash/test/ash_test.h"
-#include "ash/test/test_session_state_delegate.h"
-#include "ash/wm/fullscreen_window_finder.h"
-#include "ash/wm/maximize_mode/workspace_backdrop_delegate.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
-#include "ash/wm/wm_event.h"
-#include "ash/wm/wm_screen_util.h"
-#include "ash/wm/workspace/workspace_window_resizer.h"
#include "base/command_line.h"
#include "base/run_loop.h"
#include "ui/aura/env.h"
diff --git a/ash/wm/workspace/workspace_types.h b/ash/common/wm/workspace/workspace_types.h
similarity index 80%
rename from ash/wm/workspace/workspace_types.h
rename to ash/common/wm/workspace/workspace_types.h
index c6b7f1b6..b51eabcc 100644
--- a/ash/wm/workspace/workspace_types.h
+++ b/ash/common/wm/workspace/workspace_types.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_WORKSPACE_WORKSPACE_TYPES_H_
-#define ASH_WM_WORKSPACE_WORKSPACE_TYPES_H_
+#ifndef ASH_COMMON_WM_WORKSPACE_WORKSPACE_TYPES_H_
+#define ASH_COMMON_WM_WORKSPACE_WORKSPACE_TYPES_H_
namespace ash {
namespace wm {
@@ -26,4 +26,4 @@
} // namespace wm
} // namespace ash
-#endif // ASH_WM_WORKSPACE_WORKSPACE_TYPES_H_
+#endif // ASH_COMMON_WM_WORKSPACE_WORKSPACE_TYPES_H_
diff --git a/ash/wm/workspace/workspace_window_resizer.cc b/ash/common/wm/workspace/workspace_window_resizer.cc
similarity index 98%
rename from ash/wm/workspace/workspace_window_resizer.cc
rename to ash/common/wm/workspace/workspace_window_resizer.cc
index 208b400..5f66ec57 100644
--- a/ash/wm/workspace/workspace_window_resizer.cc
+++ b/ash/common/wm/workspace/workspace_window_resizer.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/workspace/workspace_window_resizer.h"
+#include "ash/common/wm/workspace/workspace_window_resizer.h"
#include <algorithm>
#include <cmath>
@@ -10,22 +10,22 @@
#include <vector>
#include "ash/common/ash_switches.h"
+#include "ash/common/metrics/user_metrics_action.h"
+#include "ash/common/wm/default_window_resizer.h"
+#include "ash/common/wm/dock/docked_window_layout_manager.h"
+#include "ash/common/wm/dock/docked_window_resizer.h"
+#include "ash/common/wm/panels/panel_window_resizer.h"
+#include "ash/common/wm/window_positioning_utils.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_event.h"
+#include "ash/common/wm/wm_screen_util.h"
+#include "ash/common/wm/workspace/phantom_window_controller.h"
+#include "ash/common/wm/workspace/two_step_edge_cycler.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
-#include "ash/metrics/user_metrics_action.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
#include "ash/shell.h"
-#include "ash/wm/default_window_resizer.h"
-#include "ash/wm/dock/docked_window_layout_manager.h"
-#include "ash/wm/dock/docked_window_resizer.h"
-#include "ash/wm/panels/panel_window_resizer.h"
-#include "ash/wm/window_positioning_utils.h"
-#include "ash/wm/window_state.h"
-#include "ash/wm/wm_event.h"
-#include "ash/wm/wm_screen_util.h"
-#include "ash/wm/workspace/phantom_window_controller.h"
-#include "ash/wm/workspace/two_step_edge_cycler.h"
#include "base/memory/ptr_util.h"
#include "base/memory/weak_ptr.h"
#include "ui/base/hit_test.h"
diff --git a/ash/wm/workspace/workspace_window_resizer.h b/ash/common/wm/workspace/workspace_window_resizer.h
similarity index 96%
rename from ash/wm/workspace/workspace_window_resizer.h
rename to ash/common/wm/workspace/workspace_window_resizer.h
index 13edf62..03b027d 100644
--- a/ash/wm/workspace/workspace_window_resizer.h
+++ b/ash/common/wm/workspace/workspace_window_resizer.h
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_WORKSPACE_WORKSPACE_WINDOW_RESIZER_H_
-#define ASH_WM_WORKSPACE_WORKSPACE_WINDOW_RESIZER_H_
+#ifndef ASH_COMMON_WM_WORKSPACE_WORKSPACE_WINDOW_RESIZER_H_
+#define ASH_COMMON_WM_WORKSPACE_WORKSPACE_WINDOW_RESIZER_H_
#include <stdint.h>
#include <memory>
#include <vector>
-#include "ash/wm/window_resizer.h"
-#include "ash/wm/workspace/magnetism_matcher.h"
+#include "ash/common/wm/window_resizer.h"
+#include "ash/common/wm/workspace/magnetism_matcher.h"
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
@@ -227,4 +227,4 @@
} // namespace ash
-#endif // ASH_WM_WORKSPACE_WORKSPACE_WINDOW_RESIZER_H_
+#endif // ASH_COMMON_WM_WORKSPACE_WORKSPACE_WINDOW_RESIZER_H_
diff --git a/ash/wm/workspace_controller.cc b/ash/common/wm/workspace_controller.cc
similarity index 90%
rename from ash/wm/workspace_controller.cc
rename to ash/common/wm/workspace_controller.cc
index feb3e61..09f742b 100644
--- a/ash/wm/workspace_controller.cc
+++ b/ash/common/wm/workspace_controller.cc
@@ -2,22 +2,22 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/workspace_controller.h"
+#include "ash/common/wm/workspace_controller.h"
#include <utility>
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/wm/dock/docked_window_layout_manager.h"
+#include "ash/common/wm/fullscreen_window_finder.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_window_animations.h"
+#include "ash/common/wm/workspace/workspace_event_handler.h"
+#include "ash/common/wm/workspace/workspace_layout_manager.h"
+#include "ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/wm_shelf.h"
-#include "ash/wm/dock/docked_window_layout_manager.h"
-#include "ash/wm/fullscreen_window_finder.h"
-#include "ash/wm/window_state.h"
-#include "ash/wm/wm_window_animations.h"
-#include "ash/wm/workspace/workspace_event_handler.h"
-#include "ash/wm/workspace/workspace_layout_manager.h"
-#include "ash/wm/workspace/workspace_layout_manager_backdrop_delegate.h"
#include "base/memory/ptr_util.h"
#include "ui/compositor/layer.h"
#include "ui/compositor/scoped_layer_animation_settings.h"
diff --git a/ash/wm/workspace_controller.h b/ash/common/wm/workspace_controller.h
similarity index 88%
rename from ash/wm/workspace_controller.h
rename to ash/common/wm/workspace_controller.h
index 22bf5bb..d37fe68 100644
--- a/ash/wm/workspace_controller.h
+++ b/ash/common/wm/workspace_controller.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_WM_WORKSPACE_CONTROLLER_H_
-#define ASH_WM_WORKSPACE_CONTROLLER_H_
+#ifndef ASH_COMMON_WM_WORKSPACE_CONTROLLER_H_
+#define ASH_COMMON_WM_WORKSPACE_CONTROLLER_H_
#include <memory>
#include "ash/ash_export.h"
-#include "ash/wm/workspace/workspace_types.h"
+#include "ash/common/wm/workspace/workspace_types.h"
#include "base/macros.h"
#include "ui/aura/window_observer.h"
@@ -57,4 +57,4 @@
} // namespace ash
-#endif // ASH_WM_WORKSPACE_CONTROLLER_H_
+#endif // ASH_COMMON_WM_WORKSPACE_CONTROLLER_H_
diff --git a/ash/common/wm_shell.cc b/ash/common/wm_shell.cc
index 6bbbe0b3..d89bd7b 100644
--- a/ash/common/wm_shell.cc
+++ b/ash/common/wm_shell.cc
@@ -6,8 +6,8 @@
#include <utility>
-#include "ash/accelerators/accelerator_controller.h"
-#include "ash/accelerators/ash_focus_manager_factory.h"
+#include "ash/common/accelerators/accelerator_controller.h"
+#include "ash/common/accelerators/ash_focus_manager_factory.h"
#include "ash/common/accessibility_delegate.h"
#include "ash/common/cast_config_controller.h"
#include "ash/common/devtools/ash_devtools_css_agent.h"
@@ -19,19 +19,26 @@
#include "ash/common/palette_delegate.h"
#include "ash/common/session/session_controller.h"
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/shelf/app_list_shelf_item_delegate.h"
+#include "ash/common/shelf/shelf_controller.h"
+#include "ash/common/shelf/shelf_delegate.h"
+#include "ash/common/shelf/shelf_model.h"
+#include "ash/common/shelf/shelf_window_watcher.h"
#include "ash/common/shell_delegate.h"
#include "ash/common/shutdown_controller.h"
#include "ash/common/wallpaper/wallpaper_controller.h"
#include "ash/common/wallpaper/wallpaper_delegate.h"
+#include "ash/common/wm/immersive_context_ash.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
+#include "ash/common/wm/mru_window_tracker.h"
+#include "ash/common/wm/overview/window_selector_controller.h"
+#include "ash/common/wm/root_window_finder.h"
+#include "ash/common/wm/system_modal_container_layout_manager.h"
+#include "ash/common/wm/window_cycle_controller.h"
#include "ash/common/wm_activation_observer.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/app_list_shelf_item_delegate.h"
-#include "ash/shelf/shelf_controller.h"
-#include "ash/shelf/shelf_delegate.h"
-#include "ash/shelf/shelf_model.h"
-#include "ash/shelf/shelf_window_watcher.h"
#include "ash/shell.h"
#include "ash/system/brightness/brightness_controller_chromeos.h"
#include "ash/system/brightness_control_delegate.h"
@@ -44,13 +51,6 @@
#include "ash/system/tray/system_tray_controller.h"
#include "ash/system/tray/system_tray_delegate.h"
#include "ash/system/tray/system_tray_notifier.h"
-#include "ash/wm/immersive_context_ash.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
-#include "ash/wm/mru_window_tracker.h"
-#include "ash/wm/overview/window_selector_controller.h"
-#include "ash/wm/root_window_finder.h"
-#include "ash/wm/system_modal_container_layout_manager.h"
-#include "ash/wm/window_cycle_controller.h"
#include "base/bind.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
diff --git a/ash/common/wm_shell.h b/ash/common/wm_shell.h
index eacc525b..528a61c 100644
--- a/ash/common/wm_shell.h
+++ b/ash/common/wm_shell.h
@@ -11,10 +11,10 @@
#include <vector>
#include "ash/ash_export.h"
+#include "ash/common/metrics/gesture_action_type.h"
+#include "ash/common/metrics/user_metrics_action.h"
#include "ash/common/session/session_state_observer.h"
-#include "ash/metrics/gesture_action_type.h"
-#include "ash/metrics/user_metrics_action.h"
-#include "ash/wm/lock_state_observer.h"
+#include "ash/common/wm/lock_state_observer.h"
#include "base/observer_list.h"
#include "components/ui_devtools/devtools_server.h"
#include "ui/base/ui_base_types.h"
diff --git a/ash/common/wm_window.cc b/ash/common/wm_window.cc
index 38697a1..cb4018c 100644
--- a/ash/common/wm_window.cc
+++ b/ash/common/wm_window.cc
@@ -7,19 +7,19 @@
#include "ash/aura/aura_layout_manager_adapter.h"
#include "ash/aura/wm_shell_aura.h"
#include "ash/common/ash_constants.h"
+#include "ash/common/shelf/shelf_item_types.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_layout_manager.h"
#include "ash/common/wm_transient_window_observer.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/public/cpp/window_properties.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/shelf_item_types.h"
#include "ash/shell.h"
#include "ash/wm/resize_handle_window_targeter.h"
#include "ash/wm/resize_shadow_controller.h"
#include "ash/wm/window_animations.h"
#include "ash/wm/window_mirror_view.h"
#include "ash/wm/window_properties.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
#include "base/memory/ptr_util.h"
diff --git a/ash/common/wm_window_unittest.cc b/ash/common/wm_window_unittest.cc
index 9b69c0b..2cbe553 100644
--- a/ash/common/wm_window_unittest.cc
+++ b/ash/common/wm_window_unittest.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "ash/test/ash_test.h"
+#include "ash/common/test/ash_test.h"
#include "ui/aura/window.h"
#include "ui/aura/window_observer.h"
diff --git a/ash/common/wm_window_user_data_unittest.cc b/ash/common/wm_window_user_data_unittest.cc
index a8e9695..3c65711 100644
--- a/ash/common/wm_window_user_data_unittest.cc
+++ b/ash/common/wm_window_user_data_unittest.cc
@@ -6,10 +6,10 @@
#include <memory>
+#include "ash/common/test/ash_test.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/common/wm_window_user_data.h"
-#include "ash/test/ash_test.h"
#include "base/memory/ptr_util.h"
namespace ash {
diff --git a/ash/content/display/screen_orientation_controller_chromeos_unittest.cc b/ash/content/display/screen_orientation_controller_chromeos_unittest.cc
index e89c7b3..4911957 100644
--- a/ash/content/display/screen_orientation_controller_chromeos_unittest.cc
+++ b/ash/content/display/screen_orientation_controller_chromeos_unittest.cc
@@ -8,6 +8,8 @@
#include <vector>
#include "ash/common/ash_switches.h"
+#include "ash/common/test/test_system_tray_delegate.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/content/shell_content_state.h"
#include "ash/shell.h"
@@ -17,8 +19,6 @@
#include "ash/test/ash_test_helper.h"
#include "ash/test/content/test_shell_content_state.h"
#include "ash/test/test_shell_delegate.h"
-#include "ash/test/test_system_tray_delegate.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
#include "base/command_line.h"
#include "chromeos/accelerometer/accelerometer_reader.h"
#include "chromeos/accelerometer/accelerometer_types.h"
diff --git a/ash/content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc b/ash/content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc
index a600a8da..1943640 100644
--- a/ash/content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc
+++ b/ash/content/keyboard_overlay/keyboard_overlay_delegate_unittest.cc
@@ -4,8 +4,8 @@
#include "ash/content/keyboard_overlay/keyboard_overlay_delegate.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/public/cpp/shelf_types.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/ash/content/keyboard_overlay/keyboard_overlay_view_unittest.cc b/ash/content/keyboard_overlay/keyboard_overlay_view_unittest.cc
index c4e4173..5cd23568 100644
--- a/ash/content/keyboard_overlay/keyboard_overlay_view_unittest.cc
+++ b/ash/content/keyboard_overlay/keyboard_overlay_view_unittest.cc
@@ -6,7 +6,7 @@
#include <algorithm>
-#include "ash/accelerators/accelerator_table.h"
+#include "ash/common/accelerators/accelerator_table.h"
#include "ash/content/keyboard_overlay/keyboard_overlay_delegate.h"
#include "ash/content/shell_content_state.h"
#include "ash/test/ash_test_base.h"
diff --git a/ash/dip_unittest.cc b/ash/dip_unittest.cc
index 80c3301..0e1abed3 100644
--- a/ash/dip_unittest.cc
+++ b/ash/dip_unittest.cc
@@ -5,8 +5,8 @@
#include <algorithm>
#include <vector>
-#include "ash/shelf/shelf_widget.h"
-#include "ash/shelf/wm_shelf.h"
+#include "ash/common/shelf/shelf_widget.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "ash/wm/window_properties.h"
diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc
index b8b856c..7f3e87e 100644
--- a/ash/display/display_manager_unittest.cc
+++ b/ash/display/display_manager_unittest.cc
@@ -6,6 +6,7 @@
#include "ash/accelerators/accelerator_commands_aura.h"
#include "ash/common/ash_switches.h"
+#include "ash/common/wm/window_state.h"
#include "ash/display/display_configuration_controller.h"
#include "ash/display/display_util.h"
#include "ash/display/mirror_window_controller.h"
@@ -15,7 +16,6 @@
#include "ash/strings/grit/ash_strings.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/mirror_window_test_api.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "base/command_line.h"
#include "base/format_macros.h"
diff --git a/ash/display/root_window_transformers_unittest.cc b/ash/display/root_window_transformers_unittest.cc
index 077186b..fdcc28b 100644
--- a/ash/display/root_window_transformers_unittest.cc
+++ b/ash/display/root_window_transformers_unittest.cc
@@ -6,11 +6,11 @@
#include <memory>
+#include "ash/common/shelf/shelf_widget.h"
#include "ash/display/display_util.h"
#include "ash/host/root_window_transformer.h"
#include "ash/magnifier/magnification_controller.h"
#include "ash/screen_util.h"
-#include "ash/shelf/shelf_widget.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/cursor_manager_test_api.h"
diff --git a/ash/display/screen_ash.cc b/ash/display/screen_ash.cc
index b743dc7..c6a2847 100644
--- a/ash/display/screen_ash.cc
+++ b/ash/display/screen_ash.cc
@@ -4,13 +4,13 @@
#include "ash/display/screen_ash.h"
+#include "ash/common/shelf/shelf_widget.h"
+#include "ash/common/wm/root_window_finder.h"
#include "ash/common/wm_window.h"
#include "ash/display/window_tree_host_manager.h"
#include "ash/root_window_controller.h"
#include "ash/root_window_settings.h"
-#include "ash/shelf/shelf_widget.h"
#include "ash/shell.h"
-#include "ash/wm/root_window_finder.h"
#include "base/logging.h"
#include "ui/aura/client/screen_position_client.h"
#include "ui/aura/env.h"
diff --git a/ash/display/screen_orientation_controller_chromeos.cc b/ash/display/screen_orientation_controller_chromeos.cc
index 1a0ce91..1048900 100644
--- a/ash/display/screen_orientation_controller_chromeos.cc
+++ b/ash/display/screen_orientation_controller_chromeos.cc
@@ -5,11 +5,11 @@
#include "ash/display/screen_orientation_controller_chromeos.h"
#include "ash/common/ash_switches.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/display/display_configuration_controller.h"
#include "ash/shell.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
#include "base/auto_reset.h"
#include "base/command_line.h"
#include "chromeos/accelerometer/accelerometer_reader.h"
diff --git a/ash/display/screen_position_controller.cc b/ash/display/screen_position_controller.cc
index a11c24a..6481c0f 100644
--- a/ash/display/screen_position_controller.cc
+++ b/ash/display/screen_position_controller.cc
@@ -4,13 +4,13 @@
#include "ash/display/screen_position_controller.h"
+#include "ash/common/wm/window_positioning_utils.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/shell.h"
-#include "ash/wm/window_positioning_utils.h"
#include "ash/wm/window_properties.h"
-#include "ash/wm/window_state.h"
#include "ui/aura/window.h"
#include "ui/aura/window_tree_host.h"
#include "ui/compositor/dip_util.h"
diff --git a/ash/display/window_tree_host_manager_unittest.cc b/ash/display/window_tree_host_manager_unittest.cc
index 5aab608..2f1a3bc 100644
--- a/ash/display/window_tree_host_manager_unittest.cc
+++ b/ash/display/window_tree_host_manager_unittest.cc
@@ -6,20 +6,20 @@
#include <memory>
+#include "ash/common/shelf/shelf_widget.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_event.h"
+#include "ash/common/wm/wm_screen_util.h"
#include "ash/common/wm_window.h"
#include "ash/display/display_util.h"
#include "ash/screen_util.h"
-#include "ash/shelf/shelf_widget.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/ash_test_helper.h"
#include "ash/test/cursor_manager_test_api.h"
#include "ash/test/test_shell_delegate.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
-#include "ash/wm/wm_event.h"
-#include "ash/wm/wm_screen_util.h"
#include "base/command_line.h"
#include "ui/aura/client/focus_change_observer.h"
#include "ui/aura/client/focus_client.h"
diff --git a/ash/drag_drop/drag_drop_controller.cc b/ash/drag_drop/drag_drop_controller.cc
index 3c16d1fb0..1d07181 100644
--- a/ash/drag_drop/drag_drop_controller.cc
+++ b/ash/drag_drop/drag_drop_controller.cc
@@ -6,10 +6,10 @@
#include <utility>
+#include "ash/common/drag_drop/drag_image_view.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/drag_drop/drag_drop_tracker.h"
-#include "ash/drag_drop/drag_image_view.h"
#include "ash/shell.h"
#include "base/bind.h"
#include "base/message_loop/message_loop.h"
diff --git a/ash/drag_drop/drag_drop_controller_unittest.cc b/ash/drag_drop/drag_drop_controller_unittest.cc
index d026fd5..5218187 100644
--- a/ash/drag_drop/drag_drop_controller_unittest.cc
+++ b/ash/drag_drop/drag_drop_controller_unittest.cc
@@ -4,8 +4,8 @@
#include "ash/drag_drop/drag_drop_controller.h"
+#include "ash/common/drag_drop/drag_image_view.h"
#include "ash/drag_drop/drag_drop_tracker.h"
-#include "ash/drag_drop/drag_image_view.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "base/command_line.h"
diff --git a/ash/drag_drop/drag_drop_tracker.cc b/ash/drag_drop/drag_drop_tracker.cc
index e64897b..48b877f3 100644
--- a/ash/drag_drop/drag_drop_tracker.cc
+++ b/ash/drag_drop/drag_drop_tracker.cc
@@ -4,10 +4,10 @@
#include "ash/drag_drop/drag_drop_tracker.h"
+#include "ash/common/wm/root_window_finder.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/shell.h"
-#include "ash/wm/root_window_finder.h"
#include "ui/aura/client/window_parenting_client.h"
#include "ui/aura/window.h"
#include "ui/aura/window_event_dispatcher.h"
diff --git a/ash/extended_desktop_unittest.cc b/ash/extended_desktop_unittest.cc
index 62c1b9f..93eb88f 100644
--- a/ash/extended_desktop_unittest.cc
+++ b/ash/extended_desktop_unittest.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "ash/common/wm/root_window_finder.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
#include "ash/shell.h"
#include "ash/system/tray/system_tray.h"
#include "ash/test/ash_test_base.h"
-#include "ash/wm/root_window_finder.h"
#include "ash/wm/window_properties.h"
#include "ash/wm/window_util.h"
#include "base/strings/string_util.h"
diff --git a/ash/first_run/first_run_helper_impl.cc b/ash/first_run/first_run_helper_impl.cc
index af9c7fef..db8f411 100644
--- a/ash/first_run/first_run_helper_impl.cc
+++ b/ash/first_run/first_run_helper_impl.cc
@@ -4,12 +4,12 @@
#include "ash/first_run/first_run_helper_impl.h"
+#include "ash/common/shelf/app_list_button.h"
+#include "ash/common/shelf/shelf_widget.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
-#include "ash/shelf/app_list_button.h"
-#include "ash/shelf/shelf_widget.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/system/tray/system_tray.h"
#include "base/logging.h"
diff --git a/ash/focus_cycler_unittest.cc b/ash/focus_cycler_unittest.cc
index 5166b718..03b81df 100644
--- a/ash/focus_cycler_unittest.cc
+++ b/ash/focus_cycler_unittest.cc
@@ -6,9 +6,9 @@
#include <memory>
+#include "ash/common/shelf/shelf_widget.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wm_shell.h"
-#include "ash/shelf/shelf_widget.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/system/status_area_widget.h"
#include "ash/system/status_area_widget_delegate.h"
#include "ash/system/tray/system_tray.h"
diff --git a/ash/frame/caption_buttons/frame_size_button_unittest.cc b/ash/frame/caption_buttons/frame_size_button_unittest.cc
index 9742dbf..e7bfe7b4 100644
--- a/ash/frame/caption_buttons/frame_size_button_unittest.cc
+++ b/ash/frame/caption_buttons/frame_size_button_unittest.cc
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/frame/caption_buttons/frame_size_button.h"
+#include "ash/common/frame/caption_buttons/frame_size_button.h"
#include "ash/common/ash_layout_constants.h"
-#include "ash/frame/caption_buttons/frame_caption_button.h"
-#include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
+#include "ash/common/frame/caption_buttons/frame_caption_button.h"
+#include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h"
+#include "ash/common/wm/window_state.h"
#include "ash/resources/grit/ash_resources.h"
#include "ash/resources/vector_icons/vector_icons.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "base/i18n/rtl.h"
#include "ui/aura/window.h"
diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc
index ab2a4e3..8e4bdbe7 100644
--- a/ash/magnifier/magnification_controller.cc
+++ b/ash/magnifier/magnification_controller.cc
@@ -7,7 +7,7 @@
#include <memory>
#include <utility>
-#include "ash/accelerators/accelerator_controller.h"
+#include "ash/common/accelerators/accelerator_controller.h"
#include "ash/common/accessibility_delegate.h"
#include "ash/common/wm_shell.h"
#include "ash/display/root_window_transformers.h"
diff --git a/ash/metrics/task_switch_metrics_recorder.h b/ash/metrics/task_switch_metrics_recorder.h
index c637d4a..164d0ce5 100644
--- a/ash/metrics/task_switch_metrics_recorder.h
+++ b/ash/metrics/task_switch_metrics_recorder.h
@@ -10,7 +10,7 @@
#include <unordered_map>
#include "ash/ash_export.h"
-#include "ash/metrics/task_switch_source.h"
+#include "ash/common/metrics/task_switch_source.h"
#include "base/macros.h"
namespace ash {
diff --git a/ash/metrics/user_metrics_recorder.cc b/ash/metrics/user_metrics_recorder.cc
index 639eb1e..85c8914 100644
--- a/ash/metrics/user_metrics_recorder.cc
+++ b/ash/metrics/user_metrics_recorder.cc
@@ -4,20 +4,20 @@
#include "ash/metrics/user_metrics_recorder.h"
+#include "ash/common/metrics/pointer_metrics_recorder.h"
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/shelf/shelf_delegate.h"
+#include "ash/common/shelf/shelf_item_types.h"
+#include "ash/common/shelf/shelf_model.h"
+#include "ash/common/shelf/shelf_view.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/metrics/desktop_task_switch_metric_recorder.h"
-#include "ash/metrics/pointer_metrics_recorder.h"
#include "ash/public/cpp/shell_window_ids.h"
-#include "ash/shelf/shelf_delegate.h"
-#include "ash/shelf/shelf_item_types.h"
-#include "ash/shelf/shelf_model.h"
-#include "ash/shelf/shelf_view.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/system/tray/system_tray_delegate.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
diff --git a/ash/metrics/user_metrics_recorder.h b/ash/metrics/user_metrics_recorder.h
index 524c5c1..7437dff 100644
--- a/ash/metrics/user_metrics_recorder.h
+++ b/ash/metrics/user_metrics_recorder.h
@@ -8,8 +8,8 @@
#include <memory>
#include "ash/ash_export.h"
+#include "ash/common/metrics/user_metrics_action.h"
#include "ash/metrics/task_switch_metrics_recorder.h"
-#include "ash/metrics/user_metrics_action.h"
#include "base/macros.h"
#include "base/timer/timer.h"
diff --git a/ash/metrics/user_metrics_recorder_unittest.cc b/ash/metrics/user_metrics_recorder_unittest.cc
index ed228427..8351032 100644
--- a/ash/metrics/user_metrics_recorder_unittest.cc
+++ b/ash/metrics/user_metrics_recorder_unittest.cc
@@ -7,12 +7,12 @@
#include <memory>
#include "ash/common/login_status.h"
+#include "ash/common/shelf/shelf_model.h"
+#include "ash/common/test/test_shelf_delegate.h"
+#include "ash/common/test/test_system_tray_delegate.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
-#include "ash/shelf/shelf_model.h"
#include "ash/test/ash_test_base.h"
-#include "ash/test/test_shelf_delegate.h"
-#include "ash/test/test_system_tray_delegate.h"
#include "ash/test/user_metrics_recorder_test_api.h"
#include "base/test/histogram_tester.h"
#include "ui/aura/window.h"
diff --git a/ash/mus/accelerators/accelerator_controller_delegate_mus.h b/ash/mus/accelerators/accelerator_controller_delegate_mus.h
index fce5bfd..79a30fee 100644
--- a/ash/mus/accelerators/accelerator_controller_delegate_mus.h
+++ b/ash/mus/accelerators/accelerator_controller_delegate_mus.h
@@ -5,7 +5,7 @@
#ifndef ASH_MUS_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_MUS_H_
#define ASH_MUS_ACCELERATORS_ACCELERATOR_CONTROLLER_DELEGATE_MUS_H_
-#include "ash/accelerators/accelerator_controller_delegate.h"
+#include "ash/common/accelerators/accelerator_controller_delegate.h"
#include "base/macros.h"
namespace ash {
diff --git a/ash/mus/accelerators/accelerator_controller_registrar.cc b/ash/mus/accelerators/accelerator_controller_registrar.cc
index 4bf2c403..ef1f124 100644
--- a/ash/mus/accelerators/accelerator_controller_registrar.cc
+++ b/ash/mus/accelerators/accelerator_controller_registrar.cc
@@ -6,8 +6,8 @@
#include <limits>
-#include "ash/accelerators/accelerator_controller.h"
-#include "ash/accelerators/accelerator_router.h"
+#include "ash/common/accelerators/accelerator_controller.h"
+#include "ash/common/accelerators/accelerator_router.h"
#include "ash/common/wm_shell.h"
#include "ash/mus/accelerators/accelerator_ids.h"
#include "ash/mus/window_manager.h"
diff --git a/ash/mus/bridge/wm_shell_mus.cc b/ash/mus/bridge/wm_shell_mus.cc
index 2470cfc4c..a60bd2e 100644
--- a/ash/mus/bridge/wm_shell_mus.cc
+++ b/ash/mus/bridge/wm_shell_mus.cc
@@ -6,12 +6,17 @@
#include <utility>
-#include "ash/accelerators/accelerator_controller.h"
+#include "ash/common/accelerators/accelerator_controller.h"
#include "ash/common/key_event_watcher.h"
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/shell_delegate.h"
#include "ash/common/shell_observer.h"
#include "ash/common/wallpaper/wallpaper_delegate.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h"
+#include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"
+#include "ash/common/wm/mru_window_tracker.h"
+#include "ash/common/wm/window_cycle_event_filter.h"
+#include "ash/common/wm/window_resizer.h"
#include "ash/common/wm_window.h"
#include "ash/mus/accelerators/accelerator_controller_delegate_mus.h"
#include "ash/mus/accelerators/accelerator_controller_registrar.h"
@@ -27,11 +32,6 @@
#include "ash/shell.h"
#include "ash/shell_init_params.h"
#include "ash/system/tray/system_tray_delegate.h"
-#include "ash/wm/maximize_mode/maximize_mode_event_handler.h"
-#include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"
-#include "ash/wm/mru_window_tracker.h"
-#include "ash/wm/window_cycle_event_filter.h"
-#include "ash/wm/window_resizer.h"
#include "ash/wm/window_util.h"
#include "base/memory/ptr_util.h"
#include "components/user_manager/user_info_impl.h"
diff --git a/ash/mus/bridge/workspace_event_handler_mus.h b/ash/mus/bridge/workspace_event_handler_mus.h
index 00a300e..6f10ad7 100644
--- a/ash/mus/bridge/workspace_event_handler_mus.h
+++ b/ash/mus/bridge/workspace_event_handler_mus.h
@@ -5,7 +5,7 @@
#ifndef ASH_MUS_BRIDGE_WORKSPACE_EVENT_HANDLER_MUS_H_
#define ASH_MUS_BRIDGE_WORKSPACE_EVENT_HANDLER_MUS_H_
-#include "ash/wm/workspace/workspace_event_handler.h"
+#include "ash/common/wm/workspace/workspace_event_handler.h"
#include "base/macros.h"
namespace aura {
diff --git a/ash/mus/context_menu_mus.cc b/ash/mus/context_menu_mus.cc
index e53ae563..c3fe04f 100644
--- a/ash/mus/context_menu_mus.cc
+++ b/ash/mus/context_menu_mus.cc
@@ -4,11 +4,11 @@
#include "ash/mus/context_menu_mus.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wallpaper/wallpaper_controller.h"
#include "ash/common/wallpaper/wallpaper_delegate.h"
#include "ash/common/wm_shell.h"
#include "ash/public/cpp/shelf_types.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/strings/grit/ash_strings.h"
namespace ash {
diff --git a/ash/mus/context_menu_mus.h b/ash/mus/context_menu_mus.h
index c3d27fb..01f69f5 100644
--- a/ash/mus/context_menu_mus.h
+++ b/ash/mus/context_menu_mus.h
@@ -5,7 +5,7 @@
#ifndef ASH_MUS_CONTEXT_MENU_MUS_H_
#define ASH_MUS_CONTEXT_MENU_MUS_H_
-#include "ash/shelf/shelf_alignment_menu.h"
+#include "ash/common/shelf/shelf_alignment_menu.h"
#include "base/macros.h"
#include "ui/base/models/simple_menu_model.h"
diff --git a/ash/mus/drag_window_resizer.h b/ash/mus/drag_window_resizer.h
index cd46660..4d57087 100644
--- a/ash/mus/drag_window_resizer.h
+++ b/ash/mus/drag_window_resizer.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "ash/wm/window_resizer.h"
+#include "ash/common/wm/window_resizer.h"
#include "base/macros.h"
namespace ash {
diff --git a/ash/mus/frame/custom_frame_view_mus.h b/ash/mus/frame/custom_frame_view_mus.h
index 3129455..413e45e 100644
--- a/ash/mus/frame/custom_frame_view_mus.h
+++ b/ash/mus/frame/custom_frame_view_mus.h
@@ -5,7 +5,7 @@
#ifndef ASH_MUS_FRAME_CUSTOM_FRAME_VIEW_MUS_H_
#define ASH_MUS_FRAME_CUSTOM_FRAME_VIEW_MUS_H_
-#include "ash/frame/custom_frame_view_ash.h"
+#include "ash/common/frame/custom_frame_view_ash.h"
#include "ui/compositor/paint_cache.h"
namespace ash {
diff --git a/ash/mus/frame/detached_title_area_renderer.cc b/ash/mus/frame/detached_title_area_renderer.cc
index 181b3f6d..c6f42235 100644
--- a/ash/mus/frame/detached_title_area_renderer.cc
+++ b/ash/mus/frame/detached_title_area_renderer.cc
@@ -4,11 +4,11 @@
#include "ash/mus/frame/detached_title_area_renderer.h"
+#include "ash/common/frame/header_view.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_window.h"
-#include "ash/frame/header_view.h"
#include "ash/mus/property_util.h"
#include "ash/mus/window_manager.h"
-#include "ash/wm/window_state.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/client/transient_window_client.h"
#include "ui/aura/mus/property_converter.h"
diff --git a/ash/mus/move_event_handler.h b/ash/mus/move_event_handler.h
index 8854c45..754882b 100644
--- a/ash/mus/move_event_handler.h
+++ b/ash/mus/move_event_handler.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "ash/wm/wm_toplevel_window_event_handler.h"
+#include "ash/common/wm/wm_toplevel_window_event_handler.h"
#include "base/macros.h"
#include "ui/aura/window_observer.h"
#include "ui/events/event_handler.h"
diff --git a/ash/mus/non_client_frame_controller.cc b/ash/mus/non_client_frame_controller.cc
index 06442090..12b1639f 100644
--- a/ash/mus/non_client_frame_controller.cc
+++ b/ash/mus/non_client_frame_controller.cc
@@ -12,8 +12,9 @@
#include "ash/common/ash_constants.h"
#include "ash/common/ash_layout_constants.h"
+#include "ash/common/frame/custom_frame_view_ash.h"
+#include "ash/common/wm/panels/panel_frame_view.h"
#include "ash/common/wm_window.h"
-#include "ash/frame/custom_frame_view_ash.h"
#include "ash/mus/frame/custom_frame_view_mus.h"
#include "ash/mus/frame/detached_title_area_renderer.h"
#include "ash/mus/move_event_handler.h"
@@ -21,7 +22,6 @@
#include "ash/mus/window_manager.h"
#include "ash/mus/window_properties.h"
#include "ash/shared/immersive_fullscreen_controller_delegate.h"
-#include "ash/wm/panels/panel_frame_view.h"
#include "ash/wm/window_properties.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
diff --git a/ash/mus/screen_mus.cc b/ash/mus/screen_mus.cc
index 4785d7d..e58cff9 100644
--- a/ash/mus/screen_mus.cc
+++ b/ash/mus/screen_mus.cc
@@ -4,8 +4,8 @@
#include "ash/mus/screen_mus.h"
+#include "ash/common/wm/root_window_finder.h"
#include "ash/common/wm_window.h"
-#include "ash/wm/root_window_finder.h"
#include "services/ui/public/interfaces/display/display_controller.mojom.h"
#include "ui/aura/client/screen_position_client.h"
#include "ui/aura/env.h"
diff --git a/ash/mus/shelf_delegate_mus.cc b/ash/mus/shelf_delegate_mus.cc
index 4b8ba01..3f0e6d8 100644
--- a/ash/mus/shelf_delegate_mus.cc
+++ b/ash/mus/shelf_delegate_mus.cc
@@ -4,8 +4,8 @@
#include "ash/mus/shelf_delegate_mus.h"
+#include "ash/common/shelf/shelf_controller.h"
#include "ash/common/wm_shell.h"
-#include "ash/shelf/shelf_controller.h"
#include "base/strings/string_util.h"
namespace ash {
diff --git a/ash/mus/shelf_delegate_mus.h b/ash/mus/shelf_delegate_mus.h
index 9ca5799..8f45b8da 100644
--- a/ash/mus/shelf_delegate_mus.h
+++ b/ash/mus/shelf_delegate_mus.h
@@ -7,8 +7,8 @@
#include <string>
+#include "ash/common/shelf/shelf_delegate.h"
#include "ash/public/cpp/shelf_types.h"
-#include "ash/shelf/shelf_delegate.h"
namespace ash {
diff --git a/ash/mus/test/ash_test_impl_mus.cc b/ash/mus/test/ash_test_impl_mus.cc
index 2aa95e1..71a44f4 100644
--- a/ash/mus/test/ash_test_impl_mus.cc
+++ b/ash/mus/test/ash_test_impl_mus.cc
@@ -4,8 +4,8 @@
#include "ash/mus/test/ash_test_impl_mus.h"
+#include "ash/common/test/ash_test.h"
#include "ash/common/wm_window.h"
-#include "ash/test/ash_test.h"
#include "base/memory/ptr_util.h"
#include "services/ui/public/cpp/property_type_converters.h"
#include "services/ui/public/interfaces/window_manager.mojom.h"
diff --git a/ash/mus/test/ash_test_impl_mus.h b/ash/mus/test/ash_test_impl_mus.h
index 5e900aa..e0ba272f 100644
--- a/ash/mus/test/ash_test_impl_mus.h
+++ b/ash/mus/test/ash_test_impl_mus.h
@@ -5,8 +5,8 @@
#ifndef ASH_MUS_TEST_ASH_TEST_IMPL_MUS_H_
#define ASH_MUS_TEST_ASH_TEST_IMPL_MUS_H_
+#include "ash/common/test/ash_test_impl.h"
#include "ash/mus/test/wm_test_base.h"
-#include "ash/test/ash_test_impl.h"
#include "base/macros.h"
namespace ash {
diff --git a/ash/mus/test/wm_test_helper.cc b/ash/mus/test/wm_test_helper.cc
index d079535..d3839cfe 100644
--- a/ash/mus/test/wm_test_helper.cc
+++ b/ash/mus/test/wm_test_helper.cc
@@ -4,13 +4,13 @@
#include "ash/mus/test/wm_test_helper.h"
+#include "ash/common/test/wm_shell_test_api.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/mus/screen_mus.h"
#include "ash/mus/window_manager.h"
#include "ash/mus/window_manager_application.h"
#include "ash/test/test_shell_delegate.h"
-#include "ash/test/wm_shell_test_api.h"
#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "base/strings/string_number_conversions.h"
diff --git a/ash/mus/top_level_window_factory.cc b/ash/mus/top_level_window_factory.cc
index cdcc9e2..602d0c3 100644
--- a/ash/mus/top_level_window_factory.cc
+++ b/ash/mus/top_level_window_factory.cc
@@ -4,6 +4,8 @@
#include "ash/mus/top_level_window_factory.h"
+#include "ash/common/wm/container_finder.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/mus/disconnected_app_handler.h"
@@ -14,8 +16,6 @@
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
#include "ash/root_window_settings.h"
-#include "ash/wm/container_finder.h"
-#include "ash/wm/window_state.h"
#include "mojo/public/cpp/bindings/type_converter.h"
#include "services/ui/public/cpp/property_type_converters.h"
#include "services/ui/public/interfaces/window_manager.mojom.h"
diff --git a/ash/mus/top_level_window_factory_unittest.cc b/ash/mus/top_level_window_factory_unittest.cc
index c4b03e1a..2fb98002 100644
--- a/ash/mus/top_level_window_factory_unittest.cc
+++ b/ash/mus/top_level_window_factory_unittest.cc
@@ -10,12 +10,12 @@
#include <string>
#include <vector>
+#include "ash/common/test/ash_test.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/mus/test/wm_test_base.h"
#include "ash/mus/window_manager.h"
#include "ash/mus/window_manager_application.h"
-#include "ash/test/ash_test.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/ash_test_helper.h"
#include "ui/aura/window.h"
diff --git a/ash/mus/window_manager.cc b/ash/mus/window_manager.cc
index 61338662..8818e3c 100644
--- a/ash/mus/window_manager.cc
+++ b/ash/mus/window_manager.cc
@@ -9,6 +9,8 @@
#include <utility>
#include "ash/common/session/session_controller.h"
+#include "ash/common/wm/container_finder.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_window.h"
#include "ash/mus/accelerators/accelerator_handler.h"
#include "ash/mus/accelerators/accelerator_ids.h"
@@ -28,8 +30,6 @@
#include "ash/shell.h"
#include "ash/shell_init_params.h"
#include "ash/wm/ash_focus_rules.h"
-#include "ash/wm/container_finder.h"
-#include "ash/wm/window_state.h"
#include "base/memory/ptr_util.h"
#include "base/threading/sequenced_worker_pool.h"
#include "services/service_manager/public/cpp/connector.h"
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index a4ffb45..5708746 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -15,9 +15,26 @@
#include "ash/common/focus_cycler.h"
#include "ash/common/login_status.h"
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/shelf/shelf_delegate.h"
+#include "ash/common/shelf/shelf_layout_manager.h"
+#include "ash/common/shelf/shelf_widget.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/shell_delegate.h"
#include "ash/common/wallpaper/wallpaper_delegate.h"
#include "ash/common/wallpaper/wallpaper_widget_controller.h"
+#include "ash/common/wm/always_on_top_controller.h"
+#include "ash/common/wm/container_finder.h"
+#include "ash/common/wm/dock/docked_window_layout_manager.h"
+#include "ash/common/wm/fullscreen_window_finder.h"
+#include "ash/common/wm/lock_layout_manager.h"
+#include "ash/common/wm/panels/panel_layout_manager.h"
+#include "ash/common/wm/root_window_layout_manager.h"
+#include "ash/common/wm/switchable_windows.h"
+#include "ash/common/wm/system_modal_container_layout_manager.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_screen_util.h"
+#include "ash/common/wm/workspace/workspace_layout_manager.h"
+#include "ash/common/wm/workspace_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/high_contrast/high_contrast_controller.h"
@@ -25,11 +42,7 @@
#include "ash/public/cpp/shelf_types.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_settings.h"
-#include "ash/shelf/shelf_delegate.h"
-#include "ash/shelf/shelf_layout_manager.h"
-#include "ash/shelf/shelf_widget.h"
#include "ash/shelf/shelf_window_targeter.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/system/status_area_layout_manager.h"
#include "ash/system/status_area_widget.h"
@@ -37,27 +50,14 @@
#include "ash/touch/touch_hud_debug.h"
#include "ash/touch/touch_hud_projection.h"
#include "ash/touch/touch_observer_hud.h"
-#include "ash/wm/always_on_top_controller.h"
#include "ash/wm/boot_splash_screen_chromeos.h"
-#include "ash/wm/container_finder.h"
-#include "ash/wm/dock/docked_window_layout_manager.h"
-#include "ash/wm/fullscreen_window_finder.h"
-#include "ash/wm/lock_layout_manager.h"
#include "ash/wm/panels/attached_panel_window_targeter.h"
-#include "ash/wm/panels/panel_layout_manager.h"
#include "ash/wm/panels/panel_window_event_handler.h"
-#include "ash/wm/root_window_layout_manager.h"
#include "ash/wm/stacking_controller.h"
-#include "ash/wm/switchable_windows.h"
-#include "ash/wm/system_modal_container_layout_manager.h"
#include "ash/wm/system_wallpaper_controller.h"
#include "ash/wm/window_properties.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
-#include "ash/wm/wm_screen_util.h"
-#include "ash/wm/workspace/workspace_layout_manager.h"
-#include "ash/wm/workspace_controller.h"
#include "base/command_line.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h
index 43357016..660b2cf 100644
--- a/ash/root_window_controller.h
+++ b/ash/root_window_controller.h
@@ -11,8 +11,8 @@
#include "ash/ash_export.h"
#include "ash/common/shell_observer.h"
+#include "ash/common/wm/workspace/workspace_types.h"
#include "ash/public/cpp/shelf_types.h"
-#include "ash/wm/workspace/workspace_types.h"
#include "base/macros.h"
#include "ui/aura/window.h"
#include "ui/aura/window_tree_host.h"
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc
index 3e4eb29e..c662a1f5 100644
--- a/ash/root_window_controller_unittest.cc
+++ b/ash/root_window_controller_unittest.cc
@@ -8,15 +8,15 @@
#include "ash/common/session/session_controller.h"
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/wm/system_modal_container_layout_manager.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/shell.h"
#include "ash/system/tray/system_tray_delegate.h"
#include "ash/test/ash_test_base.h"
-#include "ash/wm/system_modal_container_layout_manager.h"
#include "ash/wm/window_properties.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
#include "base/command_line.h"
diff --git a/ash/screen_util.cc b/ash/screen_util.cc
index d7c7c83..ea11d87 100644
--- a/ash/screen_util.cc
+++ b/ash/screen_util.cc
@@ -4,8 +4,8 @@
#include "ash/screen_util.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "base/logging.h"
#include "ui/aura/client/screen_position_client.h"
diff --git a/ash/screen_util_unittest.cc b/ash/screen_util_unittest.cc
index 9646cbaa..149c18b 100644
--- a/ash/screen_util_unittest.cc
+++ b/ash/screen_util_unittest.cc
@@ -4,12 +4,12 @@
#include "ash/screen_util.h"
+#include "ash/common/wm/wm_screen_util.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "ash/wm/window_util.h"
-#include "ash/wm/wm_screen_util.h"
#include "ui/aura/env.h"
#include "ui/aura/window.h"
#include "ui/aura/window_event_dispatcher.h"
diff --git a/ash/shelf/shelf_bezel_event_handler.cc b/ash/shelf/shelf_bezel_event_handler.cc
index fa2b5f97..da40409 100644
--- a/ash/shelf/shelf_bezel_event_handler.cc
+++ b/ash/shelf/shelf_bezel_event_handler.cc
@@ -4,7 +4,7 @@
#include "ash/shelf/shelf_bezel_event_handler.h"
-#include "ash/shelf/wm_shelf.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ui/aura/window.h"
#include "ui/display/display.h"
diff --git a/ash/shelf/shelf_layout_manager_unittest.cc b/ash/shelf/shelf_layout_manager_unittest.cc
index cb32ca3..ad2ee17b 100644
--- a/ash/shelf/shelf_layout_manager_unittest.cc
+++ b/ash/shelf/shelf_layout_manager_unittest.cc
@@ -2,21 +2,22 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/shelf/shelf_layout_manager.h"
+#include "ash/common/shelf/shelf_layout_manager.h"
-#include "ash/accelerators/accelerator_controller.h"
-#include "ash/accelerators/accelerator_table.h"
+#include "ash/common/accelerators/accelerator_controller.h"
+#include "ash/common/accelerators/accelerator_table.h"
#include "ash/common/focus_cycler.h"
#include "ash/common/session/session_controller.h"
+#include "ash/common/shelf/shelf_constants.h"
+#include "ash/common/shelf/shelf_layout_manager_observer.h"
+#include "ash/common/shelf/shelf_view.h"
+#include "ash/common/shelf/shelf_widget.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/shelf_constants.h"
-#include "ash/shelf/shelf_layout_manager_observer.h"
-#include "ash/shelf/shelf_view.h"
-#include "ash/shelf/shelf_widget.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/system/status_area_widget.h"
#include "ash/system/tray/system_tray.h"
@@ -25,7 +26,6 @@
#include "ash/test/test_app_list_view_presenter_impl.h"
#include "ash/test/test_system_tray_item.h"
#include "ash/wm/lock_state_controller.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
#include "base/command_line.h"
diff --git a/ash/shelf/shelf_unittest.cc b/ash/shelf/shelf_unittest.cc
index a483cd8..060018c6 100644
--- a/ash/shelf/shelf_unittest.cc
+++ b/ash/shelf/shelf_unittest.cc
@@ -4,14 +4,14 @@
#include <utility>
-#include "ash/shelf/shelf_button.h"
-#include "ash/shelf/shelf_model.h"
-#include "ash/shelf/shelf_view.h"
-#include "ash/shelf/shelf_widget.h"
-#include "ash/shelf/wm_shelf.h"
+#include "ash/common/shelf/shelf_button.h"
+#include "ash/common/shelf/shelf_model.h"
+#include "ash/common/shelf/shelf_view.h"
+#include "ash/common/shelf/shelf_widget.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/test/test_shelf_item_delegate.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/shelf_view_test_api.h"
-#include "ash/test/test_shelf_item_delegate.h"
namespace ash {
diff --git a/ash/shelf/shelf_view_unittest.cc b/ash/shelf/shelf_view_unittest.cc
index e2716f91..7903fa9 100644
--- a/ash/shelf/shelf_view_unittest.cc
+++ b/ash/shelf/shelf_view_unittest.cc
@@ -2,38 +2,38 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/shelf/shelf_view.h"
+#include "ash/common/shelf/shelf_view.h"
#include <algorithm>
#include <memory>
#include <utility>
#include <vector>
+#include "ash/common/shelf/app_list_button.h"
+#include "ash/common/shelf/overflow_bubble.h"
+#include "ash/common/shelf/overflow_bubble_view.h"
+#include "ash/common/shelf/overflow_button.h"
+#include "ash/common/shelf/shelf_button.h"
+#include "ash/common/shelf/shelf_constants.h"
+#include "ash/common/shelf/shelf_model.h"
+#include "ash/common/shelf/shelf_tooltip_manager.h"
+#include "ash/common/shelf/shelf_widget.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/shelf/wm_shelf_observer.h"
+#include "ash/common/test/test_shelf_delegate.h"
+#include "ash/common/test/test_shelf_item_delegate.h"
+#include "ash/common/test/test_system_tray_delegate.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/app_list_button.h"
-#include "ash/shelf/overflow_bubble.h"
-#include "ash/shelf/overflow_bubble_view.h"
-#include "ash/shelf/overflow_button.h"
-#include "ash/shelf/shelf_button.h"
-#include "ash/shelf/shelf_constants.h"
-#include "ash/shelf/shelf_model.h"
-#include "ash/shelf/shelf_tooltip_manager.h"
-#include "ash/shelf/shelf_widget.h"
-#include "ash/shelf/wm_shelf.h"
-#include "ash/shelf/wm_shelf_observer.h"
#include "ash/shell.h"
#include "ash/system/web_notification/web_notification_tray.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/ash_test_helper.h"
#include "ash/test/overflow_bubble_view_test_api.h"
#include "ash/test/shelf_view_test_api.h"
-#include "ash/test/test_shelf_delegate.h"
-#include "ash/test/test_shelf_item_delegate.h"
#include "ash/test/test_shell_delegate.h"
-#include "ash/test/test_system_tray_delegate.h"
#include "base/i18n/rtl.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
diff --git a/ash/shelf/shelf_widget_unittest.cc b/ash/shelf/shelf_widget_unittest.cc
index 4e4f4f8..8b9c474 100644
--- a/ash/shelf/shelf_widget_unittest.cc
+++ b/ash/shelf/shelf_widget_unittest.cc
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/shelf/shelf_widget.h"
+#include "ash/common/shelf/shelf_widget.h"
+#include "ash/common/shelf/shelf_constants.h"
+#include "ash/common/shelf/shelf_layout_manager.h"
+#include "ash/common/shelf/shelf_view.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/shelf_constants.h"
-#include "ash/shelf/shelf_layout_manager.h"
-#include "ash/shelf/shelf_view.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/system/status_area_widget.h"
#include "ash/test/ash_test_base.h"
diff --git a/ash/shelf/shelf_window_targeter.cc b/ash/shelf/shelf_window_targeter.cc
index d881be7..24ba0e8 100644
--- a/ash/shelf/shelf_window_targeter.cc
+++ b/ash/shelf/shelf_window_targeter.cc
@@ -4,10 +4,10 @@
#include "ash/shelf/shelf_window_targeter.h"
+#include "ash/common/shelf/shelf_constants.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shelf_types.h"
-#include "ash/shelf/shelf_constants.h"
-#include "ash/shelf/wm_shelf.h"
#include "ui/aura/window.h"
namespace ash {
diff --git a/ash/shelf/shelf_window_targeter.h b/ash/shelf/shelf_window_targeter.h
index d8c58673..fd14fe1 100644
--- a/ash/shelf/shelf_window_targeter.h
+++ b/ash/shelf/shelf_window_targeter.h
@@ -5,7 +5,7 @@
#ifndef ASH_SHELF_SHELF_WINDOW_TARGETER_H_
#define ASH_SHELF_SHELF_WINDOW_TARGETER_H_
-#include "ash/shelf/wm_shelf_observer.h"
+#include "ash/common/shelf/wm_shelf_observer.h"
#include "base/macros.h"
#include "ui/aura/window_observer.h"
#include "ui/wm/core/easy_resize_window_targeter.h"
diff --git a/ash/shell.cc b/ash/shell.cc
index 3a71803..6849886 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -8,7 +8,6 @@
#include <string>
#include <utility>
-#include "ash/accelerators/accelerator_controller.h"
#include "ash/accelerators/accelerator_controller_delegate_aura.h"
#include "ash/accelerators/accelerator_delegate.h"
#include "ash/accelerators/magnifier_key_scroller.h"
@@ -16,13 +15,28 @@
#include "ash/app_list/app_list_delegate_impl.h"
#include "ash/aura/wm_shell_aura.h"
#include "ash/autoclick/autoclick_controller.h"
+#include "ash/common/accelerators/accelerator_controller.h"
#include "ash/common/ash_constants.h"
+#include "ash/common/frame/custom_frame_view_ash.h"
#include "ash/common/gpu_support.h"
#include "ash/common/keyboard/keyboard_ui.h"
#include "ash/common/login_status.h"
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/shelf/app_list_shelf_item_delegate.h"
+#include "ash/common/shelf/shelf_delegate.h"
+#include "ash/common/shelf/shelf_item_delegate.h"
+#include "ash/common/shelf/shelf_model.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/shell_delegate.h"
#include "ash/common/wallpaper/wallpaper_delegate.h"
+#include "ash/common/wm/container_finder.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_window_manager.h"
+#include "ash/common/wm/mru_window_tracker.h"
+#include "ash/common/wm/root_window_finder.h"
+#include "ash/common/wm/system_modal_container_layout_manager.h"
+#include "ash/common/wm/window_positioner.h"
+#include "ash/common/wm/workspace_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/display/cursor_window_controller.h"
@@ -40,7 +54,6 @@
#include "ash/display/window_tree_host_manager.h"
#include "ash/drag_drop/drag_drop_controller.h"
#include "ash/first_run/first_run_helper_impl.h"
-#include "ash/frame/custom_frame_view_ash.h"
#include "ash/high_contrast/high_contrast_controller.h"
#include "ash/ime/input_method_event_handler.h"
#include "ash/laser/laser_pointer_controller.h"
@@ -48,11 +61,6 @@
#include "ash/magnifier/partial_magnification_controller.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/app_list_shelf_item_delegate.h"
-#include "ash/shelf/shelf_delegate.h"
-#include "ash/shelf/shelf_item_delegate.h"
-#include "ash/shelf/shelf_model.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell_init_params.h"
#include "ash/sticky_keys/sticky_keys_controller.h"
#include "ash/system/bluetooth/bluetooth_notification_controller.h"
@@ -68,29 +76,21 @@
#include "ash/virtual_keyboard_controller.h"
#include "ash/wm/ash_focus_rules.h"
#include "ash/wm/ash_native_cursor_manager.h"
-#include "ash/wm/container_finder.h"
#include "ash/wm/event_client_impl.h"
#include "ash/wm/immersive_handler_factory_ash.h"
#include "ash/wm/lock_state_controller.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
-#include "ash/wm/maximize_mode/maximize_mode_window_manager.h"
-#include "ash/wm/mru_window_tracker.h"
#include "ash/wm/overlay_event_filter.h"
#include "ash/wm/overview/scoped_overview_animation_settings_factory_aura.h"
#include "ash/wm/power_button_controller.h"
#include "ash/wm/resize_shadow_controller.h"
-#include "ash/wm/root_window_finder.h"
#include "ash/wm/screen_pinning_controller.h"
#include "ash/wm/system_gesture_event_filter.h"
#include "ash/wm/system_modal_container_event_filter.h"
-#include "ash/wm/system_modal_container_layout_manager.h"
#include "ash/wm/toplevel_window_event_handler.h"
#include "ash/wm/video_detector.h"
#include "ash/wm/window_animations.h"
-#include "ash/wm/window_positioner.h"
#include "ash/wm/window_properties.h"
#include "ash/wm/window_util.h"
-#include "ash/wm/workspace_controller.h"
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/command_line.h"
diff --git a/ash/shell/context_menu.cc b/ash/shell/context_menu.cc
index 8282dac..5624b18 100644
--- a/ash/shell/context_menu.cc
+++ b/ash/shell/context_menu.cc
@@ -4,8 +4,8 @@
#include "ash/shell/context_menu.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/public/cpp/shelf_types.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/strings/grit/ash_strings.h"
namespace ash {
diff --git a/ash/shell/context_menu.h b/ash/shell/context_menu.h
index 6c25698c..3db053c 100644
--- a/ash/shell/context_menu.h
+++ b/ash/shell/context_menu.h
@@ -5,7 +5,7 @@
#ifndef ASH_SHELL_CONTEXT_MENU_H_
#define ASH_SHELL_CONTEXT_MENU_H_
-#include "ash/shelf/shelf_alignment_menu.h"
+#include "ash/common/shelf/shelf_alignment_menu.h"
#include "base/macros.h"
#include "ui/base/models/simple_menu_model.h"
diff --git a/ash/shell/panel_window.cc b/ash/shell/panel_window.cc
index 1dfedf9aa..5566a024 100644
--- a/ash/shell/panel_window.cc
+++ b/ash/shell/panel_window.cc
@@ -4,9 +4,9 @@
#include "ash/shell/panel_window.h"
+#include "ash/common/wm/panels/panel_frame_view.h"
#include "ash/public/cpp/window_properties.h"
#include "ash/shell.h"
-#include "ash/wm/panels/panel_frame_view.h"
#include "base/strings/utf_string_conversions.h"
#include "ui/aura/window.h"
#include "ui/gfx/canvas.h"
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc
index 0f47f6a..45cac81 100644
--- a/ash/shell/shell_delegate_impl.cc
+++ b/ash/shell/shell_delegate_impl.cc
@@ -9,6 +9,8 @@
#include "ash/common/gpu_support_stub.h"
#include "ash/common/palette_delegate.h"
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/test/test_shelf_delegate.h"
+#include "ash/common/wm/window_state.h"
#include "ash/default_wallpaper_delegate.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/shell.h"
@@ -17,8 +19,6 @@
#include "ash/shell/toplevel_window.h"
#include "ash/system/tray/default_system_tray_delegate.h"
#include "ash/test/test_keyboard_ui.h"
-#include "ash/test/test_shelf_delegate.h"
-#include "ash/wm/window_state.h"
#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/ash/shell/toplevel_window.cc b/ash/shell/toplevel_window.cc
index b659f489..75faae1 100644
--- a/ash/shell/toplevel_window.cc
+++ b/ash/shell/toplevel_window.cc
@@ -4,9 +4,9 @@
#include "ash/shell/toplevel_window.h"
+#include "ash/common/wm/window_positioner.h"
+#include "ash/common/wm/window_state.h"
#include "ash/shell.h"
-#include "ash/wm/window_positioner.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "base/strings/utf_string_conversions.h"
#include "ui/aura/window.h"
diff --git a/ash/shell/window_watcher.cc b/ash/shell/window_watcher.cc
index a789dd6..23cf1d3 100644
--- a/ash/shell/window_watcher.cc
+++ b/ash/shell/window_watcher.cc
@@ -6,12 +6,12 @@
#include <utility>
+#include "ash/common/shelf/shelf_model.h"
+#include "ash/common/shelf/shelf_widget.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/display/window_tree_host_manager.h"
#include "ash/public/cpp/shell_window_ids.h"
-#include "ash/shelf/shelf_model.h"
-#include "ash/shelf/shelf_widget.h"
#include "ash/shell.h"
#include "ash/shell/window_watcher_shelf_item_delegate.h"
#include "ash/wm/window_properties.h"
diff --git a/ash/shell/window_watcher.h b/ash/shell/window_watcher.h
index accd0ef..757ea91 100644
--- a/ash/shell/window_watcher.h
+++ b/ash/shell/window_watcher.h
@@ -10,7 +10,7 @@
#include <map>
#include <memory>
-#include "ash/shelf/shelf_item_types.h"
+#include "ash/common/shelf/shelf_item_types.h"
#include "base/compiler_specific.h"
#include "base/logging.h"
#include "base/macros.h"
diff --git a/ash/shell/window_watcher_shelf_item_delegate.h b/ash/shell/window_watcher_shelf_item_delegate.h
index 57f7aa10..73bb422 100644
--- a/ash/shell/window_watcher_shelf_item_delegate.h
+++ b/ash/shell/window_watcher_shelf_item_delegate.h
@@ -5,8 +5,8 @@
#ifndef ASH_SHELL_WINDOW_WATCHER_SHELF_ITEM_DELEGATE_H_
#define ASH_SHELL_WINDOW_WATCHER_SHELF_ITEM_DELEGATE_H_
-#include "ash/shelf/shelf_item_delegate.h"
-#include "ash/shelf/shelf_item_types.h"
+#include "ash/common/shelf/shelf_item_delegate.h"
+#include "ash/common/shelf/shelf_item_types.h"
#include "base/compiler_specific.h"
#include "base/macros.h"
diff --git a/ash/shell_unittest.cc b/ash/shell_unittest.cc
index 69877481..881b972 100644
--- a/ash/shell_unittest.cc
+++ b/ash/shell_unittest.cc
@@ -8,6 +8,9 @@
#include <vector>
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/shelf/shelf_layout_manager.h"
+#include "ash/common/shelf/shelf_widget.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wallpaper/wallpaper_widget_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
@@ -15,9 +18,6 @@
#include "ash/drag_drop/drag_drop_controller.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/shelf_layout_manager.h"
-#include "ash/shelf/shelf_widget.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/shell_test_api.h"
#include "ash/wm/window_util.h"
diff --git a/ash/system/audio/tray_audio_unittest.cc b/ash/system/audio/tray_audio_unittest.cc
index 16d7e89..094513c 100644
--- a/ash/system/audio/tray_audio_unittest.cc
+++ b/ash/system/audio/tray_audio_unittest.cc
@@ -4,8 +4,8 @@
#include "ash/system/audio/tray_audio.h"
+#include "ash/common/test/ash_test.h"
#include "ash/system/tray/system_tray.h"
-#include "ash/test/ash_test.h"
namespace ash {
diff --git a/ash/system/audio/volume_view.cc b/ash/system/audio/volume_view.cc
index dd755925..dd5edb4 100644
--- a/ash/system/audio/volume_view.cc
+++ b/ash/system/audio/volume_view.cc
@@ -6,8 +6,8 @@
#include <algorithm>
+#include "ash/common/metrics/user_metrics_action.h"
#include "ash/common/wm_shell.h"
-#include "ash/metrics/user_metrics_action.h"
#include "ash/resources/vector_icons/vector_icons.h"
#include "ash/strings/grit/ash_strings.h"
#include "ash/system/audio/tray_audio_delegate.h"
diff --git a/ash/system/brightness/tray_brightness.cc b/ash/system/brightness/tray_brightness.cc
index 79ae2c4e..fb3db68 100644
--- a/ash/system/brightness/tray_brightness.cc
+++ b/ash/system/brightness/tray_brightness.cc
@@ -8,6 +8,7 @@
#include "ash/common/material_design/material_design_controller.h"
#include "ash/common/shell_observer.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/resources/grit/ash_resources.h"
#include "ash/resources/vector_icons/vector_icons.h"
@@ -16,7 +17,6 @@
#include "ash/system/tray/tray_constants.h"
#include "ash/system/tray/tray_popup_utils.h"
#include "ash/system/tray/tri_view.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
#include "base/bind.h"
#include "base/strings/utf_string_conversions.h"
#include "base/threading/thread_task_runner_handle.h"
diff --git a/ash/system/brightness/tray_brightness_unittest.cc b/ash/system/brightness/tray_brightness_unittest.cc
index 31e470f..62e5a10 100644
--- a/ash/system/brightness/tray_brightness_unittest.cc
+++ b/ash/system/brightness/tray_brightness_unittest.cc
@@ -7,11 +7,11 @@
#include <memory>
#include "ash/common/material_design/material_design_controller.h"
+#include "ash/common/test/ash_test.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/system/tray/system_tray_delegate.h"
#include "ash/system/tray/system_tray_item.h"
-#include "ash/test/ash_test.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
#include "ui/views/view.h"
namespace ash {
diff --git a/ash/system/cast/tray_cast.cc b/ash/system/cast/tray_cast.cc
index 9765818..45e54f4 100644
--- a/ash/system/cast/tray_cast.cc
+++ b/ash/system/cast/tray_cast.cc
@@ -12,12 +12,12 @@
#include "ash/common/cast_config_controller.h"
#include "ash/common/material_design/material_design_controller.h"
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/shelf/wm_shelf_util.h"
#include "ash/common/wm_shell.h"
#include "ash/public/cpp/shelf_types.h"
#include "ash/public/interfaces/cast_config.mojom.h"
#include "ash/resources/grit/ash_resources.h"
#include "ash/resources/vector_icons/vector_icons.h"
-#include "ash/shelf/wm_shelf_util.h"
#include "ash/strings/grit/ash_strings.h"
#include "ash/system/screen_security/screen_tray_item.h"
#include "ash/system/tray/fixed_sized_image_view.h"
diff --git a/ash/system/date/date_default_view.cc b/ash/system/date/date_default_view.cc
index 023ebba..94a0dbe1 100644
--- a/ash/system/date/date_default_view.cc
+++ b/ash/system/date/date_default_view.cc
@@ -4,10 +4,10 @@
#include "ash/system/date/date_default_view.h"
+#include "ash/common/metrics/user_metrics_action.h"
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/shutdown_controller.h"
#include "ash/common/wm_shell.h"
-#include "ash/metrics/user_metrics_action.h"
#include "ash/resources/grit/ash_resources.h"
#include "ash/shell.h"
#include "ash/strings/grit/ash_strings.h"
diff --git a/ash/system/date/date_view_unittest.cc b/ash/system/date/date_view_unittest.cc
index 7d5d510e..d84d2dc 100644
--- a/ash/system/date/date_view_unittest.cc
+++ b/ash/system/date/date_view_unittest.cc
@@ -4,7 +4,7 @@
#include "ash/system/date/date_view.h"
-#include "ash/test/ash_test.h"
+#include "ash/common/test/ash_test.h"
#include "ui/views/controls/label.h"
namespace ash {
diff --git a/ash/system/date/tray_date.cc b/ash/system/date/tray_date.cc
index 28847c1..f98fb3a 100644
--- a/ash/system/date/tray_date.cc
+++ b/ash/system/date/tray_date.cc
@@ -4,8 +4,8 @@
#include "ash/system/date/tray_date.h"
+#include "ash/common/shelf/wm_shelf_util.h"
#include "ash/common/wm_shell.h"
-#include "ash/shelf/wm_shelf_util.h"
#include "ash/system/date/date_default_view.h"
#include "ash/system/date/date_view.h"
#include "ash/system/system_clock_observer.h"
diff --git a/ash/system/date/tray_system_info.cc b/ash/system/date/tray_system_info.cc
index 4b04912..eb2d701 100644
--- a/ash/system/date/tray_system_info.cc
+++ b/ash/system/date/tray_system_info.cc
@@ -4,8 +4,8 @@
#include "ash/system/date/tray_system_info.h"
+#include "ash/common/shelf/wm_shelf_util.h"
#include "ash/common/wm_shell.h"
-#include "ash/shelf/wm_shelf_util.h"
#include "ash/system/date/date_view.h"
#include "ash/system/date/system_info_default_view.h"
#include "ash/system/system_clock_observer.h"
diff --git a/ash/system/ime_menu/ime_menu_tray.cc b/ash/system/ime_menu/ime_menu_tray.cc
index 700207fd..543af4f1 100644
--- a/ash/system/ime_menu/ime_menu_tray.cc
+++ b/ash/system/ime_menu/ime_menu_tray.cc
@@ -8,13 +8,13 @@
#include "ash/common/ash_constants.h"
#include "ash/common/material_design/material_design_controller.h"
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/shelf/wm_shelf_util.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/resources/grit/ash_resources.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/wm_shelf.h"
-#include "ash/shelf/wm_shelf_util.h"
#include "ash/strings/grit/ash_strings.h"
#include "ash/system/ime_menu/ime_list_view.h"
#include "ash/system/tray/hover_highlight_view.h"
diff --git a/ash/system/ime_menu/ime_menu_tray_unittest.cc b/ash/system/ime_menu/ime_menu_tray_unittest.cc
index d001a85..d284a23 100644
--- a/ash/system/ime_menu/ime_menu_tray_unittest.cc
+++ b/ash/system/ime_menu/ime_menu_tray_unittest.cc
@@ -4,8 +4,9 @@
#include "ash/system/ime_menu/ime_menu_tray.h"
-#include "ash/accelerators/accelerator_controller.h"
+#include "ash/common/accelerators/accelerator_controller.h"
#include "ash/common/accessibility_delegate.h"
+#include "ash/common/test/test_system_tray_delegate.h"
#include "ash/common/wm_shell.h"
#include "ash/system/ime_menu/ime_list_view.h"
#include "ash/system/status_area_widget.h"
@@ -13,7 +14,6 @@
#include "ash/system/tray/system_tray_notifier.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/status_area_widget_test_helper.h"
-#include "ash/test/test_system_tray_delegate.h"
#include "base/strings/utf_string_conversions.h"
#include "ui/accessibility/ax_node_data.h"
#include "ui/base/ime/chromeos/input_method_manager.h"
diff --git a/ash/system/media_security/multi_profile_media_tray_item_unittest.cc b/ash/system/media_security/multi_profile_media_tray_item_unittest.cc
index e6417cb..a90d708 100644
--- a/ash/system/media_security/multi_profile_media_tray_item_unittest.cc
+++ b/ash/system/media_security/multi_profile_media_tray_item_unittest.cc
@@ -6,6 +6,7 @@
#include "ash/common/ash_view_ids.h"
#include "ash/common/media_controller.h"
+#include "ash/common/test/test_session_state_delegate.h"
#include "ash/common/wm_shell.h"
#include "ash/public/interfaces/media.mojom.h"
#include "ash/system/status_area_widget.h"
@@ -15,7 +16,6 @@
#include "ash/test/ash_test_base.h"
#include "ash/test/ash_test_helper.h"
#include "ash/test/status_area_widget_test_helper.h"
-#include "ash/test/test_session_state_delegate.h"
#include "ash/test/test_shell_delegate.h"
#include "ui/views/bubble/tray_bubble_view.h"
diff --git a/ash/system/network/sms_observer_unittest.cc b/ash/system/network/sms_observer_unittest.cc
index a22172d..aa4e999 100644
--- a/ash/system/network/sms_observer_unittest.cc
+++ b/ash/system/network/sms_observer_unittest.cc
@@ -4,9 +4,9 @@
#include "ash/system/network/sms_observer.h"
+#include "ash/common/shelf/shelf_widget.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/public/interfaces/vpn_list.mojom.h"
-#include "ash/shelf/shelf_widget.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "base/macros.h"
diff --git a/ash/system/network/tray_network.cc b/ash/system/network/tray_network.cc
index e04d0590..7b0fcc8 100644
--- a/ash/system/network/tray_network.cc
+++ b/ash/system/network/tray_network.cc
@@ -4,9 +4,9 @@
#include "ash/system/network/tray_network.h"
+#include "ash/common/shelf/wm_shelf_util.h"
#include "ash/common/wm_shell.h"
#include "ash/resources/grit/ash_resources.h"
-#include "ash/shelf/wm_shelf_util.h"
#include "ash/strings/grit/ash_strings.h"
#include "ash/system/network/network_icon.h"
#include "ash/system/network/network_icon_animation.h"
diff --git a/ash/system/overview/overview_button_tray.cc b/ash/system/overview/overview_button_tray.cc
index 91ef413..3e5f796 100644
--- a/ash/system/overview/overview_button_tray.cc
+++ b/ash/system/overview/overview_button_tray.cc
@@ -5,14 +5,14 @@
#include "ash/system/overview/overview_button_tray.h"
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/shelf/shelf_constants.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
+#include "ash/common/wm/overview/window_selector_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/resources/vector_icons/vector_icons.h"
-#include "ash/shelf/shelf_constants.h"
#include "ash/strings/grit/ash_strings.h"
#include "ash/system/tray/system_tray_delegate.h"
#include "ash/system/tray/tray_constants.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
-#include "ash/wm/overview/window_selector_controller.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/gfx/paint_vector_icon.h"
#include "ui/views/border.h"
diff --git a/ash/system/overview/overview_button_tray_unittest.cc b/ash/system/overview/overview_button_tray_unittest.cc
index 4783129..346a6aa 100644
--- a/ash/system/overview/overview_button_tray_unittest.cc
+++ b/ash/system/overview/overview_button_tray_unittest.cc
@@ -5,6 +5,9 @@
#include "ash/system/overview/overview_button_tray.h"
#include "ash/common/login_status.h"
+#include "ash/common/test/test_session_state_delegate.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
+#include "ash/common/wm/overview/window_selector_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/public/cpp/shelf_types.h"
#include "ash/root_window_controller.h"
@@ -13,9 +16,6 @@
#include "ash/test/ash_test_base.h"
#include "ash/test/ash_test_helper.h"
#include "ash/test/status_area_widget_test_helper.h"
-#include "ash/test/test_session_state_delegate.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
-#include "ash/wm/overview/window_selector_controller.h"
#include "base/command_line.h"
#include "base/test/user_action_tester.h"
#include "base/time/time.h"
diff --git a/ash/system/palette/common_palette_tool.cc b/ash/system/palette/common_palette_tool.cc
index 6495006..d9e5634 100644
--- a/ash/system/palette/common_palette_tool.cc
+++ b/ash/system/palette/common_palette_tool.cc
@@ -4,8 +4,8 @@
#include "ash/system/palette/common_palette_tool.h"
+#include "ash/common/shelf/shelf_constants.h"
#include "ash/resources/grit/ash_resources.h"
-#include "ash/shelf/shelf_constants.h"
#include "ash/system/palette/palette_ids.h"
#include "ash/system/palette/palette_tool_manager.h"
#include "ash/system/tray/hover_highlight_view.h"
diff --git a/ash/system/palette/palette_tray.cc b/ash/system/palette/palette_tray.cc
index 2d176f6..d78fa6e 100644
--- a/ash/system/palette/palette_tray.cc
+++ b/ash/system/palette/palette_tray.cc
@@ -6,15 +6,15 @@
#include "ash/common/material_design/material_design_controller.h"
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/shelf/shelf_constants.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/shelf/wm_shelf_util.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/resources/grit/ash_resources.h"
#include "ash/resources/vector_icons/vector_icons.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/shelf_constants.h"
-#include "ash/shelf/wm_shelf.h"
-#include "ash/shelf/wm_shelf_util.h"
#include "ash/strings/grit/ash_strings.h"
#include "ash/system/palette/palette_tool_manager.h"
#include "ash/system/palette/palette_utils.h"
diff --git a/ash/system/palette/palette_utils.cc b/ash/system/palette/palette_utils.cc
index 20320fa1..b24658e 100644
--- a/ash/system/palette/palette_utils.cc
+++ b/ash/system/palette/palette_utils.cc
@@ -5,9 +5,9 @@
#include "ash/system/palette/palette_utils.h"
#include "ash/common/ash_switches.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/system/palette/palette_tray.h"
#include "ash/system/status_area_widget.h"
#include "base/command_line.h"
diff --git a/ash/system/palette/tools/capture_region_mode.cc b/ash/system/palette/tools/capture_region_mode.cc
index d0b6ac3..3e0463c 100644
--- a/ash/system/palette/tools/capture_region_mode.cc
+++ b/ash/system/palette/tools/capture_region_mode.cc
@@ -4,7 +4,7 @@
#include "ash/system/palette/tools/capture_region_mode.h"
-#include "ash/accelerators/accelerator_controller.h"
+#include "ash/common/accelerators/accelerator_controller.h"
#include "ash/common/palette_delegate.h"
#include "ash/common/wm_shell.h"
#include "ash/resources/vector_icons/vector_icons.h"
diff --git a/ash/system/palette/tools/create_note_unittest.cc b/ash/system/palette/tools/create_note_unittest.cc
index a3f04dd..f44930c1 100644
--- a/ash/system/palette/tools/create_note_unittest.cc
+++ b/ash/system/palette/tools/create_note_unittest.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "ash/common/test/test_palette_delegate.h"
#include "ash/common/wm_shell.h"
#include "ash/system/palette/mock_palette_tool_delegate.h"
#include "ash/system/palette/palette_ids.h"
#include "ash/system/palette/palette_tool.h"
#include "ash/system/palette/tools/create_note_action.h"
#include "ash/test/ash_test_base.h"
-#include "ash/test/test_palette_delegate.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "ui/views/view.h"
diff --git a/ash/system/palette/tools/screenshot_unittest.cc b/ash/system/palette/tools/screenshot_unittest.cc
index 1b30fe2..8283313 100644
--- a/ash/system/palette/tools/screenshot_unittest.cc
+++ b/ash/system/palette/tools/screenshot_unittest.cc
@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "ash/common/test/test_palette_delegate.h"
#include "ash/common/wm_shell.h"
#include "ash/system/palette/mock_palette_tool_delegate.h"
#include "ash/system/palette/palette_ids.h"
@@ -9,7 +10,6 @@
#include "ash/system/palette/tools/capture_region_mode.h"
#include "ash/system/palette/tools/capture_screen_action.h"
#include "ash/test/ash_test_base.h"
-#include "ash/test/test_palette_delegate.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
diff --git a/ash/system/power/power_event_observer_unittest.cc b/ash/system/power/power_event_observer_unittest.cc
index d6325bb..2e0e54c 100644
--- a/ash/system/power/power_event_observer_unittest.cc
+++ b/ash/system/power/power_event_observer_unittest.cc
@@ -6,9 +6,9 @@
#include <memory>
+#include "ash/common/test/test_session_state_delegate.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
-#include "ash/test/test_session_state_delegate.h"
#include "base/time/time.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/power_manager_client.h"
diff --git a/ash/system/power/tablet_power_button_controller.cc b/ash/system/power/tablet_power_button_controller.cc
index 3a06df60..c1d76e139 100644
--- a/ash/system/power/tablet_power_button_controller.cc
+++ b/ash/system/power/tablet_power_button_controller.cc
@@ -7,10 +7,10 @@
#include "ash/common/accessibility_delegate.h"
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/shell_delegate.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/shell.h"
#include "ash/wm/lock_state_controller.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
#include "base/time/default_tick_clock.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "ui/events/devices/input_device_manager.h"
diff --git a/ash/system/power/tablet_power_button_controller_unittest.cc b/ash/system/power/tablet_power_button_controller_unittest.cc
index e9a1373..abd0a50 100644
--- a/ash/system/power/tablet_power_button_controller_unittest.cc
+++ b/ash/system/power/tablet_power_button_controller_unittest.cc
@@ -8,13 +8,13 @@
#include "ash/common/ash_switches.h"
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/lock_state_controller_test_api.h"
#include "ash/test/test_shell_delegate.h"
#include "ash/wm/lock_state_controller.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/wm/power_button_controller.h"
#include "base/command_line.h"
#include "base/compiler_specific.h"
diff --git a/ash/system/rotation/tray_rotation_lock.cc b/ash/system/rotation/tray_rotation_lock.cc
index 502b5b4..de0d449 100644
--- a/ash/system/rotation/tray_rotation_lock.cc
+++ b/ash/system/rotation/tray_rotation_lock.cc
@@ -4,6 +4,7 @@
#include "ash/system/rotation/tray_rotation_lock.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/display/screen_orientation_controller_chromeos.h"
#include "ash/resources/vector_icons/vector_icons.h"
@@ -15,7 +16,6 @@
#include "ash/system/tray/tray_popup_item_style.h"
#include "ash/system/tray/tray_popup_utils.h"
#include "ash/system/tray/tri_view.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
#include "ui/accessibility/ax_node_data.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/display/display.h"
diff --git a/ash/system/rotation/tray_rotation_lock_unittest.cc b/ash/system/rotation/tray_rotation_lock_unittest.cc
index 82e15aa..b12cfa0 100644
--- a/ash/system/rotation/tray_rotation_lock_unittest.cc
+++ b/ash/system/rotation/tray_rotation_lock_unittest.cc
@@ -6,6 +6,7 @@
#include <memory>
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/display/screen_orientation_controller_chromeos.h"
#include "ash/root_window_controller.h"
@@ -15,7 +16,6 @@
#include "ash/system/tray/system_tray_delegate.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/status_area_widget_test_helper.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
#include "base/command_line.h"
#include "base/time/time.h"
#include "ui/display/display_switches.h"
diff --git a/ash/system/screen_layout_observer.cc b/ash/system/screen_layout_observer.cc
index 672a990..cd1fc707 100644
--- a/ash/system/screen_layout_observer.cc
+++ b/ash/system/screen_layout_observer.cc
@@ -8,9 +8,9 @@
#include <utility>
#include <vector>
+#include "ash/common/metrics/user_metrics_action.h"
#include "ash/common/wm_shell.h"
#include "ash/display/screen_orientation_controller_chromeos.h"
-#include "ash/metrics/user_metrics_action.h"
#include "ash/resources/grit/ash_resources.h"
#include "ash/shell.h"
#include "ash/strings/grit/ash_strings.h"
diff --git a/ash/system/screen_layout_observer_unittest.cc b/ash/system/screen_layout_observer_unittest.cc
index a3c98f7..726b692 100644
--- a/ash/system/screen_layout_observer_unittest.cc
+++ b/ash/system/screen_layout_observer_unittest.cc
@@ -4,12 +4,12 @@
#include "ash/system/screen_layout_observer.h"
+#include "ash/common/test/test_system_tray_delegate.h"
#include "ash/shell.h"
#include "ash/strings/grit/ash_strings.h"
#include "ash/system/devicetype_utils.h"
#include "ash/system/tray/system_tray.h"
#include "ash/test/ash_test_base.h"
-#include "ash/test/test_system_tray_delegate.h"
#include "base/strings/string16.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/ash/system/screen_security/screen_capture_tray_item.cc b/ash/system/screen_security/screen_capture_tray_item.cc
index 8628676..e6c4fe7 100644
--- a/ash/system/screen_security/screen_capture_tray_item.cc
+++ b/ash/system/screen_security/screen_capture_tray_item.cc
@@ -6,8 +6,8 @@
#include <utility>
+#include "ash/common/metrics/user_metrics_action.h"
#include "ash/common/wm_shell.h"
-#include "ash/metrics/user_metrics_action.h"
#include "ash/resources/grit/ash_resources.h"
#include "ash/strings/grit/ash_strings.h"
#include "ash/system/system_notifier.h"
diff --git a/ash/system/screen_security/screen_tray_item.cc b/ash/system/screen_security/screen_tray_item.cc
index 9fe53499..f0f8d4f 100644
--- a/ash/system/screen_security/screen_tray_item.cc
+++ b/ash/system/screen_security/screen_tray_item.cc
@@ -5,9 +5,9 @@
#include "ash/system/screen_security/screen_tray_item.h"
#include "ash/common/material_design/material_design_controller.h"
+#include "ash/common/shelf/wm_shelf_util.h"
#include "ash/resources/grit/ash_resources.h"
#include "ash/resources/vector_icons/vector_icons.h"
-#include "ash/shelf/wm_shelf_util.h"
#include "ash/system/tray/fixed_sized_image_view.h"
#include "ash/system/tray/tray_constants.h"
#include "ash/system/tray/tray_popup_item_style.h"
diff --git a/ash/system/screen_security/screen_tray_item_unittest.cc b/ash/system/screen_security/screen_tray_item_unittest.cc
index 4aa4ff1..d68c039 100644
--- a/ash/system/screen_security/screen_tray_item_unittest.cc
+++ b/ash/system/screen_security/screen_tray_item_unittest.cc
@@ -4,12 +4,12 @@
#include "ash/system/screen_security/screen_tray_item.h"
+#include "ash/common/test/ash_test.h"
#include "ash/common/wm_shell.h"
#include "ash/system/screen_security/screen_capture_tray_item.h"
#include "ash/system/screen_security/screen_share_tray_item.h"
#include "ash/system/tray/system_tray_notifier.h"
#include "ash/system/tray/tray_item_view.h"
-#include "ash/test/ash_test.h"
#include "base/callback.h"
#include "base/memory/ptr_util.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/ash/system/session/logout_button_tray.cc b/ash/system/session/logout_button_tray.cc
index ee69fc4..63fa7b8 100644
--- a/ash/system/session/logout_button_tray.cc
+++ b/ash/system/session/logout_button_tray.cc
@@ -7,11 +7,11 @@
#include <memory>
#include <utility>
+#include "ash/common/shelf/wm_shelf_util.h"
#include "ash/common/wm_shell.h"
#include "ash/public/cpp/shelf_types.h"
#include "ash/resources/grit/ash_resources.h"
#include "ash/resources/vector_icons/vector_icons.h"
-#include "ash/shelf/wm_shelf_util.h"
#include "ash/system/session/logout_confirmation_controller.h"
#include "ash/system/tray/system_tray_controller.h"
#include "ash/system/tray/system_tray_notifier.h"
diff --git a/ash/system/session/tray_session_length_limit_unittest.cc b/ash/system/session/tray_session_length_limit_unittest.cc
index 19df0cc..837ae20 100644
--- a/ash/system/session/tray_session_length_limit_unittest.cc
+++ b/ash/system/session/tray_session_length_limit_unittest.cc
@@ -4,9 +4,9 @@
#include "ash/system/session/tray_session_length_limit.h"
+#include "ash/common/test/test_system_tray_delegate.h"
#include "ash/system/tray/system_tray.h"
#include "ash/test/ash_test_base.h"
-#include "ash/test/test_system_tray_delegate.h"
#include "base/memory/ptr_util.h"
#include "base/time/time.h"
#include "ui/message_center/message_center.h"
diff --git a/ash/system/status_area_layout_manager.cc b/ash/system/status_area_layout_manager.cc
index ec65ee2..ac9a6ea4 100644
--- a/ash/system/status_area_layout_manager.cc
+++ b/ash/system/status_area_layout_manager.cc
@@ -4,9 +4,9 @@
#include "ash/system/status_area_layout_manager.h"
+#include "ash/common/shelf/shelf_layout_manager.h"
+#include "ash/common/shelf/shelf_widget.h"
#include "ash/common/wm_window.h"
-#include "ash/shelf/shelf_layout_manager.h"
-#include "ash/shelf/shelf_widget.h"
#include "ash/system/status_area_widget.h"
#include "base/auto_reset.h"
diff --git a/ash/system/status_area_layout_manager.h b/ash/system/status_area_layout_manager.h
index 2d1fecb..fb204b2 100644
--- a/ash/system/status_area_layout_manager.h
+++ b/ash/system/status_area_layout_manager.h
@@ -5,7 +5,7 @@
#ifndef ASH_SYSTEM_STATUS_AREA_LAYOUT_MANAGER_H_
#define ASH_SYSTEM_STATUS_AREA_LAYOUT_MANAGER_H_
-#include "ash/wm/wm_snap_to_pixel_layout_manager.h"
+#include "ash/common/wm/wm_snap_to_pixel_layout_manager.h"
#include "base/macros.h"
namespace ash {
diff --git a/ash/system/status_area_widget.cc b/ash/system/status_area_widget.cc
index dd27eae..f9a87e44 100644
--- a/ash/system/status_area_widget.cc
+++ b/ash/system/status_area_widget.cc
@@ -5,11 +5,11 @@
#include "ash/system/status_area_widget.h"
#include "ash/common/material_design/material_design_controller.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/system/ime_menu/ime_menu_tray.h"
#include "ash/system/overview/overview_button_tray.h"
#include "ash/system/palette/palette_tray.h"
diff --git a/ash/system/status_area_widget.h b/ash/system/status_area_widget.h
index dcdb5bf..33cf3509 100644
--- a/ash/system/status_area_widget.h
+++ b/ash/system/status_area_widget.h
@@ -7,8 +7,8 @@
#include "ash/ash_export.h"
#include "ash/common/login_status.h"
+#include "ash/common/shelf/shelf_background_animator_observer.h"
#include "ash/public/cpp/shelf_types.h"
-#include "ash/shelf/shelf_background_animator_observer.h"
#include "base/macros.h"
#include "ui/views/widget/widget.h"
diff --git a/ash/system/status_area_widget_delegate.cc b/ash/system/status_area_widget_delegate.cc
index 21c942e..8a2746e 100644
--- a/ash/system/status_area_widget_delegate.cc
+++ b/ash/system/status_area_widget_delegate.cc
@@ -5,12 +5,12 @@
#include "ash/system/status_area_widget_delegate.h"
#include "ash/common/focus_cycler.h"
+#include "ash/common/shelf/shelf_constants.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/shelf/wm_shelf_util.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/shelf_constants.h"
-#include "ash/shelf/wm_shelf.h"
-#include "ash/shelf/wm_shelf_util.h"
#include "ash/system/tray/tray_constants.h"
#include "ui/compositor/layer.h"
#include "ui/compositor/scoped_layer_animation_settings.h"
diff --git a/ash/system/supervised/tray_supervised_user_unittest.cc b/ash/system/supervised/tray_supervised_user_unittest.cc
index 2b666d3..c9a0120 100644
--- a/ash/system/supervised/tray_supervised_user_unittest.cc
+++ b/ash/system/supervised/tray_supervised_user_unittest.cc
@@ -5,8 +5,8 @@
#include "ash/system/supervised/tray_supervised_user.h"
#include "ash/common/login_status.h"
-#include "ash/test/ash_test.h"
-#include "ash/test/test_system_tray_delegate.h"
+#include "ash/common/test/ash_test.h"
+#include "ash/common/test/test_system_tray_delegate.h"
#include "ui/message_center/message_center.h"
#include "ui/message_center/notification.h"
#include "ui/message_center/notification_list.h"
diff --git a/ash/system/tiles/tiles_default_view.cc b/ash/system/tiles/tiles_default_view.cc
index d12e5ccf..ce8b24d 100644
--- a/ash/system/tiles/tiles_default_view.cc
+++ b/ash/system/tiles/tiles_default_view.cc
@@ -4,10 +4,10 @@
#include "ash/system/tiles/tiles_default_view.h"
+#include "ash/common/metrics/user_metrics_action.h"
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/shutdown_controller.h"
#include "ash/common/wm_shell.h"
-#include "ash/metrics/user_metrics_action.h"
#include "ash/resources/vector_icons/vector_icons.h"
#include "ash/shell.h"
#include "ash/strings/grit/ash_strings.h"
diff --git a/ash/system/tiles/tray_tiles.cc b/ash/system/tiles/tray_tiles.cc
index ea1b5cc..a0d5e56 100644
--- a/ash/system/tiles/tray_tiles.cc
+++ b/ash/system/tiles/tray_tiles.cc
@@ -4,9 +4,9 @@
#include "ash/system/tiles/tray_tiles.h"
+#include "ash/common/metrics/user_metrics_action.h"
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/wm_shell.h"
-#include "ash/metrics/user_metrics_action.h"
#include "ash/system/tiles/tiles_default_view.h"
namespace ash {
diff --git a/ash/system/toast/toast_manager_unittest.cc b/ash/system/toast/toast_manager_unittest.cc
index 1518d86..df227e4 100644
--- a/ash/system/toast/toast_manager_unittest.cc
+++ b/ash/system/toast/toast_manager_unittest.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "ash/common/shelf/shelf_constants.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/wm/wm_screen_util.h"
#include "ash/common/wm_shell.h"
-#include "ash/shelf/shelf_constants.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/system/toast/toast_manager.h"
#include "ash/test/ash_test_base.h"
-#include "ash/wm/wm_screen_util.h"
#include "base/run_loop.h"
#include "base/strings/string16.h"
#include "base/strings/string_number_conversions.h"
diff --git a/ash/system/toast/toast_overlay.cc b/ash/system/toast/toast_overlay.cc
index ab1885ae..8175419 100644
--- a/ash/system/toast/toast_overlay.cc
+++ b/ash/system/toast/toast_overlay.cc
@@ -4,11 +4,11 @@
#include "ash/system/toast/toast_overlay.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/strings/grit/ash_strings.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc
index 3bad616..fd6d106 100644
--- a/ash/system/tray/system_tray.cc
+++ b/ash/system/tray/system_tray.cc
@@ -12,13 +12,14 @@
#include "ash/common/login_status.h"
#include "ash/common/material_design/material_design_controller.h"
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/shelf/wm_shelf_util.h"
+#include "ash/common/wm/container_finder.h"
#include "ash/common/wm_activation_observer.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/wm_shelf.h"
-#include "ash/shelf/wm_shelf_util.h"
#include "ash/strings/grit/ash_strings.h"
#include "ash/system/audio/tray_audio.h"
#include "ash/system/bluetooth/tray_bluetooth.h"
@@ -50,7 +51,6 @@
#include "ash/system/update/tray_update.h"
#include "ash/system/user/tray_user.h"
#include "ash/system/web_notification/web_notification_tray.h"
-#include "ash/wm/container_finder.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
diff --git a/ash/system/tray/system_tray_unittest.cc b/ash/system/tray/system_tray_unittest.cc
index 62c8d95..76625247 100644
--- a/ash/system/tray/system_tray_unittest.cc
+++ b/ash/system/tray/system_tray_unittest.cc
@@ -7,13 +7,13 @@
#include <string>
#include <vector>
-#include "ash/accelerators/accelerator_controller.h"
+#include "ash/common/accelerators/accelerator_controller.h"
#include "ash/common/accessibility_delegate.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/system/status_area_widget.h"
#include "ash/system/tray/system_tray_bubble.h"
#include "ash/system/tray/system_tray_item.h"
diff --git a/ash/system/tray/tray_background_view.cc b/ash/system/tray/tray_background_view.cc
index 326c4a2..9c857b21 100644
--- a/ash/system/tray/tray_background_view.cc
+++ b/ash/system/tray/tray_background_view.cc
@@ -8,13 +8,13 @@
#include "ash/common/ash_constants.h"
#include "ash/common/material_design/material_design_controller.h"
+#include "ash/common/shelf/shelf_constants.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/shelf/wm_shelf_util.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/resources/grit/ash_resources.h"
-#include "ash/shelf/shelf_constants.h"
-#include "ash/shelf/wm_shelf.h"
-#include "ash/shelf/wm_shelf_util.h"
#include "ash/system/tray/system_tray.h"
#include "ash/system/tray/tray_constants.h"
#include "ash/system/tray/tray_event_filter.h"
diff --git a/ash/system/tray/tray_background_view.h b/ash/system/tray/tray_background_view.h
index 1e5280d..a35f828 100644
--- a/ash/system/tray/tray_background_view.h
+++ b/ash/system/tray/tray_background_view.h
@@ -8,8 +8,8 @@
#include <memory>
#include "ash/ash_export.h"
+#include "ash/common/shelf/shelf_background_animator_observer.h"
#include "ash/public/cpp/shelf_types.h"
-#include "ash/shelf/shelf_background_animator_observer.h"
#include "ash/system/tray/actionable_view.h"
#include "base/macros.h"
#include "ui/compositor/layer_animation_observer.h"
diff --git a/ash/system/tray/tray_event_filter.cc b/ash/system/tray/tray_event_filter.cc
index 3d6d7a1..f8e4ef0 100644
--- a/ash/system/tray/tray_event_filter.cc
+++ b/ash/system/tray/tray_event_filter.cc
@@ -4,12 +4,12 @@
#include "ash/system/tray/tray_event_filter.h"
+#include "ash/common/wm/container_finder.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/system/tray/tray_background_view.h"
#include "ash/system/tray/tray_bubble_wrapper.h"
-#include "ash/wm/container_finder.h"
#include "ui/views/widget/widget.h"
namespace ash {
diff --git a/ash/system/tray/tray_image_item.cc b/ash/system/tray/tray_image_item.cc
index 0633b0cb..237d5b4 100644
--- a/ash/system/tray/tray_image_item.cc
+++ b/ash/system/tray/tray_image_item.cc
@@ -4,8 +4,8 @@
#include "ash/system/tray/tray_image_item.h"
+#include "ash/common/shelf/wm_shelf_util.h"
#include "ash/resources/vector_icons/vector_icons.h"
-#include "ash/shelf/wm_shelf_util.h"
#include "ash/system/tray/system_tray.h"
#include "ash/system/tray/tray_constants.h"
#include "ash/system/tray/tray_item_view.h"
diff --git a/ash/system/tray/tray_item_view.cc b/ash/system/tray/tray_item_view.cc
index 32597ce..fee7734 100644
--- a/ash/system/tray/tray_item_view.cc
+++ b/ash/system/tray/tray_item_view.cc
@@ -5,8 +5,8 @@
#include "ash/system/tray/tray_item_view.h"
#include "ash/common/material_design/material_design_controller.h"
+#include "ash/common/shelf/wm_shelf_util.h"
#include "ash/public/cpp/shelf_types.h"
-#include "ash/shelf/wm_shelf_util.h"
#include "ash/system/tray/system_tray.h"
#include "ash/system/tray/system_tray_item.h"
#include "ash/system/tray/tray_constants.h"
diff --git a/ash/system/tray/tray_utils.cc b/ash/system/tray/tray_utils.cc
index 5a42c80..f1b8fe2 100644
--- a/ash/system/tray/tray_utils.cc
+++ b/ash/system/tray/tray_utils.cc
@@ -5,7 +5,7 @@
#include "ash/system/tray/tray_utils.h"
#include "ash/common/material_design/material_design_controller.h"
-#include "ash/shelf/wm_shelf_util.h"
+#include "ash/common/shelf/wm_shelf_util.h"
#include "ash/system/tray/tray_constants.h"
#include "ash/system/tray/tray_item_view.h"
#include "ui/accessibility/ax_node_data.h"
diff --git a/ash/system/tray_tracing.cc b/ash/system/tray_tracing.cc
index 1f787ea8..e2c14a9 100644
--- a/ash/system/tray_tracing.cc
+++ b/ash/system/tray_tracing.cc
@@ -4,8 +4,8 @@
#include "ash/system/tray_tracing.h"
+#include "ash/common/metrics/user_metrics_action.h"
#include "ash/common/wm_shell.h"
-#include "ash/metrics/user_metrics_action.h"
#include "ash/resources/vector_icons/vector_icons.h"
#include "ash/strings/grit/ash_strings.h"
#include "ash/system/tray/actionable_view.h"
diff --git a/ash/system/update/tray_update.cc b/ash/system/update/tray_update.cc
index ccbb434..5eb2c05 100644
--- a/ash/system/update/tray_update.cc
+++ b/ash/system/update/tray_update.cc
@@ -4,8 +4,8 @@
#include "ash/system/update/tray_update.h"
+#include "ash/common/metrics/user_metrics_action.h"
#include "ash/common/wm_shell.h"
-#include "ash/metrics/user_metrics_action.h"
#include "ash/public/interfaces/update.mojom.h"
#include "ash/resources/vector_icons/vector_icons.h"
#include "ash/strings/grit/ash_strings.h"
diff --git a/ash/system/update/tray_update_unittest.cc b/ash/system/update/tray_update_unittest.cc
index c33947f..d058a6f 100644
--- a/ash/system/update/tray_update_unittest.cc
+++ b/ash/system/update/tray_update_unittest.cc
@@ -4,11 +4,11 @@
#include "ash/system/update/tray_update.h"
+#include "ash/common/test/ash_test.h"
#include "ash/common/wm_shell.h"
#include "ash/public/interfaces/update.mojom.h"
#include "ash/system/tray/system_tray.h"
#include "ash/system/tray/system_tray_controller.h"
-#include "ash/test/ash_test.h"
namespace ash {
diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc
index 0dfa5233..4ed4d38 100644
--- a/ash/system/user/tray_user.cc
+++ b/ash/system/user/tray_user.cc
@@ -5,8 +5,8 @@
#include "ash/system/user/tray_user.h"
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/shelf/wm_shelf_util.h"
#include "ash/common/wm_shell.h"
-#include "ash/shelf/wm_shelf_util.h"
#include "ash/strings/grit/ash_strings.h"
#include "ash/system/tray/system_tray.h"
#include "ash/system/tray/system_tray_delegate.h"
diff --git a/ash/system/user/tray_user_unittest.cc b/ash/system/user/tray_user_unittest.cc
index cb3bceb..1a9da2b 100644
--- a/ash/system/user/tray_user_unittest.cc
+++ b/ash/system/user/tray_user_unittest.cc
@@ -5,6 +5,7 @@
#include <vector>
#include "ash/common/shell_delegate.h"
+#include "ash/common/test/test_session_state_delegate.h"
#include "ash/common/wm_shell.h"
#include "ash/system/tray/system_tray.h"
#include "ash/system/tray/tray_constants.h"
@@ -12,7 +13,6 @@
#include "ash/system/user/user_view.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/ash_test_helper.h"
-#include "ash/test/test_session_state_delegate.h"
#include "ash/test/test_shell_delegate.h"
#include "base/memory/ptr_util.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/ash/system/virtual_keyboard/virtual_keyboard_tray.cc b/ash/system/virtual_keyboard/virtual_keyboard_tray.cc
index 19e60ec..53ebc901 100644
--- a/ash/system/virtual_keyboard/virtual_keyboard_tray.cc
+++ b/ash/system/virtual_keyboard/virtual_keyboard_tray.cc
@@ -7,11 +7,11 @@
#include <algorithm>
#include "ash/common/keyboard/keyboard_ui.h"
+#include "ash/common/shelf/shelf_constants.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/resources/vector_icons/vector_icons.h"
-#include "ash/shelf/shelf_constants.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/strings/grit/ash_strings.h"
#include "ash/system/tray/tray_constants.h"
#include "ui/base/l10n/l10n_util.h"
diff --git a/ash/system/web_notification/ash_popup_alignment_delegate.cc b/ash/system/web_notification/ash_popup_alignment_delegate.cc
index 0d33b7bc..a196443 100644
--- a/ash/system/web_notification/ash_popup_alignment_delegate.cc
+++ b/ash/system/web_notification/ash_popup_alignment_delegate.cc
@@ -4,13 +4,13 @@
#include "ash/system/web_notification/ash_popup_alignment_delegate.h"
+#include "ash/common/shelf/shelf_constants.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shelf_types.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/shelf_constants.h"
-#include "ash/shelf/wm_shelf.h"
#include "base/i18n/rtl.h"
#include "ui/display/display.h"
#include "ui/display/screen.h"
diff --git a/ash/system/web_notification/ash_popup_alignment_delegate.h b/ash/system/web_notification/ash_popup_alignment_delegate.h
index d8e41b4..c631565 100644
--- a/ash/system/web_notification/ash_popup_alignment_delegate.h
+++ b/ash/system/web_notification/ash_popup_alignment_delegate.h
@@ -8,9 +8,9 @@
#include <stdint.h>
#include "ash/ash_export.h"
+#include "ash/common/shelf/wm_shelf_observer.h"
#include "ash/common/shell_observer.h"
#include "ash/public/cpp/shelf_types.h"
-#include "ash/shelf/wm_shelf_observer.h"
#include "base/macros.h"
#include "ui/display/display_observer.h"
#include "ui/gfx/geometry/rect.h"
diff --git a/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc b/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc
index 56ff6e9..271cfb3 100644
--- a/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc
+++ b/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc
@@ -7,12 +7,12 @@
#include <utility>
#include <vector>
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shelf_types.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "base/command_line.h"
diff --git a/ash/system/web_notification/web_notification_tray.cc b/ash/system/web_notification/web_notification_tray.cc
index 8e6c79df..cd06e236 100644
--- a/ash/system/web_notification/web_notification_tray.cc
+++ b/ash/system/web_notification/web_notification_tray.cc
@@ -6,14 +6,14 @@
#include "ash/common/material_design/material_design_controller.h"
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/shelf/shelf_constants.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/shelf/wm_shelf_util.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/resources/vector_icons/vector_icons.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/shelf_constants.h"
-#include "ash/shelf/wm_shelf.h"
-#include "ash/shelf/wm_shelf_util.h"
#include "ash/strings/grit/ash_strings.h"
#include "ash/system/status_area_widget.h"
#include "ash/system/tray/system_tray.h"
diff --git a/ash/system/web_notification/web_notification_tray_unittest.cc b/ash/system/web_notification/web_notification_tray_unittest.cc
index 4a00585..c7fdf33 100644
--- a/ash/system/web_notification/web_notification_tray_unittest.cc
+++ b/ash/system/web_notification/web_notification_tray_unittest.cc
@@ -7,11 +7,13 @@
#include <utility>
#include <vector>
+#include "ash/common/shelf/shelf_layout_manager.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/test/test_system_tray_delegate.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
-#include "ash/shelf/shelf_layout_manager.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/system/screen_layout_observer.h"
#include "ash/system/status_area_widget.h"
@@ -20,8 +22,6 @@
#include "ash/system/web_notification/ash_popup_alignment_delegate.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/status_area_widget_test_helper.h"
-#include "ash/test/test_system_tray_delegate.h"
-#include "ash/wm/window_state.h"
#include "base/memory/ptr_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/ash/test/BUILD.gn b/ash/test/BUILD.gn
index 02c7e16..96d7d5d 100644
--- a/ash/test/BUILD.gn
+++ b/ash/test/BUILD.gn
@@ -67,23 +67,23 @@
testonly = true
visibility = [ ":*" ]
sources = [
- "ash_test.cc",
- "ash_test.h",
- "ash_test_impl.h",
- "test_palette_delegate.cc",
- "test_palette_delegate.h",
- "test_session_state_delegate.cc",
- "test_session_state_delegate.h",
- "test_shelf_delegate.cc",
- "test_shelf_delegate.h",
- "test_shelf_item_delegate.cc",
- "test_shelf_item_delegate.h",
- "test_system_tray_delegate.cc",
- "test_system_tray_delegate.h",
- "wm_shell_test_api.cc",
- "wm_shell_test_api.h",
- "workspace_event_handler_test_helper.cc",
- "workspace_event_handler_test_helper.h",
+ "../common/test/ash_test.cc",
+ "../common/test/ash_test.h",
+ "../common/test/ash_test_impl.h",
+ "../common/test/test_palette_delegate.cc",
+ "../common/test/test_palette_delegate.h",
+ "../common/test/test_session_state_delegate.cc",
+ "../common/test/test_session_state_delegate.h",
+ "../common/test/test_shelf_delegate.cc",
+ "../common/test/test_shelf_delegate.h",
+ "../common/test/test_shelf_item_delegate.cc",
+ "../common/test/test_shelf_item_delegate.h",
+ "../common/test/test_system_tray_delegate.cc",
+ "../common/test/test_system_tray_delegate.h",
+ "../common/test/wm_shell_test_api.cc",
+ "../common/test/wm_shell_test_api.h",
+ "../common/test/workspace_event_handler_test_helper.cc",
+ "../common/test/workspace_event_handler_test_helper.h",
# TODO(jamescook): Move these files into ash/test.
"../laser/laser_pointer_controller_test_api.cc",
diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc
index 32fc673..3da727a 100644
--- a/ash/test/ash_test_base.cc
+++ b/ash/test/ash_test_base.cc
@@ -7,6 +7,9 @@
#include <string>
#include <vector>
+#include "ash/common/test/test_session_state_delegate.h"
+#include "ash/common/test/test_system_tray_delegate.h"
+#include "ash/common/wm/window_positioner.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/display/extended_mouse_warp_controller.h"
@@ -19,10 +22,7 @@
#include "ash/shell/toplevel_window.h"
#include "ash/test/ash_test_environment.h"
#include "ash/test/ash_test_helper.h"
-#include "ash/test/test_session_state_delegate.h"
#include "ash/test/test_shell_delegate.h"
-#include "ash/test/test_system_tray_delegate.h"
-#include "ash/wm/window_positioner.h"
#include "base/command_line.h"
#include "services/ui/public/interfaces/window_manager_constants.mojom.h"
#include "ui/aura/client/aura_constants.h"
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc
index 1ed61fa..910c4e1 100644
--- a/ash/test/ash_test_helper.cc
+++ b/ash/test/ash_test_helper.cc
@@ -5,6 +5,9 @@
#include "ash/test/ash_test_helper.h"
#include "ash/accelerators/accelerator_controller_delegate_aura.h"
+#include "ash/common/test/test_session_state_delegate.h"
+#include "ash/common/test/test_system_tray_delegate.h"
+#include "ash/common/test/wm_shell_test_api.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/mus/screen_mus.h"
@@ -17,10 +20,7 @@
#include "ash/test/ash_test_views_delegate.h"
#include "ash/test/shell_test_api.h"
#include "ash/test/test_screenshot_delegate.h"
-#include "ash/test/test_session_state_delegate.h"
#include "ash/test/test_shell_delegate.h"
-#include "ash/test/test_system_tray_delegate.h"
-#include "ash/test/wm_shell_test_api.h"
#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "base/strings/string_split.h"
diff --git a/ash/test/ash_test_impl_aura.cc b/ash/test/ash_test_impl_aura.cc
index 4508c531..ec4fa78 100644
--- a/ash/test/ash_test_impl_aura.cc
+++ b/ash/test/ash_test_impl_aura.cc
@@ -4,10 +4,10 @@
#include "ash/test/ash_test_impl_aura.h"
+#include "ash/common/test/ash_test.h"
#include "ash/common/wm_window.h"
#include "ash/screen_util.h"
#include "ash/shell.h"
-#include "ash/test/ash_test.h"
#include "ash/test/ash_test_base.h"
#include "base/memory/ptr_util.h"
#include "ui/aura/test/test_window_delegate.h"
diff --git a/ash/test/ash_test_impl_aura.h b/ash/test/ash_test_impl_aura.h
index c723749..54a9c99 100644
--- a/ash/test/ash_test_impl_aura.h
+++ b/ash/test/ash_test_impl_aura.h
@@ -5,7 +5,7 @@
#ifndef ASH_MUS_TEST_ASH_TEST_IMPL_AURA_H_
#define ASH_MUS_TEST_ASH_TEST_IMPL_AURA_H_
-#include "ash/test/ash_test_impl.h"
+#include "ash/common/test/ash_test_impl.h"
namespace ash {
namespace test {
diff --git a/ash/test/overflow_bubble_view_test_api.cc b/ash/test/overflow_bubble_view_test_api.cc
index aa61675..cabf43a 100644
--- a/ash/test/overflow_bubble_view_test_api.cc
+++ b/ash/test/overflow_bubble_view_test_api.cc
@@ -4,7 +4,7 @@
#include "ash/test/overflow_bubble_view_test_api.h"
-#include "ash/shelf/overflow_bubble_view.h"
+#include "ash/common/shelf/overflow_bubble_view.h"
namespace ash {
namespace test {
diff --git a/ash/test/shelf_button_pressed_metric_tracker_test_api.h b/ash/test/shelf_button_pressed_metric_tracker_test_api.h
index 874365b..24ac55bb 100644
--- a/ash/test/shelf_button_pressed_metric_tracker_test_api.h
+++ b/ash/test/shelf_button_pressed_metric_tracker_test_api.h
@@ -5,7 +5,7 @@
#ifndef ASH_TEST_SHELF_BUTTON_PRESSED_METRIC_TRACKER_TEST_API_H_
#define ASH_TEST_SHELF_BUTTON_PRESSED_METRIC_TRACKER_TEST_API_H_
-#include "ash/shelf/shelf_button_pressed_metric_tracker.h"
+#include "ash/common/shelf/shelf_button_pressed_metric_tracker.h"
#include <memory>
diff --git a/ash/test/shelf_view_test_api.cc b/ash/test/shelf_view_test_api.cc
index 9bf2d8c7..6231c154 100644
--- a/ash/test/shelf_view_test_api.cc
+++ b/ash/test/shelf_view_test_api.cc
@@ -4,11 +4,11 @@
#include "ash/test/shelf_view_test_api.h"
-#include "ash/shelf/overflow_button.h"
-#include "ash/shelf/shelf_button.h"
-#include "ash/shelf/shelf_constants.h"
-#include "ash/shelf/shelf_model.h"
-#include "ash/shelf/shelf_view.h"
+#include "ash/common/shelf/overflow_button.h"
+#include "ash/common/shelf/shelf_button.h"
+#include "ash/common/shelf/shelf_constants.h"
+#include "ash/common/shelf/shelf_model.h"
+#include "ash/common/shelf/shelf_view.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "ui/views/animation/bounds_animator.h"
diff --git a/ash/test/shelf_view_test_api.h b/ash/test/shelf_view_test_api.h
index 5fd84b9..be7185b57 100644
--- a/ash/test/shelf_view_test_api.h
+++ b/ash/test/shelf_view_test_api.h
@@ -5,7 +5,7 @@
#ifndef ASH_TEST_SHELF_VIEW_TEST_API_H_
#define ASH_TEST_SHELF_VIEW_TEST_API_H_
-#include "ash/shelf/shelf_item_types.h"
+#include "ash/common/shelf/shelf_item_types.h"
#include "base/macros.h"
namespace gfx {
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
index d1e753f..37f8536 100644
--- a/ash/test/test_shell_delegate.cc
+++ b/ash/test/test_shell_delegate.cc
@@ -10,15 +10,15 @@
#include "ash/common/gpu_support_stub.h"
#include "ash/common/palette_delegate.h"
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/test/test_session_state_delegate.h"
+#include "ash/common/test/test_shelf_delegate.h"
+#include "ash/common/test/test_system_tray_delegate.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/system/tray/system_tray_notifier.h"
#include "ash/test/test_keyboard_ui.h"
-#include "ash/test/test_session_state_delegate.h"
-#include "ash/test/test_shelf_delegate.h"
-#include "ash/test/test_system_tray_delegate.h"
#include "ash/test/test_wallpaper_delegate.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_util.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
index 5d8bea3..fe30c3c 100644
--- a/ash/test/test_shell_delegate.h
+++ b/ash/test/test_shell_delegate.h
@@ -9,7 +9,7 @@
#include <string>
#include "ash/common/shell_delegate.h"
-#include "ash/test/test_session_state_delegate.h"
+#include "ash/common/test/test_session_state_delegate.h"
#include "base/macros.h"
namespace keyboard {
diff --git a/ash/test/ui_controls_factory_ash.cc b/ash/test/ui_controls_factory_ash.cc
index 090059ec..d0606357 100644
--- a/ash/test/ui_controls_factory_ash.cc
+++ b/ash/test/ui_controls_factory_ash.cc
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "ash/common/wm/root_window_finder.h"
#include "ash/common/wm_window.h"
#include "ash/shell.h"
-#include "ash/wm/root_window_finder.h"
#include "ash/wm/window_properties.h"
#include "ui/aura/client/capture_client.h"
#include "ui/aura/client/screen_position_client.h"
diff --git a/ash/touch/touch_uma.h b/ash/touch/touch_uma.h
index 805f059..480cb3de 100644
--- a/ash/touch/touch_uma.h
+++ b/ash/touch/touch_uma.h
@@ -6,7 +6,7 @@
#define ASH_TOUCH_TOUCH_OBSERVER_UMA_H_
#include "ash/ash_export.h"
-#include "ash/metrics/gesture_action_type.h"
+#include "ash/common/metrics/gesture_action_type.h"
#include "base/macros.h"
#include "base/memory/singleton.h"
diff --git a/ash/virtual_keyboard_controller.cc b/ash/virtual_keyboard_controller.cc
index d19ad09..4e3c4b1 100644
--- a/ash/virtual_keyboard_controller.cc
+++ b/ash/virtual_keyboard_controller.cc
@@ -7,12 +7,12 @@
#include <vector>
#include "ash/common/keyboard/keyboard_ui.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/root_window_controller.h"
#include "ash/shell.h"
#include "ash/system/tray/system_tray_notifier.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
#include "base/command_line.h"
#include "base/strings/string_util.h"
#include "ui/display/display.h"
diff --git a/ash/virtual_keyboard_controller_unittest.cc b/ash/virtual_keyboard_controller_unittest.cc
index 7cf0a9fe..0ddfb33 100644
--- a/ash/virtual_keyboard_controller_unittest.cc
+++ b/ash/virtual_keyboard_controller_unittest.cc
@@ -7,13 +7,13 @@
#include <utility>
#include <vector>
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
+#include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"
#include "ash/common/wm_shell.h"
#include "ash/shell.h"
#include "ash/system/tray/system_tray_notifier.h"
#include "ash/system/virtual_keyboard/virtual_keyboard_observer.h"
#include "ash/test/ash_test_base.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
-#include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"
#include "base/command_line.h"
#include "ui/events/devices/device_data_manager.h"
#include "ui/events/devices/device_hotplug_event_observer.h"
diff --git a/ash/wm/always_on_top_controller_unittest.cc b/ash/wm/always_on_top_controller_unittest.cc
index 70131d69..54dad32 100644
--- a/ash/wm/always_on_top_controller_unittest.cc
+++ b/ash/wm/always_on_top_controller_unittest.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/always_on_top_controller.h"
+#include "ash/common/wm/always_on_top_controller.h"
+#include "ash/common/wm/workspace/workspace_layout_manager.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
-#include "ash/wm/workspace/workspace_layout_manager.h"
#include "base/command_line.h"
#include "base/memory/ptr_util.h"
#include "ui/keyboard/keyboard_controller.h"
diff --git a/ash/wm/ash_focus_rules.cc b/ash/wm/ash_focus_rules.cc
index 2d4616a..26adb0b8 100644
--- a/ash/wm/ash_focus_rules.cc
+++ b/ash/wm/ash_focus_rules.cc
@@ -4,14 +4,14 @@
#include "ash/wm/ash_focus_rules.h"
+#include "ash/common/wm/container_finder.h"
+#include "ash/common/wm/focus_rules.h"
+#include "ash/common/wm/mru_window_tracker.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/shell.h"
-#include "ash/wm/container_finder.h"
-#include "ash/wm/focus_rules.h"
-#include "ash/wm/mru_window_tracker.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ui/aura/window.h"
diff --git a/ash/wm/ash_focus_rules_unittest.cc b/ash/wm/ash_focus_rules_unittest.cc
index 2ea7da9..faabf2d7 100644
--- a/ash/wm/ash_focus_rules_unittest.cc
+++ b/ash/wm/ash_focus_rules_unittest.cc
@@ -3,15 +3,15 @@
// found in the LICENSE file.
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/test/test_session_state_delegate.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/ash_test_helper.h"
-#include "ash/test/test_session_state_delegate.h"
#include "ash/test/test_shell_delegate.h"
#include "ash/wm/lock_state_controller.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
#include "services/ui/public/interfaces/window_manager_constants.mojom.h"
diff --git a/ash/wm/dock/docked_window_layout_manager_unittest.cc b/ash/wm/dock/docked_window_layout_manager_unittest.cc
index 9e4b3f7..d3426e7 100644
--- a/ash/wm/dock/docked_window_layout_manager_unittest.cc
+++ b/ash/wm/dock/docked_window_layout_manager_unittest.cc
@@ -2,22 +2,22 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/dock/docked_window_layout_manager.h"
+#include "ash/common/wm/dock/docked_window_layout_manager.h"
#include "ash/common/ash_switches.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/test/test_shelf_delegate.h"
+#include "ash/common/wm/panels/panel_layout_manager.h"
+#include "ash/common/wm/window_resizer.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/shelf_view_test_api.h"
#include "ash/test/shell_test_api.h"
-#include "ash/test/test_shelf_delegate.h"
-#include "ash/wm/panels/panel_layout_manager.h"
-#include "ash/wm/window_resizer.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
#include "base/command_line.h"
diff --git a/ash/wm/dock/docked_window_resizer_unittest.cc b/ash/wm/dock/docked_window_resizer_unittest.cc
index 4e607de..7cf4583 100644
--- a/ash/wm/dock/docked_window_resizer_unittest.cc
+++ b/ash/wm/dock/docked_window_resizer_unittest.cc
@@ -2,9 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/dock/docked_window_resizer.h"
+#include "ash/common/wm/dock/docked_window_resizer.h"
#include "ash/common/ash_switches.h"
+#include "ash/common/shelf/shelf_widget.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/test/test_shelf_delegate.h"
+#include "ash/common/wm/dock/docked_window_layout_manager.h"
+#include "ash/common/wm/panels/panel_layout_manager.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_event.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/display/window_tree_host_manager.h"
@@ -13,19 +20,12 @@
#include "ash/public/cpp/window_properties.h"
#include "ash/root_window_controller.h"
#include "ash/screen_util.h"
-#include "ash/shelf/shelf_widget.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/cursor_manager_test_api.h"
-#include "ash/test/test_shelf_delegate.h"
-#include "ash/wm/dock/docked_window_layout_manager.h"
#include "ash/wm/drag_window_resizer.h"
-#include "ash/wm/panels/panel_layout_manager.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
-#include "ash/wm/wm_event.h"
#include "base/command_line.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/client/window_parenting_client.h"
diff --git a/ash/wm/drag_window_resizer.cc b/ash/wm/drag_window_resizer.cc
index b792990..0ccaf949 100644
--- a/ash/wm/drag_window_resizer.cc
+++ b/ash/wm/drag_window_resizer.cc
@@ -4,12 +4,12 @@
#include "ash/wm/drag_window_resizer.h"
+#include "ash/common/wm/window_positioning_utils.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_window.h"
#include "ash/display/mouse_cursor_event_filter.h"
#include "ash/shell.h"
#include "ash/wm/drag_window_controller.h"
-#include "ash/wm/window_positioning_utils.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_util.h"
#include "base/memory/weak_ptr.h"
#include "ui/aura/client/aura_constants.h"
diff --git a/ash/wm/drag_window_resizer.h b/ash/wm/drag_window_resizer.h
index b8831528..ab49be7d 100644
--- a/ash/wm/drag_window_resizer.h
+++ b/ash/wm/drag_window_resizer.h
@@ -8,7 +8,7 @@
#include <memory>
#include "ash/ash_export.h"
-#include "ash/wm/window_resizer.h"
+#include "ash/common/wm/window_resizer.h"
#include "base/compiler_specific.h"
#include "base/gtest_prod_util.h"
#include "base/macros.h"
diff --git a/ash/wm/drag_window_resizer_unittest.cc b/ash/wm/drag_window_resizer_unittest.cc
index 37e71150..c0514a7 100644
--- a/ash/wm/drag_window_resizer_unittest.cc
+++ b/ash/wm/drag_window_resizer_unittest.cc
@@ -4,16 +4,16 @@
#include "ash/wm/drag_window_resizer.h"
+#include "ash/common/shelf/shelf_layout_manager.h"
+#include "ash/common/wm/window_positioning_utils.h"
#include "ash/common/wm_window.h"
#include "ash/display/mouse_cursor_event_filter.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/shelf_layout_manager.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/cursor_manager_test_api.h"
#include "ash/wm/drag_window_controller.h"
-#include "ash/wm/window_positioning_utils.h"
#include "ash/wm/window_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
diff --git a/ash/wm/gestures/overview_gesture_handler.cc b/ash/wm/gestures/overview_gesture_handler.cc
index aee408c..8d84fee 100644
--- a/ash/wm/gestures/overview_gesture_handler.cc
+++ b/ash/wm/gestures/overview_gesture_handler.cc
@@ -4,8 +4,8 @@
#include "ash/wm/gestures/overview_gesture_handler.h"
+#include "ash/common/wm/overview/window_selector_controller.h"
#include "ash/common/wm_shell.h"
-#include "ash/wm/overview/window_selector_controller.h"
#include "ui/events/event.h"
#include "ui/events/event_constants.h"
diff --git a/ash/wm/gestures/overview_gesture_handler_unittest.cc b/ash/wm/gestures/overview_gesture_handler_unittest.cc
index ec5ee028..90d2639 100644
--- a/ash/wm/gestures/overview_gesture_handler_unittest.cc
+++ b/ash/wm/gestures/overview_gesture_handler_unittest.cc
@@ -4,11 +4,11 @@
#include "ash/wm/gestures/overview_gesture_handler.h"
+#include "ash/common/wm/overview/window_selector_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/root_window_controller.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
-#include "ash/wm/overview/window_selector_controller.h"
#include "ash/wm/window_util.h"
#include "ui/aura/test/test_window_delegate.h"
#include "ui/aura/test/test_windows.h"
diff --git a/ash/wm/immersive_fullscreen_controller_unittest.cc b/ash/wm/immersive_fullscreen_controller_unittest.cc
index db136aa..45e67ae4 100644
--- a/ash/wm/immersive_fullscreen_controller_unittest.cc
+++ b/ash/wm/immersive_fullscreen_controller_unittest.cc
@@ -4,16 +4,16 @@
#include "ash/shared/immersive_fullscreen_controller.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/display/mouse_cursor_event_filter.h"
#include "ash/public/cpp/shelf_types.h"
#include "ash/root_window_controller.h"
#include "ash/shared/immersive_fullscreen_controller_delegate.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/immersive_fullscreen_controller_test_api.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/client/cursor_client.h"
diff --git a/ash/wm/lock_layout_manager_unittest.cc b/ash/wm/lock_layout_manager_unittest.cc
index 6d46717..ca2bbf98 100644
--- a/ash/wm/lock_layout_manager_unittest.cc
+++ b/ash/wm/lock_layout_manager_unittest.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "ash/common/wm/window_state.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
#include "ash/screen_util.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "base/command_line.h"
#include "services/ui/public/interfaces/window_manager_constants.mojom.h"
diff --git a/ash/wm/lock_state_controller_unittest.cc b/ash/wm/lock_state_controller_unittest.cc
index 981fa83..51af510 100644
--- a/ash/wm/lock_state_controller_unittest.cc
+++ b/ash/wm/lock_state_controller_unittest.cc
@@ -9,15 +9,15 @@
#include "ash/common/session/session_state_delegate.h"
#include "ash/common/shutdown_controller.h"
+#include "ash/common/test/test_session_state_delegate.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/lock_state_controller_test_api.h"
#include "ash/test/test_screenshot_delegate.h"
#include "ash/test/test_session_state_animator.h"
-#include "ash/test/test_session_state_delegate.h"
#include "ash/test/test_shell_delegate.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/wm/power_button_controller.h"
#include "ash/wm/session_state_animator.h"
#include "base/memory/ptr_util.h"
diff --git a/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc b/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc
index 49fafcfbc..b30af30 100644
--- a/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc
+++ b/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc
@@ -2,19 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include <math.h>
#include <utility>
#include <vector>
#include "ash/common/ash_switches.h"
+#include "ash/common/test/test_system_tray_delegate.h"
+#include "ash/common/wm/overview/window_selector_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/shell.h"
#include "ash/system/tray/system_tray_delegate.h"
#include "ash/test/ash_test_base.h"
-#include "ash/test/test_system_tray_delegate.h"
-#include "ash/wm/overview/window_selector_controller.h"
#include "base/command_line.h"
#include "base/test/simple_test_tick_clock.h"
#include "base/test/user_action_tester.h"
diff --git a/ash/wm/maximize_mode/maximize_mode_event_handler_aura.h b/ash/wm/maximize_mode/maximize_mode_event_handler_aura.h
index a6702f2..2107309 100644
--- a/ash/wm/maximize_mode/maximize_mode_event_handler_aura.h
+++ b/ash/wm/maximize_mode/maximize_mode_event_handler_aura.h
@@ -5,7 +5,7 @@
#ifndef ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_EVENT_HANDLER_AURA_H_
#define ASH_WM_MAXIMIZE_MODE_MAXIMIZE_MODE_EVENT_HANDLER_AURA_H_
-#include "ash/wm/maximize_mode/maximize_mode_event_handler.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h"
#include "ui/events/event_handler.h"
namespace ash {
diff --git a/ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc b/ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc
index 16cf02e..b2f9411e 100644
--- a/ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc
+++ b/ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc
@@ -2,29 +2,29 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/maximize_mode/maximize_mode_window_manager.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_window_manager.h"
#include <string>
#include "ash/common/ash_switches.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
+#include "ash/common/wm/mru_window_tracker.h"
+#include "ash/common/wm/overview/window_selector_controller.h"
+#include "ash/common/wm/switchable_windows.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/window_state_observer.h"
+#include "ash/common/wm/wm_event.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/root_window_controller.h"
#include "ash/screen_util.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/shell_test_api.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
-#include "ash/wm/mru_window_tracker.h"
-#include "ash/wm/overview/window_selector_controller.h"
-#include "ash/wm/switchable_windows.h"
#include "ash/wm/window_properties.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
-#include "ash/wm/window_state_observer.h"
#include "ash/wm/window_util.h"
-#include "ash/wm/wm_event.h"
#include "base/command_line.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h b/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h
deleted file mode 100644
index 6a1cbde..0000000
--- a/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h
+++ /dev/null
@@ -1,17 +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.
-
-#ifndef ASH_WM_MAXIMIZE_MODE_SCOPED_DISABLE_INTERNAL_MOUSE_AND_KEYBOARD_H_
-#define ASH_WM_MAXIMIZE_MODE_SCOPED_DISABLE_INTERNAL_MOUSE_AND_KEYBOARD_H_
-
-namespace ash {
-
-class ScopedDisableInternalMouseAndKeyboard {
- public:
- virtual ~ScopedDisableInternalMouseAndKeyboard() {}
-};
-
-} // namespace ash
-
-#endif // ASH_WM_MAXIMIZE_MODE_SCOPED_DISABLE_INTERNAL_MOUSE_AND_KEYBOARD_H_
diff --git a/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h b/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h
index 6783fcb..835a45d 100644
--- a/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h
+++ b/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h
@@ -5,7 +5,7 @@
#ifndef ASH_WM_MAXIMIZE_MODE_SCOPED_DISABLE_INTERNAL_MOUSE_AND_KEYBOARD_OZONE_H_
#define ASH_WM_MAXIMIZE_MODE_SCOPED_DISABLE_INTERNAL_MOUSE_AND_KEYBOARD_OZONE_H_
-#include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"
+#include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"
#include "base/macros.h"
namespace ash {
diff --git a/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h b/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h
index 6c8f47d..ea69d79 100644
--- a/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h
+++ b/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h
@@ -8,7 +8,7 @@
#include <vector>
#include "ash/ash_export.h"
-#include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"
+#include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"
#include "base/macros.h"
#include "ui/events/platform/platform_event_observer.h"
#include "ui/gfx/geometry/point.h"
diff --git a/ash/wm/overview/scoped_overview_animation_settings_aura.h b/ash/wm/overview/scoped_overview_animation_settings_aura.h
index 2203ff2..966b0edc 100644
--- a/ash/wm/overview/scoped_overview_animation_settings_aura.h
+++ b/ash/wm/overview/scoped_overview_animation_settings_aura.h
@@ -7,8 +7,8 @@
#include <memory>
-#include "ash/wm/overview/overview_animation_type.h"
-#include "ash/wm/overview/scoped_overview_animation_settings.h"
+#include "ash/common/wm/overview/overview_animation_type.h"
+#include "ash/common/wm/overview/scoped_overview_animation_settings.h"
#include "base/macros.h"
namespace aura {
diff --git a/ash/wm/overview/scoped_overview_animation_settings_factory_aura.h b/ash/wm/overview/scoped_overview_animation_settings_factory_aura.h
index 41ce23c4..acad829 100644
--- a/ash/wm/overview/scoped_overview_animation_settings_factory_aura.h
+++ b/ash/wm/overview/scoped_overview_animation_settings_factory_aura.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "ash/wm/overview/scoped_overview_animation_settings_factory.h"
+#include "ash/common/wm/overview/scoped_overview_animation_settings_factory.h"
#include "base/macros.h"
namespace ash {
diff --git a/ash/wm/overview/window_selector_unittest.cc b/ash/wm/overview/window_selector_unittest.cc
index 682a10d..ebd23eb 100644
--- a/ash/wm/overview/window_selector_unittest.cc
+++ b/ash/wm/overview/window_selector_unittest.cc
@@ -8,34 +8,34 @@
#include "ash/common/accessibility_delegate.h"
#include "ash/common/accessibility_types.h"
#include "ash/common/ash_switches.h"
+#include "ash/common/shelf/shelf_widget.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/test/test_shelf_delegate.h"
+#include "ash/common/wm/dock/docked_window_layout_manager.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
+#include "ash/common/wm/mru_window_tracker.h"
+#include "ash/common/wm/overview/scoped_transform_overview_window.h"
+#include "ash/common/wm/overview/window_grid.h"
+#include "ash/common/wm/overview/window_selector.h"
+#include "ash/common/wm/overview/window_selector_controller.h"
+#include "ash/common/wm/overview/window_selector_item.h"
+#include "ash/common/wm/panels/panel_layout_manager.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_event.h"
+#include "ash/common/wm/workspace/workspace_window_resizer.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/drag_drop/drag_drop_controller.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/shelf_widget.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/system/tray/system_tray.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/shelf_view_test_api.h"
#include "ash/test/shell_test_api.h"
#include "ash/test/test_app_list_view_presenter_impl.h"
-#include "ash/test/test_shelf_delegate.h"
-#include "ash/wm/dock/docked_window_layout_manager.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
-#include "ash/wm/mru_window_tracker.h"
-#include "ash/wm/overview/scoped_transform_overview_window.h"
-#include "ash/wm/overview/window_grid.h"
-#include "ash/wm/overview/window_selector.h"
-#include "ash/wm/overview/window_selector_controller.h"
-#include "ash/wm/overview/window_selector_item.h"
-#include "ash/wm/panels/panel_layout_manager.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
-#include "ash/wm/wm_event.h"
-#include "ash/wm/workspace/workspace_window_resizer.h"
#include "base/command_line.h"
#include "base/compiler_specific.h"
#include "base/memory/ptr_util.h"
diff --git a/ash/wm/panels/attached_panel_window_targeter.cc b/ash/wm/panels/attached_panel_window_targeter.cc
index d7f50a6c..6380b44 100644
--- a/ash/wm/panels/attached_panel_window_targeter.cc
+++ b/ash/wm/panels/attached_panel_window_targeter.cc
@@ -4,10 +4,10 @@
#include "ash/wm/panels/attached_panel_window_targeter.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/wm/panels/panel_layout_manager.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
-#include "ash/shelf/wm_shelf.h"
-#include "ash/wm/panels/panel_layout_manager.h"
#include "ui/aura/window.h"
namespace ash {
diff --git a/ash/wm/panels/panel_layout_manager_unittest.cc b/ash/wm/panels/panel_layout_manager_unittest.cc
index f5c66c3..05bb294 100644
--- a/ash/wm/panels/panel_layout_manager_unittest.cc
+++ b/ash/wm/panels/panel_layout_manager_unittest.cc
@@ -2,27 +2,27 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/panels/panel_layout_manager.h"
+#include "ash/common/wm/panels/panel_layout_manager.h"
+#include "ash/common/shelf/shelf_button.h"
+#include "ash/common/shelf/shelf_layout_manager.h"
+#include "ash/common/shelf/shelf_model.h"
+#include "ash/common/shelf/shelf_view.h"
+#include "ash/common/shelf/shelf_widget.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/test/test_shelf_delegate.h"
+#include "ash/common/wm/mru_window_tracker.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shelf_types.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/shelf_button.h"
-#include "ash/shelf/shelf_layout_manager.h"
-#include "ash/shelf/shelf_model.h"
-#include "ash/shelf/shelf_view.h"
-#include "ash/shelf/shelf_widget.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/system/web_notification/web_notification_tray.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/shelf_view_test_api.h"
-#include "ash/test/test_shelf_delegate.h"
-#include "ash/wm/mru_window_tracker.h"
#include "ash/wm/window_properties.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
#include "base/command_line.h"
diff --git a/ash/wm/panels/panel_window_event_handler.cc b/ash/wm/panels/panel_window_event_handler.cc
index 7736eac..8cb9301 100644
--- a/ash/wm/panels/panel_window_event_handler.cc
+++ b/ash/wm/panels/panel_window_event_handler.cc
@@ -4,8 +4,8 @@
#include "ash/wm/panels/panel_window_event_handler.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ui/aura/window.h"
#include "ui/aura/window_delegate.h"
diff --git a/ash/wm/panels/panel_window_resizer_unittest.cc b/ash/wm/panels/panel_window_resizer_unittest.cc
index 5242a1a..f81bd502 100644
--- a/ash/wm/panels/panel_window_resizer_unittest.cc
+++ b/ash/wm/panels/panel_window_resizer_unittest.cc
@@ -2,27 +2,27 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/panels/panel_window_resizer.h"
+#include "ash/common/wm/panels/panel_window_resizer.h"
+#include "ash/common/shelf/shelf_layout_manager.h"
+#include "ash/common/shelf/shelf_model.h"
+#include "ash/common/shelf/shelf_widget.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/test/test_shelf_delegate.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_event.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shelf_types.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/public/cpp/window_properties.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/shelf_layout_manager.h"
-#include "ash/shelf/shelf_model.h"
-#include "ash/shelf/shelf_widget.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/cursor_manager_test_api.h"
-#include "ash/test/test_shelf_delegate.h"
#include "ash/wm/drag_window_resizer.h"
#include "ash/wm/window_properties.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
-#include "ash/wm/wm_event.h"
#include "base/i18n/rtl.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/window_event_dispatcher.h"
diff --git a/ash/wm/power_button_controller.cc b/ash/wm/power_button_controller.cc
index 0f88c8dc..6fc2e40 100644
--- a/ash/wm/power_button_controller.cc
+++ b/ash/wm/power_button_controller.cc
@@ -4,9 +4,10 @@
#include "ash/wm/power_button_controller.h"
-#include "ash/accelerators/accelerator_controller.h"
+#include "ash/common/accelerators/accelerator_controller.h"
#include "ash/common/ash_switches.h"
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/shell.h"
@@ -14,7 +15,6 @@
#include "ash/system/power/tablet_power_button_controller.h"
#include "ash/system/tray/system_tray.h"
#include "ash/wm/lock_state_controller.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/wm/session_state_animator.h"
#include "base/command_line.h"
#include "chromeos/audio/cras_audio_handler.h"
diff --git a/ash/wm/resize_handle_window_targeter.cc b/ash/wm/resize_handle_window_targeter.cc
index 2ee505e1..3f81c73 100644
--- a/ash/wm/resize_handle_window_targeter.cc
+++ b/ash/wm/resize_handle_window_targeter.cc
@@ -5,8 +5,8 @@
#include "ash/wm/resize_handle_window_targeter.h"
#include "ash/common/ash_constants.h"
+#include "ash/common/wm/window_state.h"
#include "ash/shared/immersive_fullscreen_controller.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ui/aura/window.h"
#include "ui/events/event.h"
diff --git a/ash/wm/resize_handle_window_targeter.h b/ash/wm/resize_handle_window_targeter.h
index eec6930..33478c3 100644
--- a/ash/wm/resize_handle_window_targeter.h
+++ b/ash/wm/resize_handle_window_targeter.h
@@ -5,7 +5,7 @@
#ifndef ASH_WM_RESIZE_HANDLE_WINDOW_TARGETER_H_
#define ASH_WM_RESIZE_HANDLE_WINDOW_TARGETER_H_
-#include "ash/wm/window_state_observer.h"
+#include "ash/common/wm/window_state_observer.h"
#include "base/macros.h"
#include "ui/aura/window_observer.h"
#include "ui/aura/window_targeter.h"
diff --git a/ash/wm/resize_shadow_and_cursor_unittest.cc b/ash/wm/resize_shadow_and_cursor_unittest.cc
index 8c951e2..44de897 100644
--- a/ash/wm/resize_shadow_and_cursor_unittest.cc
+++ b/ash/wm/resize_shadow_and_cursor_unittest.cc
@@ -3,13 +3,13 @@
// found in the LICENSE file.
#include "ash/common/ash_constants.h"
-#include "ash/frame/custom_frame_view_ash.h"
+#include "ash/common/frame/custom_frame_view_ash.h"
+#include "ash/common/wm/window_state.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/cursor_manager_test_api.h"
#include "ash/wm/resize_shadow.h"
#include "ash/wm/resize_shadow_controller.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "base/bind.h"
#include "ui/aura/window_event_dispatcher.h"
diff --git a/ash/wm/screen_dimmer_unittest.cc b/ash/wm/screen_dimmer_unittest.cc
index 3591a17..709886f 100644
--- a/ash/wm/screen_dimmer_unittest.cc
+++ b/ash/wm/screen_dimmer_unittest.cc
@@ -2,17 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/screen_dimmer.h"
+#include "ash/common/wm/screen_dimmer.h"
#include <memory>
+#include "ash/common/wm/window_dimmer.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/common/wm_window_user_data.h"
#include "ash/root_window_controller.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
-#include "ash/wm/window_dimmer.h"
#include "base/memory/ptr_util.h"
#include "ui/aura/test/test_windows.h"
#include "ui/compositor/layer.h"
diff --git a/ash/wm/screen_pinning_controller.cc b/ash/wm/screen_pinning_controller.cc
index 3573c809..72147115 100644
--- a/ash/wm/screen_pinning_controller.cc
+++ b/ash/wm/screen_pinning_controller.cc
@@ -7,14 +7,14 @@
#include <algorithm>
#include <vector>
+#include "ash/common/wm/container_finder.h"
+#include "ash/common/wm/window_dimmer.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/common/wm_window_user_data.h"
#include "ash/display/window_tree_host_manager.h"
#include "ash/public/cpp/shell_window_ids.h"
-#include "ash/wm/container_finder.h"
-#include "ash/wm/window_dimmer.h"
-#include "ash/wm/window_state.h"
#include "base/auto_reset.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
diff --git a/ash/wm/screen_pinning_controller_unittest.cc b/ash/wm/screen_pinning_controller_unittest.cc
index 5e8019e..590f4941 100644
--- a/ash/wm/screen_pinning_controller_unittest.cc
+++ b/ash/wm/screen_pinning_controller_unittest.cc
@@ -6,13 +6,13 @@
#include <vector>
-#include "ash/accelerators/accelerator_controller.h"
+#include "ash/common/accelerators/accelerator_controller.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_event.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/test/ash_test_base.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_util.h"
-#include "ash/wm/wm_event.h"
#include "base/stl_util.h"
#include "ui/aura/window.h"
diff --git a/ash/wm/session_state_animator_impl.cc b/ash/wm/session_state_animator_impl.cc
index d205155..c0be930 100644
--- a/ash/wm/session_state_animator_impl.cc
+++ b/ash/wm/session_state_animator_impl.cc
@@ -6,9 +6,9 @@
#include <vector>
+#include "ash/common/wm/wm_window_animations.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/shell.h"
-#include "ash/wm/wm_window_animations.h"
#include "base/memory/ptr_util.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/window_event_dispatcher.h"
diff --git a/ash/wm/stacking_controller.cc b/ash/wm/stacking_controller.cc
index fdb63c9..723265d 100644
--- a/ash/wm/stacking_controller.cc
+++ b/ash/wm/stacking_controller.cc
@@ -4,8 +4,8 @@
#include "ash/wm/stacking_controller.h"
+#include "ash/common/wm/container_finder.h"
#include "ash/common/wm_window.h"
-#include "ash/wm/container_finder.h"
namespace ash {
diff --git a/ash/wm/system_gesture_event_filter_unittest.cc b/ash/wm/system_gesture_event_filter_unittest.cc
index 9994436..e5764a8 100644
--- a/ash/wm/system_gesture_event_filter_unittest.cc
+++ b/ash/wm/system_gesture_event_filter_unittest.cc
@@ -6,15 +6,15 @@
#include <vector>
-#include "ash/accelerators/accelerator_controller.h"
+#include "ash/common/accelerators/accelerator_controller.h"
+#include "ash/common/shelf/shelf_model.h"
+#include "ash/common/wm/window_positioning_utils.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_window.h"
-#include "ash/shelf/shelf_model.h"
#include "ash/shell.h"
#include "ash/system/tray/system_tray_delegate.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/shell_test_api.h"
-#include "ash/wm/window_positioning_utils.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "base/time/time.h"
#include "base/timer/timer.h"
diff --git a/ash/wm/system_modal_container_layout_manager_unittest.cc b/ash/wm/system_modal_container_layout_manager_unittest.cc
index 3669016d..ede38a7 100644
--- a/ash/wm/system_modal_container_layout_manager_unittest.cc
+++ b/ash/wm/system_modal_container_layout_manager_unittest.cc
@@ -2,18 +2,18 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/system_modal_container_layout_manager.h"
+#include "ash/common/wm/system_modal_container_layout_manager.h"
#include <memory>
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/wm/container_finder.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
-#include "ash/wm/container_finder.h"
#include "ash/wm/window_util.h"
#include "base/command_line.h"
#include "base/compiler_specific.h"
diff --git a/ash/wm/toplevel_window_event_handler.cc b/ash/wm/toplevel_window_event_handler.cc
index 04584c3f..fee1c16 100644
--- a/ash/wm/toplevel_window_event_handler.cc
+++ b/ash/wm/toplevel_window_event_handler.cc
@@ -4,9 +4,9 @@
#include "ash/wm/toplevel_window_event_handler.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_window.h"
#include "ash/shell.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
diff --git a/ash/wm/toplevel_window_event_handler.h b/ash/wm/toplevel_window_event_handler.h
index 7a2bf45..171b174f 100644
--- a/ash/wm/toplevel_window_event_handler.h
+++ b/ash/wm/toplevel_window_event_handler.h
@@ -6,8 +6,8 @@
#define ASH_WM_TOPLEVEL_WINDOW_EVENT_HANDLER_H_
#include "ash/ash_export.h"
-#include "ash/wm/wm_toplevel_window_event_handler.h"
-#include "ash/wm/wm_types.h"
+#include "ash/common/wm/wm_toplevel_window_event_handler.h"
+#include "ash/common/wm/wm_types.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "ui/events/event_handler.h"
diff --git a/ash/wm/toplevel_window_event_handler_unittest.cc b/ash/wm/toplevel_window_event_handler_unittest.cc
index f2d3655..3581f69 100644
--- a/ash/wm/toplevel_window_event_handler_unittest.cc
+++ b/ash/wm/toplevel_window_event_handler_unittest.cc
@@ -4,6 +4,9 @@
#include "ash/wm/toplevel_window_event_handler.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_event.h"
+#include "ash/common/wm/workspace_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
@@ -11,11 +14,8 @@
#include "ash/test/ash_test_base.h"
#include "ash/wm/resize_shadow.h"
#include "ash/wm/resize_shadow_controller.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
-#include "ash/wm/wm_event.h"
-#include "ash/wm/workspace_controller.h"
#include "base/compiler_specific.h"
#include "base/threading/thread_task_runner_handle.h"
#include "services/ui/public/interfaces/window_manager_constants.mojom.h"
diff --git a/ash/wm/video_detector.cc b/ash/wm/video_detector.cc
index 8cac55f..18d9704 100644
--- a/ash/wm/video_detector.cc
+++ b/ash/wm/video_detector.cc
@@ -4,11 +4,11 @@
#include "ash/wm/video_detector.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/shell.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ui/aura/env.h"
#include "ui/aura/window.h"
diff --git a/ash/wm/video_detector_unittest.cc b/ash/wm/video_detector_unittest.cc
index 5894269..33a5c95 100644
--- a/ash/wm/video_detector_unittest.cc
+++ b/ash/wm/video_detector_unittest.cc
@@ -7,11 +7,11 @@
#include <deque>
#include <memory>
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_event.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
-#include "ash/wm/wm_event.h"
#include "base/compiler_specific.h"
#include "base/time/time.h"
#include "third_party/skia/include/core/SkColor.h"
diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc
index 048aa95..c36a0c6 100644
--- a/ash/wm/window_animations.cc
+++ b/ash/wm/window_animations.cc
@@ -9,11 +9,11 @@
#include <utility>
#include <vector>
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/wm/window_animation_types.h"
+#include "ash/common/wm/workspace_controller.h"
#include "ash/common/wm_window.h"
-#include "ash/shelf/wm_shelf.h"
-#include "ash/wm/window_animation_types.h"
#include "ash/wm/window_util.h"
-#include "ash/wm/workspace_controller.h"
#include "base/i18n/rtl.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
diff --git a/ash/wm/window_animations_unittest.cc b/ash/wm/window_animations_unittest.cc
index a95d5f9e..69df3bf 100644
--- a/ash/wm/window_animations_unittest.cc
+++ b/ash/wm/window_animations_unittest.cc
@@ -4,12 +4,12 @@
#include "ash/wm/window_animations.h"
+#include "ash/common/wm/window_animation_types.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/workspace_controller.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/test/ash_test_base.h"
-#include "ash/wm/window_animation_types.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
-#include "ash/wm/workspace_controller.h"
#include "base/time/time.h"
#include "ui/aura/test/test_windows.h"
#include "ui/aura/window.h"
diff --git a/ash/wm/window_cycle_controller_unittest.cc b/ash/wm/window_cycle_controller_unittest.cc
index 7e8546376..8504f88 100644
--- a/ash/wm/window_cycle_controller_unittest.cc
+++ b/ash/wm/window_cycle_controller_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/window_cycle_controller.h"
+#include "ash/common/wm/window_cycle_controller.h"
#include <algorithm>
#include <memory>
@@ -10,22 +10,22 @@
#include "ash/common/focus_cycler.h"
#include "ash/common/scoped_root_window_for_new_windows.h"
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/shelf/shelf_widget.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/test/test_shelf_delegate.h"
+#include "ash/common/wm/window_cycle_list.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_event.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
-#include "ash/shelf/shelf_widget.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/shelf_view_test_api.h"
#include "ash/test/test_app_list_view_presenter_impl.h"
-#include "ash/test/test_shelf_delegate.h"
#include "ash/test/test_shell_delegate.h"
-#include "ash/wm/window_cycle_list.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
-#include "ash/wm/wm_event.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/client/screen_position_client.h"
#include "ui/aura/env.h"
diff --git a/ash/wm/window_cycle_event_filter_aura.cc b/ash/wm/window_cycle_event_filter_aura.cc
index 9af1c1c..77ec193 100644
--- a/ash/wm/window_cycle_event_filter_aura.cc
+++ b/ash/wm/window_cycle_event_filter_aura.cc
@@ -4,11 +4,11 @@
#include "ash/wm/window_cycle_event_filter_aura.h"
-#include "ash/accelerators/debug_commands.h"
+#include "ash/common/accelerators/debug_commands.h"
+#include "ash/common/wm/window_cycle_controller.h"
+#include "ash/common/wm/window_cycle_list.h"
#include "ash/common/wm_shell.h"
#include "ash/shell.h"
-#include "ash/wm/window_cycle_controller.h"
-#include "ash/wm/window_cycle_list.h"
#include "ui/events/event.h"
namespace ash {
diff --git a/ash/wm/window_cycle_event_filter_aura.h b/ash/wm/window_cycle_event_filter_aura.h
index 3cec0ce..eb567f6 100644
--- a/ash/wm/window_cycle_event_filter_aura.h
+++ b/ash/wm/window_cycle_event_filter_aura.h
@@ -5,7 +5,7 @@
#ifndef ASH_WM_WINDOW_CYCLE_EVENT_FILTER_AURA_H_
#define ASH_WM_WINDOW_CYCLE_EVENT_FILTER_AURA_H_
-#include "ash/wm/window_cycle_event_filter.h"
+#include "ash/common/wm/window_cycle_event_filter.h"
#include "base/macros.h"
#include "base/timer/timer.h"
#include "ui/events/event_handler.h"
diff --git a/ash/wm/window_mirror_view.cc b/ash/wm/window_mirror_view.cc
index 16f19bf..94dd847 100644
--- a/ash/wm/window_mirror_view.cc
+++ b/ash/wm/window_mirror_view.cc
@@ -4,8 +4,8 @@
#include "ash/wm/window_mirror_view.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_window.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/window.h"
diff --git a/ash/wm/window_positioner_unittest.cc b/ash/wm/window_positioner_unittest.cc
index 7c5353b31..2bda5d7 100644
--- a/ash/wm/window_positioner_unittest.cc
+++ b/ash/wm/window_positioner_unittest.cc
@@ -2,19 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/window_positioner.h"
+#include "ash/common/wm/window_positioner.h"
#include <string>
#include "ash/common/scoped_root_window_for_new_windows.h"
+#include "ash/common/wm/window_positioner.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/shell.h"
#include "ash/shell/toplevel_window.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/test_shell_delegate.h"
-#include "ash/wm/window_positioner.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "base/strings/string_number_conversions.h"
#include "ui/display/screen.h"
diff --git a/ash/wm/window_properties.cc b/ash/wm/window_properties.cc
index dc0ac72..f6f8e41a2 100644
--- a/ash/wm/window_properties.cc
+++ b/ash/wm/window_properties.cc
@@ -4,7 +4,7 @@
#include "ash/wm/window_properties.h"
-#include "ash/wm/window_state.h"
+#include "ash/common/wm/window_state.h"
DECLARE_UI_CLASS_PROPERTY_TYPE(ash::wm::WindowState*);
DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(ASH_EXPORT, ash::WidgetCreationType);
diff --git a/ash/wm/window_properties.h b/ash/wm/window_properties.h
index 4733412..561f18b 100644
--- a/ash/wm/window_properties.h
+++ b/ash/wm/window_properties.h
@@ -8,7 +8,7 @@
#include <stdint.h>
#include "ash/ash_export.h"
-#include "ash/shelf/shelf_item_types.h"
+#include "ash/common/shelf/shelf_item_types.h"
#include "ui/base/class_property.h"
#include "ui/base/ui_base_types.h"
#include "ui/gfx/geometry/rect.h"
diff --git a/ash/wm/window_state_aura.cc b/ash/wm/window_state_aura.cc
index 4e3d923..c2ae3d6a 100644
--- a/ash/wm/window_state_aura.cc
+++ b/ash/wm/window_state_aura.cc
@@ -4,9 +4,9 @@
#include "ash/wm/window_state_aura.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_window.h"
#include "ash/wm/window_properties.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_util.h"
#include "ui/aura/window.h"
diff --git a/ash/wm/window_state_unittest.cc b/ash/wm/window_state_unittest.cc
index 6168dbab..b04883c 100644
--- a/ash/wm/window_state_unittest.cc
+++ b/ash/wm/window_state_unittest.cc
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/window_state.h"
+#include "ash/common/wm/window_state.h"
#include <utility>
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/window_state_util.h"
+#include "ash/common/wm/wm_event.h"
#include "ash/test/ash_test_base.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
-#include "ash/wm/window_state_util.h"
#include "ash/wm/window_util.h"
-#include "ash/wm/wm_event.h"
#include "services/ui/public/interfaces/window_manager_constants.mojom.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/test/test_window_delegate.h"
diff --git a/ash/wm/window_util.cc b/ash/wm/window_util.cc
index 5d833c7a..d4cf8ab 100644
--- a/ash/wm/window_util.cc
+++ b/ash/wm/window_util.cc
@@ -7,15 +7,15 @@
#include <vector>
#include "ash/common/ash_constants.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_event.h"
+#include "ash/common/wm/wm_screen_util.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/root_window_controller.h"
#include "ash/shell.h"
#include "ash/wm/window_properties.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
-#include "ash/wm/wm_event.h"
-#include "ash/wm/wm_screen_util.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/window.h"
#include "ui/aura/window_delegate.h"
diff --git a/ash/wm/window_util_unittest.cc b/ash/wm/window_util_unittest.cc
index 3be9969..5811818 100644
--- a/ash/wm/window_util_unittest.cc
+++ b/ash/wm/window_util_unittest.cc
@@ -4,10 +4,10 @@
#include "ash/wm/window_util.h"
+#include "ash/common/wm/window_positioning_utils.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_window.h"
#include "ash/test/ash_test_base.h"
-#include "ash/wm/window_positioning_utils.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ui/aura/window.h"
#include "ui/display/manager/display_manager.h"
diff --git a/ash/wm/workspace/magnetism_matcher_unittest.cc b/ash/wm/workspace/magnetism_matcher_unittest.cc
index e3124e3..c9c1c12b 100644
--- a/ash/wm/workspace/magnetism_matcher_unittest.cc
+++ b/ash/wm/workspace/magnetism_matcher_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/workspace/magnetism_matcher.h"
+#include "ash/common/wm/workspace/magnetism_matcher.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/ash/wm/workspace/multi_window_resize_controller_unittest.cc b/ash/wm/workspace/multi_window_resize_controller_unittest.cc
index 0df8682..6fd0a13 100644
--- a/ash/wm/workspace/multi_window_resize_controller_unittest.cc
+++ b/ash/wm/workspace/multi_window_resize_controller_unittest.cc
@@ -2,17 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/workspace/multi_window_resize_controller.h"
+#include "ash/common/wm/workspace/multi_window_resize_controller.h"
#include "ash/common/ash_constants.h"
+#include "ash/common/frame/custom_frame_view_ash.h"
+#include "ash/common/test/workspace_event_handler_test_helper.h"
+#include "ash/common/wm/workspace_controller.h"
#include "ash/common/wm_window.h"
-#include "ash/frame/custom_frame_view_ash.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/shell_test_api.h"
-#include "ash/test/workspace_event_handler_test_helper.h"
#include "ash/wm/window_util.h"
-#include "ash/wm/workspace_controller.h"
#include "ash/wm/workspace_controller_test_helper.h"
#include "base/stl_util.h"
#include "ui/aura/test/test_window_delegate.h"
diff --git a/ash/wm/workspace/workspace_event_handler_aura.h b/ash/wm/workspace/workspace_event_handler_aura.h
index 28fcae58..a8e084d 100644
--- a/ash/wm/workspace/workspace_event_handler_aura.h
+++ b/ash/wm/workspace/workspace_event_handler_aura.h
@@ -5,7 +5,7 @@
#ifndef ASH_WM_WORKSPACE_WORKSPACE_EVENT_HANDLER_AURA_H_
#define ASH_WM_WORKSPACE_WORKSPACE_EVENT_HANDLER_AURA_H_
-#include "ash/wm/workspace/workspace_event_handler.h"
+#include "ash/common/wm/workspace/workspace_event_handler.h"
#include "base/macros.h"
#include "ui/events/event_handler.h"
diff --git a/ash/wm/workspace/workspace_event_handler_unittest.cc b/ash/wm/workspace/workspace_event_handler_unittest.cc
index 17fc85c..249c9c3c 100644
--- a/ash/wm/workspace/workspace_event_handler_unittest.cc
+++ b/ash/wm/workspace/workspace_event_handler_unittest.cc
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/workspace/workspace_event_handler.h"
+#include "ash/common/wm/workspace/workspace_event_handler.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_event.h"
+#include "ash/common/wm/workspace_controller.h"
#include "ash/screen_util.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
-#include "ash/wm/wm_event.h"
-#include "ash/wm/workspace_controller.h"
#include "ash/wm/workspace_controller_test_helper.h"
#include "base/threading/thread_task_runner_handle.h"
#include "services/ui/public/interfaces/window_manager_constants.mojom.h"
diff --git a/ash/wm/workspace/workspace_layout_manager_keyboard_unittest.cc b/ash/wm/workspace/workspace_layout_manager_keyboard_unittest.cc
index d36493cc..d19b6718 100644
--- a/ash/wm/workspace/workspace_layout_manager_keyboard_unittest.cc
+++ b/ash/wm/workspace/workspace_layout_manager_keyboard_unittest.cc
@@ -2,28 +2,28 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/workspace/workspace_layout_manager.h"
+#include "ash/common/wm/workspace/workspace_layout_manager.h"
#include <string>
#include <utility>
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/shelf/shelf_constants.h"
+#include "ash/common/shelf/shelf_layout_manager.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/shell_observer.h"
+#include "ash/common/test/ash_test.h"
+#include "ash/common/wm/fullscreen_window_finder.h"
+#include "ash/common/wm/maximize_mode/workspace_backdrop_delegate.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_event.h"
+#include "ash/common/wm/wm_screen_util.h"
+#include "ash/common/wm/workspace/workspace_window_resizer.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/shelf_constants.h"
-#include "ash/shelf/shelf_layout_manager.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
-#include "ash/test/ash_test.h"
-#include "ash/wm/fullscreen_window_finder.h"
-#include "ash/wm/maximize_mode/workspace_backdrop_delegate.h"
-#include "ash/wm/window_state.h"
-#include "ash/wm/wm_event.h"
-#include "ash/wm/wm_screen_util.h"
-#include "ash/wm/workspace/workspace_window_resizer.h"
#include "base/command_line.h"
#include "ui/base/ui_base_switches.h"
#include "ui/base/ui_base_types.h"
diff --git a/ash/wm/workspace/workspace_window_resizer_unittest.cc b/ash/wm/workspace/workspace_window_resizer_unittest.cc
index 992bf67c..8979daa14 100644
--- a/ash/wm/workspace/workspace_window_resizer_unittest.cc
+++ b/ash/wm/workspace/workspace_window_resizer_unittest.cc
@@ -2,24 +2,24 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/workspace/workspace_window_resizer.h"
+#include "ash/common/wm/workspace/workspace_window_resizer.h"
#include "ash/common/ash_switches.h"
+#include "ash/common/shelf/shelf_constants.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/wm/window_positioning_utils.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_event.h"
+#include "ash/common/wm/workspace/phantom_window_controller.h"
+#include "ash/common/wm/workspace_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/screen_util.h"
-#include "ash/shelf/shelf_constants.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
-#include "ash/wm/window_positioning_utils.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
-#include "ash/wm/wm_event.h"
-#include "ash/wm/workspace/phantom_window_controller.h"
-#include "ash/wm/workspace_controller.h"
#include "base/command_line.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
diff --git a/ash/wm/workspace_controller_test_helper.cc b/ash/wm/workspace_controller_test_helper.cc
index a0c704f8..5ecb0d0 100644
--- a/ash/wm/workspace_controller_test_helper.cc
+++ b/ash/wm/workspace_controller_test_helper.cc
@@ -4,8 +4,8 @@
#include "ash/wm/workspace_controller_test_helper.h"
-#include "ash/test/workspace_event_handler_test_helper.h"
-#include "ash/wm/workspace_controller.h"
+#include "ash/common/test/workspace_event_handler_test_helper.h"
+#include "ash/common/wm/workspace_controller.h"
#include "ui/aura/window.h"
namespace ash {
diff --git a/ash/wm/workspace_controller_test_helper.h b/ash/wm/workspace_controller_test_helper.h
index a5aeb44..f5d6e6a 100644
--- a/ash/wm/workspace_controller_test_helper.h
+++ b/ash/wm/workspace_controller_test_helper.h
@@ -5,7 +5,7 @@
#ifndef ASH_WM_WORKSPACE_CONTROLLER_TEST_HELPER_H_
#define ASH_WM_WORKSPACE_CONTROLLER_TEST_HELPER_H_
-#include "ash/wm/workspace_controller.h"
+#include "ash/common/wm/workspace_controller.h"
#include "base/macros.h"
namespace ash {
diff --git a/ash/wm/workspace_controller_unittest.cc b/ash/wm/workspace_controller_unittest.cc
index 50c4c4c12..669a5b8 100644
--- a/ash/wm/workspace_controller_unittest.cc
+++ b/ash/wm/workspace_controller_unittest.cc
@@ -2,29 +2,29 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/workspace_controller.h"
+#include "ash/common/wm/workspace_controller.h"
#include <map>
#include "ash/common/session/session_controller.h"
+#include "ash/common/shelf/shelf_layout_manager.h"
+#include "ash/common/shelf/shelf_widget.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/test/test_shelf_delegate.h"
+#include "ash/common/wm/panels/panel_layout_manager.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_event.h"
+#include "ash/common/wm/workspace/workspace_window_resizer.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/screen_util.h"
-#include "ash/shelf/shelf_layout_manager.h"
-#include "ash/shelf/shelf_widget.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/system/status_area_widget.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/shell_test_api.h"
-#include "ash/test/test_shelf_delegate.h"
-#include "ash/wm/panels/panel_layout_manager.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
-#include "ash/wm/wm_event.h"
-#include "ash/wm/workspace/workspace_window_resizer.h"
#include "base/strings/string_number_conversions.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/test/test_window_delegate.h"
diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager.cc b/chrome/browser/chromeos/accessibility/accessibility_manager.cc
index 198fc23..23b1832 100644
--- a/chrome/browser/chromeos/accessibility/accessibility_manager.cc
+++ b/chrome/browser/chromeos/accessibility/accessibility_manager.cc
@@ -13,12 +13,12 @@
#include "ash/autoclick/autoclick_controller.h"
#include "ash/autoclick/mus/public/interfaces/autoclick.mojom.h"
#include "ash/common/ash_constants.h"
+#include "ash/common/shelf/shelf_layout_manager.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/high_contrast/high_contrast_controller.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/shelf_layout_manager.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/sticky_keys/sticky_keys_controller.h"
#include "base/callback.h"
diff --git a/chrome/browser/chromeos/accessibility/chromevox_panel.cc b/chrome/browser/chromeos/accessibility/chromevox_panel.cc
index 5a008416..abfc07aa 100644
--- a/chrome/browser/chromeos/accessibility/chromevox_panel.cc
+++ b/chrome/browser/chromeos/accessibility/chromevox_panel.cc
@@ -3,11 +3,11 @@
// found in the LICENSE file.
#include "ash/common/accessibility_types.h"
+#include "ash/common/shelf/shelf_layout_manager.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/shelf_layout_manager.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "base/macros.h"
#include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
diff --git a/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc b/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc
index fea2d160..50de62e 100644
--- a/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc
+++ b/chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc
@@ -4,8 +4,8 @@
#include <queue>
-#include "ash/accelerators/accelerator_controller.h"
-#include "ash/accelerators/accelerator_table.h"
+#include "ash/common/accelerators/accelerator_controller.h"
+#include "ash/common/accelerators/accelerator_table.h"
#include "ash/common/accessibility_types.h"
#include "ash/common/wm_shell.h"
#include "ash/shell.h"
diff --git a/chrome/browser/chromeos/arc/arc_play_store_enabled_preference_handler.cc b/chrome/browser/chromeos/arc/arc_play_store_enabled_preference_handler.cc
index 342d4ba..4e8a5eba 100644
--- a/chrome/browser/chromeos/arc/arc_play_store_enabled_preference_handler.cc
+++ b/chrome/browser/chromeos/arc/arc_play_store_enabled_preference_handler.cc
@@ -4,8 +4,8 @@
#include "chrome/browser/chromeos/arc/arc_play_store_enabled_preference_handler.h"
+#include "ash/common/shelf/shelf_delegate.h"
#include "ash/common/wm_shell.h"
-#include "ash/shelf/shelf_delegate.h"
#include "base/bind.h"
#include "base/command_line.h"
#include "base/logging.h"
diff --git a/chrome/browser/chromeos/arc/arc_session_manager.cc b/chrome/browser/chromeos/arc/arc_session_manager.cc
index 5d8b8603..f82e67c 100644
--- a/chrome/browser/chromeos/arc/arc_session_manager.cc
+++ b/chrome/browser/chromeos/arc/arc_session_manager.cc
@@ -6,8 +6,8 @@
#include <utility>
+#include "ash/common/shelf/shelf_delegate.h"
#include "ash/common/wm_shell.h"
-#include "ash/shelf/shelf_delegate.h"
#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/command_line.h"
diff --git a/chrome/browser/chromeos/background/ash_wallpaper_delegate.cc b/chrome/browser/chromeos/background/ash_wallpaper_delegate.cc
index 765df3e..78010610 100644
--- a/chrome/browser/chromeos/background/ash_wallpaper_delegate.cc
+++ b/chrome/browser/chromeos/background/ash_wallpaper_delegate.cc
@@ -5,8 +5,8 @@
#include "chrome/browser/chromeos/background/ash_wallpaper_delegate.h"
#include "ash/common/wallpaper/wallpaper_delegate.h"
+#include "ash/common/wm/window_animation_types.h"
#include "ash/shell.h"
-#include "ash/wm/window_animation_types.h"
#include "ash/wm/window_animations.h"
#include "base/command_line.h"
#include "base/logging.h"
diff --git a/chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.cc b/chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.cc
index cf01c24..5ab6c10c 100644
--- a/chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.cc
+++ b/chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.cc
@@ -4,8 +4,8 @@
#include "chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.h"
+#include "ash/common/wm/screen_dimmer.h"
#include "ash/shell.h"
-#include "ash/wm/screen_dimmer.h"
#include "base/memory/ptr_util.h"
#include "ui/base/user_activity/user_activity_detector.h"
#include "ui/display/manager/chromeos/display_configurator.h"
diff --git a/chrome/browser/chromeos/display/display_preferences_unittest.cc b/chrome/browser/chromeos/display/display_preferences_unittest.cc
index f28681f..d9b080d 100644
--- a/chrome/browser/chromeos/display/display_preferences_unittest.cc
+++ b/chrome/browser/chromeos/display/display_preferences_unittest.cc
@@ -10,6 +10,7 @@
#include <utility>
#include <vector>
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/display/display_util.h"
#include "ash/display/json_converter.h"
@@ -18,7 +19,6 @@
#include "ash/display/window_tree_host_manager.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
diff --git a/chrome/browser/chromeos/events/event_rewriter.cc b/chrome/browser/chromeos/events/event_rewriter.cc
index 62431c3..5a68721 100644
--- a/chrome/browser/chromeos/events/event_rewriter.cc
+++ b/chrome/browser/chromeos/events/event_rewriter.cc
@@ -8,8 +8,8 @@
#include <vector>
+#include "ash/common/wm/window_state.h"
#include "ash/sticky_keys/sticky_keys_controller.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_util.h"
#include "base/command_line.h"
#include "base/logging.h"
diff --git a/chrome/browser/chromeos/events/event_rewriter_unittest.cc b/chrome/browser/chromeos/events/event_rewriter_unittest.cc
index d7a2ff2..da755cd 100644
--- a/chrome/browser/chromeos/events/event_rewriter_unittest.cc
+++ b/chrome/browser/chromeos/events/event_rewriter_unittest.cc
@@ -6,11 +6,11 @@
#include <vector>
+#include "ash/common/wm/window_state.h"
#include "ash/shell.h"
#include "ash/sticky_keys/sticky_keys_controller.h"
#include "ash/sticky_keys/sticky_keys_overlay.h"
#include "ash/test/ash_test_base.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "base/command_line.h"
#include "base/macros.h"
diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
index fbf1e9d..c9eac15 100644
--- a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
+++ b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc
@@ -11,11 +11,11 @@
#include <utility>
#include <vector>
+#include "ash/common/wm/mru_window_tracker.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/shell.h"
-#include "ash/wm/mru_window_tracker.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
#include "base/command_line.h"
diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc
index a7014fc..0d2eec4e 100644
--- a/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc
+++ b/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc
@@ -6,8 +6,8 @@
#include <memory>
+#include "ash/common/wm/window_state.h"
#include "ash/test/ash_test_base.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "base/command_line.h"
#include "base/macros.h"
diff --git a/chrome/browser/chromeos/first_run/steps/tray_step.cc b/chrome/browser/chromeos/first_run/steps/tray_step.cc
index 53e59d9..e232d32 100644
--- a/chrome/browser/chromeos/first_run/steps/tray_step.cc
+++ b/chrome/browser/chromeos/first_run/steps/tray_step.cc
@@ -4,9 +4,9 @@
#include "chrome/browser/chromeos/first_run/steps/tray_step.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wm_shell.h"
#include "ash/first_run/first_run_helper.h"
-#include "ash/shelf/wm_shelf.h"
#include "base/i18n/rtl.h"
#include "chrome/browser/chromeos/first_run/step_names.h"
#include "chrome/browser/ui/webui/chromeos/first_run/first_run_actor.h"
diff --git a/chrome/browser/chromeos/login/lock/screen_locker.cc b/chrome/browser/chromeos/login/lock/screen_locker.cc
index 198e31b..9e6b0fc 100644
--- a/chrome/browser/chromeos/login/lock/screen_locker.cc
+++ b/chrome/browser/chromeos/login/lock/screen_locker.cc
@@ -8,13 +8,13 @@
#include <vector>
#include "ash/common/wallpaper/wallpaper_controller.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_event.h"
#include "ash/common/wm_shell.h"
#include "ash/shell.h"
#include "ash/wm/lock_state_controller.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
-#include "ash/wm/wm_event.h"
#include "base/bind.h"
#include "base/command_line.h"
#include "base/lazy_instance.h"
diff --git a/chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc b/chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc
index 193c616..cb42e44b 100644
--- a/chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc
+++ b/chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc
@@ -6,7 +6,7 @@
#include <memory>
-#include "ash/wm/window_state.h"
+#include "ash/common/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "base/command_line.h"
#include "base/macros.h"
diff --git a/chrome/browser/chromeos/login/lock/webui_screen_locker.h b/chrome/browser/chromeos/login/lock/webui_screen_locker.h
index 2e7bfdf..7f5f64d 100644
--- a/chrome/browser/chromeos/login/lock/webui_screen_locker.h
+++ b/chrome/browser/chromeos/login/lock/webui_screen_locker.h
@@ -11,7 +11,7 @@
#include <string>
#include "ash/common/shell_observer.h"
-#include "ash/wm/lock_state_observer.h"
+#include "ash/common/wm/lock_state_observer.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
diff --git a/chrome/browser/chromeos/login/login_browsertest.cc b/chrome/browser/chromeos/login/login_browsertest.cc
index ab912aa..367ed8e 100644
--- a/chrome/browser/chromeos/login/login_browsertest.cc
+++ b/chrome/browser/chromeos/login/login_browsertest.cc
@@ -4,8 +4,8 @@
#include <string>
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wm_window.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/system/tray/system_tray.h"
#include "base/command_line.h"
diff --git a/chrome/browser/chromeos/policy/force_maximize_on_first_run_chromeos_browsertest.cc b/chrome/browser/chromeos/policy/force_maximize_on_first_run_chromeos_browsertest.cc
index 6ea96f65..924ed4a 100644
--- a/chrome/browser/chromeos/policy/force_maximize_on_first_run_chromeos_browsertest.cc
+++ b/chrome/browser/chromeos/policy/force_maximize_on_first_run_chromeos_browsertest.cc
@@ -4,8 +4,8 @@
#include <string>
+#include "ash/common/wm/window_positioner.h"
#include "ash/shell.h"
-#include "ash/wm/window_positioner.h"
#include "base/macros.h"
#include "base/strings/string_number_conversions.h"
#include "base/values.h"
diff --git a/chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.cc b/chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.cc
index 098c45a..c9a5ddf 100644
--- a/chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.cc
+++ b/chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.cc
@@ -4,8 +4,8 @@
#include "chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "base/macros.h"
#include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
index 580144f..3c1eb01d 100644
--- a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
+++ b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
@@ -4,12 +4,12 @@
#include "ash/common/accessibility_types.h"
#include "ash/common/login_status.h"
+#include "ash/common/test/test_session_state_delegate.h"
#include "ash/magnifier/magnification_controller.h"
#include "ash/shell.h"
#include "ash/system/tray/system_tray.h"
#include "ash/system/tray_accessibility.h"
#include "ash/test/shell_test_api.h"
-#include "ash/test/test_session_state_delegate.h"
#include "base/callback.h"
#include "base/command_line.h"
#include "base/memory/ptr_util.h"
diff --git a/chrome/browser/extensions/api/automation/automation_apitest.cc b/chrome/browser/extensions/api/automation/automation_apitest.cc
index c4fa962b6..b498453 100644
--- a/chrome/browser/extensions/api/automation/automation_apitest.cc
+++ b/chrome/browser/extensions/api/automation/automation_apitest.cc
@@ -33,7 +33,7 @@
#include "ui/accessibility/tree_generator.h"
#if defined(OS_CHROMEOS)
-#include "ash/accelerators/accelerator_controller.h"
+#include "ash/common/accelerators/accelerator_controller.h"
#include "ash/common/wm_shell.h"
#include "chrome/browser/ui/aura/accessibility/automation_manager_aura.h"
#endif
diff --git a/chrome/browser/extensions/bookmark_app_helper.cc b/chrome/browser/extensions/bookmark_app_helper.cc
index d1a8dbbe..7a73d7867 100644
--- a/chrome/browser/extensions/bookmark_app_helper.cc
+++ b/chrome/browser/extensions/bookmark_app_helper.cc
@@ -76,8 +76,8 @@
#endif // defined(OS_WIN)
#if defined(USE_ASH)
+#include "ash/common/shelf/shelf_delegate.h" // nogncheck
#include "ash/common/wm_shell.h" // nogncheck
-#include "ash/shelf/shelf_delegate.h" // nogncheck
#endif
namespace {
diff --git a/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc b/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc
index 3c797009..f744840 100644
--- a/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc
+++ b/chrome/browser/extensions/display_info_provider_chromeos_unittest.cc
@@ -6,11 +6,11 @@
#include <stdint.h>
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/display/screen_orientation_controller_chromeos.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
#include "base/command_line.h"
#include "base/macros.h"
#include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/extensions/global_shortcut_listener_chromeos.cc b/chrome/browser/extensions/global_shortcut_listener_chromeos.cc
index fec16ba9..900dccd0e 100644
--- a/chrome/browser/extensions/global_shortcut_listener_chromeos.cc
+++ b/chrome/browser/extensions/global_shortcut_listener_chromeos.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/extensions/global_shortcut_listener_chromeos.h"
-#include "ash/accelerators/accelerator_controller.h"
+#include "ash/common/accelerators/accelerator_controller.h"
#include "ash/common/wm_shell.h"
#include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/notifications/fullscreen_notification_blocker.cc b/chrome/browser/notifications/fullscreen_notification_blocker.cc
index a45e4ea9..2804fe5 100644
--- a/chrome/browser/notifications/fullscreen_notification_blocker.cc
+++ b/chrome/browser/notifications/fullscreen_notification_blocker.cc
@@ -13,10 +13,10 @@
#include "ui/message_center/notifier_settings.h"
#if defined(USE_ASH)
+#include "ash/common/wm/window_state.h"
#include "ash/root_window_controller.h"
#include "ash/shell.h"
#include "ash/system/system_notifier.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ui/aura/window.h"
#include "ui/aura/window_event_dispatcher.h"
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index a3b281c..cf6f84c3 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -195,8 +195,8 @@
#include "url/origin.h"
#if defined(OS_CHROMEOS)
-#include "ash/accelerators/accelerator_controller.h"
-#include "ash/accelerators/accelerator_table.h"
+#include "ash/common/accelerators/accelerator_controller.h"
+#include "ash/common/accelerators/accelerator_table.h"
#include "ash/common/accessibility_types.h"
#include "ash/common/wm_shell.h"
#include "ash/shell.h"
diff --git a/chrome/browser/ui/apps/chrome_app_delegate.cc b/chrome/browser/ui/apps/chrome_app_delegate.cc
index e66f6ae..5b90605 100644
--- a/chrome/browser/ui/apps/chrome_app_delegate.cc
+++ b/chrome/browser/ui/apps/chrome_app_delegate.cc
@@ -41,7 +41,7 @@
#include "printing/features/features.h"
#if defined(USE_ASH)
-#include "ash/shelf/shelf_constants.h" // nogncheck
+#include "ash/common/shelf/shelf_constants.h" // nogncheck
#endif
#if BUILDFLAG(ENABLE_PRINTING)
diff --git a/chrome/browser/ui/ash/accelerator_commands_browsertest.cc b/chrome/browser/ui/ash/accelerator_commands_browsertest.cc
index 079059c..40d7547 100644
--- a/chrome/browser/ui/ash/accelerator_commands_browsertest.cc
+++ b/chrome/browser/ui/ash/accelerator_commands_browsertest.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/accelerators/accelerator_commands.h"
+#include "ash/common/accelerators/accelerator_commands.h"
#include "ash/accelerators/accelerator_commands_aura.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_window.h"
#include "ash/shell.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "base/command_line.h"
#include "base/macros.h"
diff --git a/chrome/browser/ui/ash/accelerator_controller_browsertest.cc b/chrome/browser/ui/ash/accelerator_controller_browsertest.cc
index 9c94c65d..f381e1b 100644
--- a/chrome/browser/ui/ash/accelerator_controller_browsertest.cc
+++ b/chrome/browser/ui/ash/accelerator_controller_browsertest.cc
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/accelerators/accelerator_controller.h"
+#include "ash/common/accelerators/accelerator_controller.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/shell.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "build/build_config.h"
#include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc b/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc
index b13fc15..c83d8d0 100644
--- a/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc
+++ b/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc
@@ -4,8 +4,8 @@
#include "chrome/browser/ui/ash/app_list/app_list_controller_ash.h"
+#include "ash/common/shelf/shelf_delegate.h"
#include "ash/common/wm_shell.h"
-#include "ash/shelf/shelf_delegate.h"
#include "ash/shell.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
diff --git a/chrome/browser/ui/ash/app_list/app_list_interactive_uitest.cc b/chrome/browser/ui/ash/app_list/app_list_interactive_uitest.cc
index 0e97237..a4386b1f 100644
--- a/chrome/browser/ui/ash/app_list/app_list_interactive_uitest.cc
+++ b/chrome/browser/ui/ash/app_list/app_list_interactive_uitest.cc
@@ -4,12 +4,12 @@
#include <memory>
+#include "ash/common/shelf/app_list_button.h"
+#include "ash/common/shelf/shelf_widget.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
-#include "ash/shelf/app_list_button.h"
-#include "ash/shelf/shelf_widget.h"
-#include "ash/shelf/wm_shelf.h"
#include "base/run_loop.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "ui/app_list/presenter/app_list.h"
diff --git a/chrome/browser/ui/ash/ash_init.cc b/chrome/browser/ui/ash/ash_init.cc
index fe09e3ae..b29a791 100644
--- a/chrome/browser/ui/ash/ash_init.cc
+++ b/chrome/browser/ui/ash/ash_init.cc
@@ -4,8 +4,8 @@
#include "chrome/browser/ui/ash/ash_init.h"
-#include "ash/accelerators/accelerator_controller.h"
#include "ash/accelerators/accelerator_controller_delegate_aura.h"
+#include "ash/common/accelerators/accelerator_controller.h"
#include "ash/common/accessibility_types.h"
#include "ash/common/wm_shell.h"
#include "ash/high_contrast/high_contrast_controller.h"
diff --git a/chrome/browser/ui/ash/ash_util.cc b/chrome/browser/ui/ash/ash_util.cc
index 059b59e..591c9d55 100644
--- a/chrome/browser/ui/ash/ash_util.cc
+++ b/chrome/browser/ui/ash/ash_util.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/ui/ash/ash_util.h"
-#include "ash/accelerators/accelerator_controller.h"
+#include "ash/common/accelerators/accelerator_controller.h"
#include "ash/common/mojo_interface_factory.h"
#include "ash/common/wm_shell.h"
#include "base/macros.h"
diff --git a/chrome/browser/ui/ash/chrome_screenshot_grabber_unittest.cc b/chrome/browser/ui/ash/chrome_screenshot_grabber_unittest.cc
index a152f96..465c770 100644
--- a/chrome/browser/ui/ash/chrome_screenshot_grabber_unittest.cc
+++ b/chrome/browser/ui/ash/chrome_screenshot_grabber_unittest.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/ui/ash/chrome_screenshot_grabber.h"
-#include "ash/accelerators/accelerator_controller.h"
+#include "ash/common/accelerators/accelerator_controller.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "base/bind.h"
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc
index 7f5914c9cc..42db34a 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc
@@ -13,12 +13,12 @@
#include "ash/common/accessibility_delegate.h"
#include "ash/common/accessibility_types.h"
#include "ash/common/wallpaper/wallpaper_delegate.h"
+#include "ash/common/wm/mru_window_tracker.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/content/gpu_support_impl.h"
#include "ash/shell.h"
-#include "ash/wm/mru_window_tracker.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_util.h"
#include "base/command_line.h"
#include "base/macros.h"
diff --git a/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc b/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc
index 8b0fe5c..ffe1363 100644
--- a/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc
+++ b/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "ash/common/shelf/shelf_delegate.h"
#include "ash/common/wm_shell.h"
-#include "ash/shelf/shelf_delegate.h"
#include "ash/wm/window_util.h"
#include "base/macros.h"
#include "base/run_loop.h"
diff --git a/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc b/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc
index 586c3a95..f20d0993 100644
--- a/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc
+++ b/chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc
@@ -5,15 +5,15 @@
#include <string>
+#include "ash/common/shelf/shelf_delegate.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/display/screen_orientation_controller_chromeos.h"
#include "ash/shared/app_types.h"
-#include "ash/shelf/shelf_delegate.h"
#include "ash/shell.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/wm/window_properties.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
#include "base/bind.h"
diff --git a/chrome/browser/ui/ash/launcher/arc_launcher_context_menu.cc b/chrome/browser/ui/ash/launcher/arc_launcher_context_menu.cc
index 36fdb8a..294f9df6 100644
--- a/chrome/browser/ui/ash/launcher/arc_launcher_context_menu.cc
+++ b/chrome/browser/ui/ash/launcher/arc_launcher_context_menu.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/ui/ash/launcher/arc_launcher_context_menu.h"
-#include "ash/shelf/shelf_item_types.h"
+#include "ash/common/shelf/shelf_item_types.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
#include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
diff --git a/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc
index cd6e7b79..dc3ddfd 100644
--- a/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc
+++ b/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc
@@ -7,12 +7,12 @@
#include <limits>
#include <vector>
+#include "ash/common/shelf/shelf_delegate.h"
+#include "ash/common/shelf/shelf_model.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shelf_application_menu_item.h"
#include "ash/resources/grit/ash_resources.h"
-#include "ash/shelf/shelf_delegate.h"
-#include "ash/shelf/shelf_model.h"
#include "ash/wm/window_properties.h"
#include "ash/wm/window_util.h"
#include "base/memory/ptr_util.h"
diff --git a/chrome/browser/ui/ash/launcher/browser_status_monitor.cc b/chrome/browser/ui/ash/launcher/browser_status_monitor.cc
index 8859cd4..4c7e7c2b 100644
--- a/chrome/browser/ui/ash/launcher/browser_status_monitor.cc
+++ b/chrome/browser/ui/ash/launcher/browser_status_monitor.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/ui/ash/launcher/browser_status_monitor.h"
-#include "ash/shelf/shelf_item_types.h"
+#include "ash/common/shelf/shelf_item_types.h"
#include "ash/shell.h"
#include "ash/wm/window_util.h"
#include "base/macros.h"
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
index a206459..fb29db9 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
@@ -9,10 +9,10 @@
#include <string>
#include <vector>
+#include "ash/common/shelf/shelf_item_delegate.h"
+#include "ash/common/shelf/shelf_item_types.h"
#include "ash/public/cpp/shelf_application_menu_item.h"
#include "ash/public/interfaces/shelf.mojom.h"
-#include "ash/shelf/shelf_item_delegate.h"
-#include "ash/shelf/shelf_item_types.h"
#include "chrome/browser/ui/app_icon_loader.h"
#include "chrome/browser/ui/app_icon_loader_delegate.h"
#include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
index a3e2171..ec8e4ab85 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
@@ -9,12 +9,12 @@
#include <vector>
#include "ash/common/multi_profile_uma.h"
+#include "ash/common/shelf/shelf_model.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/resources/grit/ash_resources.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/shelf_model.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/strings/grit/ash_strings.h"
#include "ash/system/tray/system_tray_delegate.h"
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
index 9ad76028..037a222 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h
@@ -8,10 +8,10 @@
#include <list>
#include <memory>
+#include "ash/common/shelf/shelf_delegate.h"
+#include "ash/common/shelf/shelf_model_observer.h"
#include "ash/display/window_tree_host_manager.h"
#include "ash/public/cpp/shelf_types.h"
-#include "ash/shelf/shelf_delegate.h"
-#include "ash/shelf/shelf_model_observer.h"
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
index bae868fc0..7a473e0 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
@@ -6,20 +6,20 @@
#include <stddef.h>
+#include "ash/common/shelf/app_list_button.h"
+#include "ash/common/shelf/shelf_button.h"
+#include "ash/common/shelf/shelf_constants.h"
+#include "ash/common/shelf/shelf_model.h"
+#include "ash/common/shelf/shelf_view.h"
+#include "ash/common/shelf/shelf_widget.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/window_properties.h"
-#include "ash/shelf/app_list_button.h"
-#include "ash/shelf/shelf_button.h"
-#include "ash/shelf/shelf_constants.h"
-#include "ash/shelf/shelf_model.h"
-#include "ash/shelf/shelf_view.h"
-#include "ash/shelf/shelf_widget.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/test/shelf_view_test_api.h"
#include "ash/wm/window_properties.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
#include "base/macros.h"
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc
index 2e35e27..4b5b8ad5 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc
@@ -14,18 +14,18 @@
#include <utility>
#include <vector>
+#include "ash/common/shelf/shelf_application_menu_model.h"
+#include "ash/common/shelf/shelf_constants.h"
+#include "ash/common/shelf/shelf_controller.h"
+#include "ash/common/shelf/shelf_item_types.h"
+#include "ash/common/shelf/shelf_model.h"
+#include "ash/common/shelf/shelf_model_observer.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/display/screen_orientation_controller_chromeos.h"
-#include "ash/shelf/shelf_application_menu_model.h"
-#include "ash/shelf/shelf_constants.h"
-#include "ash/shelf/shelf_controller.h"
-#include "ash/shelf/shelf_item_types.h"
-#include "ash/shelf/shelf_model.h"
-#include "ash/shelf/shelf_model_observer.h"
#include "ash/shell.h"
#include "ash/test/ash_test_helper.h"
#include "ash/test/test_shell_delegate.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/wm/window_util.h"
#include "base/command_line.h"
#include "base/compiler_specific.h"
diff --git a/chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.cc b/chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.cc
index 61e577bb..dd059dc 100644
--- a/chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.cc
+++ b/chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.cc
@@ -4,9 +4,9 @@
#include "chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.h"
+#include "ash/common/shelf/shelf_delegate.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
-#include "ash/shelf/shelf_delegate.h"
#include "ash/wm/window_properties.h"
#include "ash/wm/window_util.h"
#include "base/stl_util.h"
diff --git a/chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.cc
index 25b6ace3..e885823a 100644
--- a/chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.cc
+++ b/chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.h"
-#include "ash/wm/window_state.h"
+#include "ash/common/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
#include "base/memory/ptr_util.h"
diff --git a/chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc b/chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc
index ec28364..7dc7522 100644
--- a/chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc
+++ b/chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc
@@ -4,8 +4,8 @@
#include "chrome/browser/ui/ash/launcher/extension_launcher_context_menu.h"
+#include "ash/common/shelf/shelf_item_delegate.h"
#include "ash/common/wm_shell.h"
-#include "ash/shelf/shelf_item_delegate.h"
#include "base/bind.h"
#include "chrome/browser/extensions/context_menu_matcher.h"
#include "chrome/browser/extensions/extension_util.h"
diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
index 42c6bef..30d381525 100644
--- a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
@@ -6,11 +6,11 @@
#include <string>
+#include "ash/common/shelf/shelf_model.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wallpaper/wallpaper_delegate.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
-#include "ash/shelf/shelf_model.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/strings/grit/ash_strings.h"
#include "build/build_config.h"
#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu.h b/chrome/browser/ui/ash/launcher/launcher_context_menu.h
index 6ae3e77..e913717d 100644
--- a/chrome/browser/ui/ash/launcher/launcher_context_menu.h
+++ b/chrome/browser/ui/ash/launcher/launcher_context_menu.h
@@ -5,8 +5,8 @@
#ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_
#define CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_CONTEXT_MENU_H_
-#include "ash/shelf/shelf_alignment_menu.h"
-#include "ash/shelf/shelf_item_types.h"
+#include "ash/common/shelf/shelf_alignment_menu.h"
+#include "ash/common/shelf/shelf_item_types.h"
#include "base/gtest_prod_util.h"
#include "base/macros.h"
#include "ui/base/models/simple_menu_model.h"
diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc b/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
index f9d27c9..7868df6 100644
--- a/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
@@ -6,10 +6,10 @@
#include <memory>
+#include "ash/common/shelf/shelf_item_types.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/shelf_item_types.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "base/macros.h"
diff --git a/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc b/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc
index 974fa1b..8894ff3 100644
--- a/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/ui/ash/launcher/launcher_favicon_loader.h"
-#include "ash/shelf/shelf_constants.h"
+#include "ash/common/shelf/shelf_constants.h"
#include "base/bind.h"
#include "base/logging.h"
#include "base/macros.h"
diff --git a/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc b/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc
index a4f999a7..2606e66d 100644
--- a/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc
@@ -8,7 +8,7 @@
#include <memory>
-#include "ash/shelf/shelf_constants.h"
+#include "ash/common/shelf/shelf_constants.h"
#include "base/macros.h"
#include "base/strings/stringprintf.h"
#include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/ash/launcher/launcher_item_controller.h b/chrome/browser/ui/ash/launcher/launcher_item_controller.h
index 1ce11f7b..5c1c538 100644
--- a/chrome/browser/ui/ash/launcher/launcher_item_controller.h
+++ b/chrome/browser/ui/ash/launcher/launcher_item_controller.h
@@ -7,8 +7,8 @@
#include <string>
-#include "ash/shelf/shelf_item_delegate.h"
-#include "ash/shelf/shelf_item_types.h"
+#include "ash/common/shelf/shelf_item_delegate.h"
+#include "ash/common/shelf/shelf_item_types.h"
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "ui/events/event.h"
diff --git a/chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.cc b/chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.cc
index 4dd7f76..30e3df69 100644
--- a/chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.cc
+++ b/chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.cc
@@ -4,9 +4,9 @@
#include "chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.h"
+#include "ash/common/shelf/shelf_item_types.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/window_properties.h"
-#include "ash/shelf/shelf_item_types.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
diff --git a/chrome/browser/ui/ash/launcher/settings_window_observer.cc b/chrome/browser/ui/ash/launcher/settings_window_observer.cc
index 1ae904e..f07ebd2 100644
--- a/chrome/browser/ui/ash/launcher/settings_window_observer.cc
+++ b/chrome/browser/ui/ash/launcher/settings_window_observer.cc
@@ -4,9 +4,9 @@
#include "chrome/browser/ui/ash/launcher/settings_window_observer.h"
+#include "ash/common/shelf/shelf_item_types.h"
#include "ash/public/cpp/window_properties.h"
#include "ash/resources/grit/ash_resources.h"
-#include "ash/shelf/shelf_item_types.h"
#include "base/feature_list.h"
#include "base/memory/ptr_util.h"
#include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc
index eae23e6..79ec452 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc
@@ -6,12 +6,12 @@
#include "ash/common/media_controller.h"
#include "ash/common/multi_profile_uma.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/shell.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "base/auto_reset.h"
#include "base/macros.h"
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
index 542ac6b..103ea8b 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
@@ -4,24 +4,24 @@
#include <stddef.h>
+#include "ash/common/shelf/shelf_widget.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_window_manager.h"
+#include "ash/common/wm/mru_window_tracker.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_event.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/content/shell_content_state.h"
#include "ash/public/cpp/shell_window_ids.h"
-#include "ash/shelf/shelf_widget.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/ash_test_environment_content.h"
#include "ash/test/ash_test_helper.h"
#include "ash/test/test_shell_delegate.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
-#include "ash/wm/maximize_mode/maximize_mode_window_manager.h"
-#include "ash/wm/mru_window_tracker.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
-#include "ash/wm/wm_event.h"
#include "base/compiler_specific.h"
#include "base/logging.h"
#include "base/macros.h"
diff --git a/chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc b/chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc
index a11acf62..1d5ba25 100644
--- a/chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc
+++ b/chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc
@@ -4,17 +4,17 @@
#include "chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.h"
+#include "ash/common/shelf/shelf_layout_manager.h"
+#include "ash/common/shelf/shelf_widget.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wallpaper/wallpaper_delegate.h"
+#include "ash/common/wm/mru_window_tracker.h"
+#include "ash/common/wm/window_positioner.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/shelf_layout_manager.h"
-#include "ash/shelf/shelf_widget.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
-#include "ash/wm/mru_window_tracker.h"
-#include "ash/wm/window_positioner.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
#include "base/macros.h"
diff --git a/chrome/browser/ui/ash/multi_user/user_switch_util.cc b/chrome/browser/ui/ash/multi_user/user_switch_util.cc
index 81d62d8..e0e7500f 100644
--- a/chrome/browser/ui/ash/multi_user/user_switch_util.cc
+++ b/chrome/browser/ui/ash/multi_user/user_switch_util.cc
@@ -4,12 +4,12 @@
#include "chrome/browser/ui/ash/multi_user/user_switch_util.h"
+#include "ash/common/wm/overview/window_selector_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/shell.h"
#include "ash/strings/grit/ash_strings.h"
#include "ash/system/screen_security/screen_tray_item.h"
#include "ash/system/tray/system_tray.h"
-#include "ash/wm/overview/window_selector_controller.h"
#include "chrome/browser/ui/simple_message_box.h"
#include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/ui/ash/multi_user/user_switch_util_unittest.cc b/chrome/browser/ui/ash/multi_user/user_switch_util_unittest.cc
index e7e825b..4717298a 100644
--- a/chrome/browser/ui/ash/multi_user/user_switch_util_unittest.cc
+++ b/chrome/browser/ui/ash/multi_user/user_switch_util_unittest.cc
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "ash/common/wm/overview/window_selector_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/system/screen_security/screen_tray_item.h"
#include "ash/system/tray/system_tray.h"
#include "ash/test/ash_test_base.h"
-#include "ash/wm/overview/window_selector_controller.h"
#include "base/run_loop.h"
#include "base/threading/thread_task_runner_handle.h"
#include "chrome/browser/ui/ash/multi_user/user_switch_util.h"
diff --git a/chrome/browser/ui/ash/shelf_browsertest.cc b/chrome/browser/ui/ash/shelf_browsertest.cc
index 1c12f73..f39d951 100644
--- a/chrome/browser/ui/ash/shelf_browsertest.cc
+++ b/chrome/browser/ui/ash/shelf_browsertest.cc
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "ash/common/shelf/shelf_layout_manager.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wm_window.h"
-#include "ash/shelf/shelf_layout_manager.h"
-#include "ash/shelf/wm_shelf.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_window.h"
diff --git a/chrome/browser/ui/ash/window_positioner_unittest.cc b/chrome/browser/ui/ash/window_positioner_unittest.cc
index c758b6c..a71dd18 100644
--- a/chrome/browser/ui/ash/window_positioner_unittest.cc
+++ b/chrome/browser/ui/ash/window_positioner_unittest.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/wm/window_positioner.h"
+#include "ash/common/wm/window_positioner.h"
#include <utility>
+#include "ash/common/wm/window_resizer.h"
#include "ash/common/wm_shell.h"
#include "ash/test/ash_test_base.h"
-#include "ash/wm/window_resizer.h"
#include "base/logging.h"
#include "base/macros.h"
#include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc
index 52b6cb7..1cd8dbb 100644
--- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc
+++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc
@@ -46,7 +46,7 @@
#endif
#if defined(USE_ASH)
-#include "ash/accelerators/accelerator_table.h" // nogncheck
+#include "ash/common/accelerators/accelerator_table.h" // nogncheck
#endif // defined(USE_ASH)
namespace {
diff --git a/chrome/browser/ui/views/accelerator_table.cc b/chrome/browser/ui/views/accelerator_table.cc
index b539183..43a54894 100644
--- a/chrome/browser/ui/views/accelerator_table.cc
+++ b/chrome/browser/ui/views/accelerator_table.cc
@@ -14,7 +14,7 @@
#include "ui/events/event_constants.h"
#if defined(USE_ASH)
-#include "ash/accelerators/accelerator_table.h" // nogncheck
+#include "ash/common/accelerators/accelerator_table.h" // nogncheck
#endif
namespace {
diff --git a/chrome/browser/ui/views/accelerator_table_unittest.cc b/chrome/browser/ui/views/accelerator_table_unittest.cc
index 31bf6e49..6b05bc2 100644
--- a/chrome/browser/ui/views/accelerator_table_unittest.cc
+++ b/chrome/browser/ui/views/accelerator_table_unittest.cc
@@ -12,7 +12,7 @@
#include "ui/events/event_constants.h"
#if defined(USE_ASH)
-#include "ash/accelerators/accelerator_table.h"
+#include "ash/common/accelerators/accelerator_table.h"
#endif // USE_ASH
namespace chrome {
diff --git a/chrome/browser/ui/views/accelerator_utils_aura.cc b/chrome/browser/ui/views/accelerator_utils_aura.cc
index 8c6414c9..55093f8 100644
--- a/chrome/browser/ui/views/accelerator_utils_aura.cc
+++ b/chrome/browser/ui/views/accelerator_utils_aura.cc
@@ -9,7 +9,7 @@
#include "ui/base/accelerators/accelerator.h"
#if defined(USE_ASH)
-#include "ash/accelerators/accelerator_table.h" // nogncheck
+#include "ash/common/accelerators/accelerator_table.h" // nogncheck
#endif // USE_ASH
namespace chrome {
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc
index ca1e73f3..2a1b343 100644
--- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc
+++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc
@@ -21,8 +21,8 @@
#include "ui/views/widget/widget.h"
#if defined(USE_ASH)
+#include "ash/common/shelf/shelf_delegate.h" // nogncheck
#include "ash/common/wm_shell.h" // nogncheck
-#include "ash/shelf/shelf_delegate.h" // nogncheck
#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.h" // nogncheck
#endif
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc
index 78abdfe..8ba36e52 100644
--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc
+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc
@@ -7,20 +7,20 @@
#include "apps/ui/views/app_window_frame_view.h"
#include "ash/common/ash_constants.h"
#include "ash/common/ash_switches.h"
+#include "ash/common/frame/custom_frame_view_ash.h"
+#include "ash/common/shelf/shelf_item_types.h"
+#include "ash/common/wm/panels/panel_frame_view.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/window_state_delegate.h"
+#include "ash/common/wm/window_state_observer.h"
#include "ash/common/wm_window.h"
-#include "ash/frame/custom_frame_view_ash.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/public/cpp/window_properties.h"
#include "ash/shared/app_types.h"
#include "ash/shared/immersive_fullscreen_controller.h"
-#include "ash/shelf/shelf_item_types.h"
#include "ash/shell.h"
-#include "ash/wm/panels/panel_frame_view.h"
#include "ash/wm/window_properties.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
-#include "ash/wm/window_state_delegate.h"
-#include "ash/wm/window_state_observer.h"
#include "chrome/browser/chromeos/note_taking_helper.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/ash/ash_util.h"
diff --git a/chrome/browser/ui/views/chrome_views_delegate_chromeos.cc b/chrome/browser/ui/views/chrome_views_delegate_chromeos.cc
index 1db6f37e..acf1470a 100644
--- a/chrome/browser/ui/views/chrome_views_delegate_chromeos.cc
+++ b/chrome/browser/ui/views/chrome_views_delegate_chromeos.cc
@@ -4,10 +4,10 @@
#include "chrome/browser/ui/views/chrome_views_delegate.h"
-#include "ash/accelerators/accelerator_controller.h"
+#include "ash/common/accelerators/accelerator_controller.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/shell.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "base/bind.h"
#include "base/message_loop/message_loop.h"
diff --git a/chrome/browser/ui/views/frame/browser_frame_ash.cc b/chrome/browser/ui/views/frame/browser_frame_ash.cc
index 3d73ee2..d40bb822 100644
--- a/chrome/browser/ui/views/frame/browser_frame_ash.cc
+++ b/chrome/browser/ui/views/frame/browser_frame_ash.cc
@@ -5,11 +5,11 @@
#include "chrome/browser/ui/views/frame/browser_frame_ash.h"
#include "ash/common/ash_switches.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/window_state_delegate.h"
#include "ash/shell.h"
#include "ash/wm/window_properties.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
-#include "ash/wm/window_state_delegate.h"
#include "ash/wm/window_util.h"
#include "base/macros.h"
#include "build/build_config.h"
diff --git a/chrome/browser/ui/views/frame/browser_header_painter_ash.cc b/chrome/browser/ui/views/frame/browser_header_painter_ash.cc
index 3142cbd6..ba9f1f3 100644
--- a/chrome/browser/ui/views/frame/browser_header_painter_ash.cc
+++ b/chrome/browser/ui/views/frame/browser_header_painter_ash.cc
@@ -5,8 +5,8 @@
#include "chrome/browser/ui/views/frame/browser_header_painter_ash.h"
#include "ash/common/ash_layout_constants.h"
-#include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
-#include "ash/frame/header_painter_util.h"
+#include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h"
+#include "ash/common/frame/header_painter_util.h"
#include "ash/resources/vector_icons/vector_icons.h"
#include "base/logging.h" // DCHECK
#include "chrome/browser/themes/theme_properties.h"
diff --git a/chrome/browser/ui/views/frame/browser_header_painter_ash.h b/chrome/browser/ui/views/frame/browser_header_painter_ash.h
index 96fedaf0..f6e6c41 100644
--- a/chrome/browser/ui/views/frame/browser_header_painter_ash.h
+++ b/chrome/browser/ui/views/frame/browser_header_painter_ash.h
@@ -7,7 +7,7 @@
#include <memory>
-#include "ash/frame/header_painter.h"
+#include "ash/common/frame/header_painter.h"
#include "base/compiler_specific.h" // override
#include "base/macros.h"
#include "ui/gfx/animation/animation_delegate.h"
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
index 708d0a2..8f383f9 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
@@ -7,12 +7,12 @@
#include <algorithm>
#include "ash/common/ash_layout_constants.h"
+#include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h"
+#include "ash/common/frame/default_header_painter.h"
+#include "ash/common/frame/frame_border_hit_test.h"
+#include "ash/common/frame/header_painter_util.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
-#include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
-#include "ash/frame/default_header_painter.h"
-#include "ash/frame/frame_border_hit_test.h"
-#include "ash/frame/header_painter_util.h"
#include "base/feature_list.h"
#include "build/build_config.h"
#include "chrome/browser/profiles/profiles_state.h"
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc
index ec29999..931f739 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc
@@ -5,12 +5,12 @@
#include "chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h"
#include "ash/common/ash_constants.h"
+#include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h"
+#include "ash/common/frame/header_painter.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm_shell.h"
-#include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
-#include "ash/frame/header_painter.h"
#include "ash/shell.h"
#include "ash/test/immersive_fullscreen_controller_test_api.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
#include "base/command_line.h"
#include "build/build_config.h"
#include "chrome/browser/profiles/profile_avatar_icon_util.h"
diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc b/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc
index 59966b1..8e1cd9d 100644
--- a/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc
+++ b/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc
@@ -5,9 +5,9 @@
#include "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h"
#include "ash/common/material_design/material_design_controller.h"
+#include "ash/common/wm/window_state.h"
#include "ash/shared/immersive_revealed_lock.h"
#include "ash/shell.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_ash.h b/chrome/browser/ui/views/frame/immersive_mode_controller_ash.h
index 6a6d51e7..b47321e86 100644
--- a/chrome/browser/ui/views/frame/immersive_mode_controller_ash.h
+++ b/chrome/browser/ui/views/frame/immersive_mode_controller_ash.h
@@ -7,9 +7,9 @@
#include <memory>
+#include "ash/common/wm/window_state_observer.h"
#include "ash/shared/immersive_fullscreen_controller.h"
#include "ash/shared/immersive_fullscreen_controller_delegate.h"
-#include "ash/wm/window_state_observer.h"
#include "base/macros.h"
#include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
#include "content/public/browser/notification_observer.h"
diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc b/chrome/browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc
index d9894e6..9f3f0759 100644
--- a/chrome/browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc
+++ b/chrome/browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc
@@ -4,9 +4,9 @@
#include "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h"
+#include "ash/common/shelf/shelf_layout_manager.h"
#include "ash/public/cpp/shelf_types.h"
#include "ash/root_window_controller.h"
-#include "ash/shelf/shelf_layout_manager.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/immersive_fullscreen_controller_test_api.h"
diff --git a/chrome/browser/ui/views/status_bubble_views.cc b/chrome/browser/ui/views/status_bubble_views.cc
index 63ae424..5aea784 100644
--- a/chrome/browser/ui/views/status_bubble_views.cc
+++ b/chrome/browser/ui/views/status_bubble_views.cc
@@ -41,7 +41,7 @@
#include "url/gurl.h"
#if defined(USE_ASH)
-#include "ash/wm/window_state.h" // nogncheck
+#include "ash/common/wm/window_state.h" // nogncheck
#include "ash/wm/window_state_aura.h" // nogncheck
#endif
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.cc b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
index 734c9bc3..7e52331 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -41,10 +41,10 @@
#include "ui/views/widget/widget.h"
#if defined(USE_ASH)
-#include "ash/accelerators/accelerator_commands.h" // nogncheck
+#include "ash/common/accelerators/accelerator_commands.h" // nogncheck
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h" // nogncheck
+#include "ash/common/wm/window_state.h" // nogncheck
#include "ash/common/wm_shell.h" // nogncheck
-#include "ash/wm/maximize_mode/maximize_mode_controller.h" // nogncheck
-#include "ash/wm/window_state.h" // nogncheck
#include "ash/wm/window_state_aura.h" // nogncheck
#include "ui/wm/core/coordinate_conversion.h" // nogncheck
#endif
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
index 768e71b..244c71de 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
@@ -63,12 +63,12 @@
#if defined(USE_ASH)
#include "ash/common/ash_switches.h"
+#include "ash/common/wm/root_window_finder.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_window.h"
#include "ash/shell.h"
#include "ash/test/cursor_manager_test_api.h"
#include "ash/test/immersive_fullscreen_controller_test_api.h"
-#include "ash/wm/root_window_finder.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
#include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
diff --git a/chrome/browser/ui/views/tabs/window_finder_ash.cc b/chrome/browser/ui/views/tabs/window_finder_ash.cc
index ab91890d..4b828121 100644
--- a/chrome/browser/ui/views/tabs/window_finder_ash.cc
+++ b/chrome/browser/ui/views/tabs/window_finder_ash.cc
@@ -4,9 +4,9 @@
#include "chrome/browser/ui/views/tabs/window_finder.h"
+#include "ash/common/wm/root_window_finder.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
-#include "ash/wm/root_window_finder.h"
#include "ui/aura/client/screen_position_client.h"
#include "ui/aura/window.h"
#include "ui/aura/window_event_dispatcher.h"
diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc
index 0e56187..b9a1be79 100644
--- a/chrome/browser/ui/views/task_manager_view.cc
+++ b/chrome/browser/ui/views/task_manager_view.cc
@@ -35,9 +35,9 @@
#if defined(USE_ASH)
// Note: gn check complains here, despite the correct conditional //ash dep.
+#include "ash/common/shelf/shelf_item_types.h" // nogncheck
#include "ash/public/cpp/window_properties.h" // nogncheck
#include "ash/resources/grit/ash_resources.h" // nogncheck
-#include "ash/shelf/shelf_item_types.h" // nogncheck
#include "ash/wm/window_util.h" // nogncheck
#include "chrome/browser/ui/ash/ash_util.h" // nogncheck
#include "ui/aura/client/aura_constants.h"
diff --git a/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc b/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc
index 3e36a293..13cc57dd 100644
--- a/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/first_run/first_run_ui.cc
@@ -4,8 +4,8 @@
#include "chrome/browser/ui/webui/chromeos/first_run/first_run_ui.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wm_shell.h"
-#include "ash/shelf/wm_shelf.h"
#include "base/command_line.h"
#include "base/memory/ptr_util.h"
#include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
index d84a98b..84e4b4f 100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
@@ -8,7 +8,7 @@
#include <memory>
-#include "ash/wm/screen_dimmer.h"
+#include "ash/common/wm/screen_dimmer.h"
#include "base/command_line.h"
#include "base/logging.h"
#include "base/macros.h"
diff --git a/chrome/browser/ui/window_sizer/window_sizer.cc b/chrome/browser/ui/window_sizer/window_sizer.cc
index f3c4ea6..2183bcdf 100644
--- a/chrome/browser/ui/window_sizer/window_sizer.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer.cc
@@ -24,8 +24,8 @@
#if defined(USE_ASH)
#include "ash/common/ash_switches.h"
+#include "ash/common/wm/window_positioner.h" // nogncheck
#include "ash/shell.h" // nogncheck
-#include "ash/wm/window_positioner.h" // nogncheck
#include "chrome/browser/ui/ash/ash_util.h" // nogncheck
#endif
diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash.cc b/chrome/browser/ui/window_sizer/window_sizer_ash.cc
index afb0aed2..89c18ebe8 100644
--- a/chrome/browser/ui/window_sizer/window_sizer_ash.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer_ash.cc
@@ -4,10 +4,10 @@
#include "chrome/browser/ui/window_sizer/window_sizer.h"
+#include "ash/common/wm/window_positioner.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_window.h"
#include "ash/shell.h"
-#include "ash/wm/window_positioner.h"
-#include "ash/wm/window_state.h"
#include "chrome/browser/ui/ash/ash_util.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_window.h"
diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc b/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc
index 4fa16e6c..9e0ebf65 100644
--- a/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "ash/common/shelf/shelf_view.h"
+#include "ash/common/shelf/wm_shelf.h"
#include "ash/common/wm_window.h"
-#include "ash/shelf/shelf_view.h"
-#include "ash/shelf/wm_shelf.h"
#include "ash/shell.h"
#include "base/command_line.h"
#include "base/location.h"
diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
index e61b306..aee502a 100644
--- a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc
@@ -3,13 +3,13 @@
// found in the LICENSE file.
#include "ash/common/scoped_root_window_for_new_windows.h"
+#include "ash/common/wm/window_positioner.h"
+#include "ash/common/wm/window_resizer.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
-#include "ash/wm/window_positioner.h"
-#include "ash/wm/window_resizer.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "base/memory/ptr_util.h"
#include "build/build_config.h"
diff --git a/chrome/browser/ui/window_sizer/window_sizer_common_unittest.cc b/chrome/browser/ui/window_sizer/window_sizer_common_unittest.cc
index cd748e3..039a1ad 100644
--- a/chrome/browser/ui/window_sizer/window_sizer_common_unittest.cc
+++ b/chrome/browser/ui/window_sizer/window_sizer_common_unittest.cc
@@ -7,7 +7,7 @@
#include <stddef.h>
#include <utility>
-#include "ash/wm/window_resizer.h"
+#include "ash/common/wm/window_resizer.h"
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "build/build_config.h"
diff --git a/chrome/test/base/view_event_test_platform_part_chromeos.cc b/chrome/test/base/view_event_test_platform_part_chromeos.cc
index 3e885a4..3714ff6 100644
--- a/chrome/test/base/view_event_test_platform_part_chromeos.cc
+++ b/chrome/test/base/view_event_test_platform_part_chromeos.cc
@@ -6,10 +6,10 @@
#include <memory>
+#include "ash/common/test/test_session_state_delegate.h"
#include "ash/shell.h"
#include "ash/shell_init_params.h"
#include "ash/test/ash_test_helper.h"
-#include "ash/test/test_session_state_delegate.h"
#include "ash/test/test_shell_delegate.h"
#include "base/command_line.h"
#include "base/macros.h"
diff --git a/components/exo/pointer_unittest.cc b/components/exo/pointer_unittest.cc
index 9dbe73ea0..f495138 100644
--- a/components/exo/pointer_unittest.cc
+++ b/components/exo/pointer_unittest.cc
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "ash/common/wm/window_positioning_utils.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/shell.h"
-#include "ash/wm/window_positioning_utils.h"
#include "components/exo/buffer.h"
#include "components/exo/pointer.h"
#include "components/exo/pointer_delegate.h"
diff --git a/components/exo/shell_surface.cc b/components/exo/shell_surface.cc
index 1083866de..00a36da 100644
--- a/components/exo/shell_surface.cc
+++ b/components/exo/shell_surface.cc
@@ -6,12 +6,12 @@
#include <algorithm>
+#include "ash/common/frame/custom_frame_view_ash.h"
+#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/wm/window_resizer.h"
+#include "ash/common/wm/window_state.h"
#include "ash/common/wm_window.h"
-#include "ash/frame/custom_frame_view_ash.h"
#include "ash/public/cpp/shell_window_ids.h"
-#include "ash/shelf/wm_shelf.h"
-#include "ash/wm/window_resizer.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ash/wm/window_util.h"
#include "base/logging.h"
diff --git a/components/exo/shell_surface.h b/components/exo/shell_surface.h
index ec3d6ab..74ff30d 100644
--- a/components/exo/shell_surface.h
+++ b/components/exo/shell_surface.h
@@ -9,7 +9,7 @@
#include <memory>
#include <string>
-#include "ash/wm/window_state_observer.h"
+#include "ash/common/wm/window_state_observer.h"
#include "base/macros.h"
#include "base/strings/string16.h"
#include "components/exo/surface_delegate.h"
diff --git a/components/exo/shell_surface_unittest.cc b/components/exo/shell_surface_unittest.cc
index 86bd001..45cc534 100644
--- a/components/exo/shell_surface_unittest.cc
+++ b/components/exo/shell_surface_unittest.cc
@@ -3,12 +3,12 @@
// found in the LICENSE file.
#include "ash/common/accessibility_delegate.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_event.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
-#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
-#include "ash/wm/wm_event.h"
#include "base/message_loop/message_loop.h"
#include "base/strings/utf_string_conversions.h"
#include "components/exo/buffer.h"
diff --git a/components/exo/test/exo_test_helper.cc b/components/exo/test/exo_test_helper.cc
index 45a00396..e10c6da2 100644
--- a/components/exo/test/exo_test_helper.cc
+++ b/components/exo/test/exo_test_helper.cc
@@ -4,10 +4,10 @@
#include "components/exo/test/exo_test_helper.h"
+#include "ash/common/wm/window_positioner.h"
+#include "ash/common/wm/window_positioning_utils.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
-#include "ash/wm/window_positioner.h"
-#include "ash/wm/window_positioning_utils.h"
#include "components/exo/buffer.h"
#include "components/exo/shell_surface.h"
#include "components/exo/surface.h"
diff --git a/components/exo/touch_unittest.cc b/components/exo/touch_unittest.cc
index 8b9ed93..18917fb 100644
--- a/components/exo/touch_unittest.cc
+++ b/components/exo/touch_unittest.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "ash/common/wm/window_positioner.h"
+#include "ash/common/wm/window_positioning_utils.h"
#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/shell.h"
-#include "ash/wm/window_positioner.h"
-#include "ash/wm/window_positioning_utils.h"
#include "components/exo/buffer.h"
#include "components/exo/shell_surface.h"
#include "components/exo/surface.h"
diff --git a/components/exo/wm_helper_ash.cc b/components/exo/wm_helper_ash.cc
index 273af51..c5fc9a5 100644
--- a/components/exo/wm_helper_ash.cc
+++ b/components/exo/wm_helper_ash.cc
@@ -5,10 +5,10 @@
#include "components/exo/wm_helper_ash.h"
#include "ash/common/accessibility_delegate.h"
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
#include "ash/common/wm_shell.h"
#include "ash/shell.h"
#include "ash/system/tray/system_tray_notifier.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
#include "base/memory/singleton.h"
#include "ui/aura/client/focus_client.h"
#include "ui/display/manager/display_manager.h"
