From d60637720bf79a05bdd68876a5a23a2ae958e6f0 Mon Sep 17 00:00:00 2001 From: sky Date: Wed, 1 Jun 2016 10:52:21 -0700 Subject: [PATCH] Renames ash/wm/common into ash/common/wm BUG=616265 TEST=none R=jamescook@chromium.org TBR=reveman@chromium.org Review-Url: https://codereview.chromium.org/2030593002 Cr-Commit-Position: refs/heads/master@{#397173} --- ash/DEPS | 2 +- ash/README.md | 6 +- ash/accelerators/accelerator_commands.cc | 4 +- .../accelerator_commands_unittest.cc | 2 +- ash/accelerators/accelerator_controller.cc | 4 +- .../accelerator_controller_unittest.cc | 8 +- ash/accelerators/accelerator_delegate.cc | 2 +- .../accelerator_filter_unittest.cc | 2 +- ...accelerator_interactive_uitest_chromeos.cc | 2 +- ash/ash.gyp | 180 +++++++++--------- ash/autoclick/autoclick_controller.cc | 2 +- ash/{wm => }/common/DEPS | 2 +- .../wm}/always_on_top_controller.cc | 12 +- .../wm}/always_on_top_controller.h | 8 +- .../wm}/background_animator.cc | 2 +- .../wm}/background_animator.h | 6 +- .../common => common/wm}/container_finder.cc | 16 +- .../common => common/wm}/container_finder.h | 6 +- ash/{wm/common => common/wm}/default_state.cc | 30 +-- ash/{wm/common => common/wm}/default_state.h | 8 +- .../wm}/default_window_resizer.cc | 8 +- .../wm}/default_window_resizer.h | 8 +- .../common => common/wm}/dock/dock_types.h | 6 +- .../wm}/dock/docked_window_layout_manager.cc | 28 +-- .../wm}/dock/docked_window_layout_manager.h | 20 +- .../docked_window_layout_manager_observer.h | 6 +- .../wm}/dock/docked_window_resizer.cc | 20 +- .../wm}/dock/docked_window_resizer.h | 10 +- ash/{wm/common => common/wm}/drag_details.cc | 6 +- ash/{wm/common => common/wm}/drag_details.h | 8 +- .../wm}/fullscreen_window_finder.cc | 12 +- .../wm}/fullscreen_window_finder.h | 6 +- ash/{wm/common => common/wm}/panels/OWNERS | 0 .../wm}/panels/panel_layout_manager.cc | 24 +-- .../wm}/panels/panel_layout_manager.h | 24 +-- .../wm}/panels/panel_window_resizer.cc | 20 +- .../wm}/panels/panel_window_resizer.h | 8 +- .../wm}/root_window_finder.cc | 8 +- .../common => common/wm}/root_window_finder.h | 6 +- ash/{wm/common => common/wm}/shelf/wm_shelf.h | 8 +- .../wm}/shelf/wm_shelf_constants.cc | 2 +- .../wm}/shelf/wm_shelf_constants.h | 6 +- .../wm}/shelf/wm_shelf_observer.h | 10 +- .../wm}/shelf/wm_shelf_types.h | 6 +- .../wm}/shelf/wm_shelf_util.cc | 2 +- .../wm}/shelf/wm_shelf_util.h | 8 +- .../wm}/switchable_windows.cc | 6 +- .../common => common/wm}/switchable_windows.h | 6 +- .../wm}/window_animation_types.h | 6 +- .../wm}/window_parenting_utils.cc | 4 +- .../wm}/window_parenting_utils.h | 6 +- .../common => common/wm}/window_positioner.cc | 12 +- .../common => common/wm}/window_positioner.h | 6 +- .../wm}/window_positioning_utils.cc | 6 +- .../wm}/window_positioning_utils.h | 6 +- .../common => common/wm}/window_resizer.cc | 12 +- ash/{wm/common => common/wm}/window_resizer.h | 10 +- ash/{wm/common => common/wm}/window_state.cc | 16 +- ash/{wm/common => common/wm}/window_state.h | 10 +- .../wm}/window_state_delegate.cc | 2 +- .../wm}/window_state_delegate.h | 6 +- .../wm}/window_state_observer.h | 8 +- .../common => common/wm}/window_state_util.cc | 8 +- .../common => common/wm}/window_state_util.h | 6 +- .../wm}/wm_activation_observer.h | 6 +- .../wm}/wm_display_observer.h | 6 +- ash/{wm/common => common/wm}/wm_event.cc | 2 +- ash/{wm/common => common/wm}/wm_event.h | 8 +- ash/{wm/common => common/wm}/wm_globals.cc | 2 +- ash/{wm/common => common/wm}/wm_globals.h | 6 +- .../common => common/wm}/wm_layout_manager.h | 6 +- ash/{wm/common => common/wm}/wm_lookup.cc | 2 +- ash/{wm/common => common/wm}/wm_lookup.h | 6 +- .../wm}/wm_overview_mode_observer.h | 6 +- .../wm}/wm_root_window_controller.h | 8 +- .../wm}/wm_root_window_controller_observer.h | 6 +- .../common => common/wm}/wm_screen_util.cc | 6 +- ash/{wm/common => common/wm}/wm_screen_util.h | 6 +- .../wm}/wm_shell_window_ids.h | 6 +- .../wm}/wm_snap_to_pixel_layout_manager.cc | 4 +- .../wm}/wm_snap_to_pixel_layout_manager.h | 8 +- .../wm}/wm_toplevel_window_event_handler.cc | 18 +- .../wm}/wm_toplevel_window_event_handler.h | 10 +- ash/{wm/common => common/wm}/wm_types.cc | 2 +- ash/{wm/common => common/wm}/wm_types.h | 6 +- .../wm}/wm_user_metrics_action.h | 6 +- ash/{wm/common => common/wm}/wm_window.h | 6 +- .../common => common/wm}/wm_window_observer.h | 6 +- .../common => common/wm}/wm_window_property.h | 6 +- .../common => common/wm}/wm_window_tracker.h | 10 +- .../wm}/workspace/magnetism_matcher.cc | 2 +- .../wm}/workspace/magnetism_matcher.h | 6 +- .../multi_window_resize_controller.cc | 12 +- .../multi_window_resize_controller.h | 8 +- .../workspace/phantom_window_controller.cc | 12 +- .../wm}/workspace/phantom_window_controller.h | 6 +- .../wm}/workspace/two_step_edge_cycler.cc | 2 +- .../wm}/workspace/two_step_edge_cycler.h | 6 +- .../wm}/workspace/workspace_layout_manager.cc | 26 +-- .../wm}/workspace/workspace_layout_manager.h | 18 +- ...rkspace_layout_manager_backdrop_delegate.h | 8 +- .../workspace_layout_manager_delegate.h | 6 +- .../wm}/workspace/workspace_types.h | 6 +- .../wm}/workspace/workspace_window_resizer.cc | 34 ++-- .../wm}/workspace/workspace_window_resizer.h | 12 +- ash/display/display_manager_unittest.cc | 2 +- ash/display/screen_ash.cc | 2 +- ash/display/screen_position_controller.cc | 2 +- .../window_tree_host_manager_unittest.cc | 4 +- ash/drag_drop/drag_drop_tracker.cc | 2 +- ash/extended_desktop_unittest.cc | 2 +- ash/focus_cycler.cc | 2 +- ash/focus_cycler_unittest.cc | 4 +- .../caption_buttons/frame_size_button.cc | 8 +- .../frame_size_button_unittest.cc | 2 +- ash/frame/custom_frame_view_ash.cc | 6 +- ash/frame/default_header_painter_unittest.cc | 2 +- ash/frame/frame_border_hit_test_controller.cc | 2 +- ash/metrics/user_metrics_recorder.cc | 4 +- ash/root_window_controller.cc | 22 +-- ash/root_window_controller_common.cc | 4 +- ash/root_window_controller_unittest.cc | 2 +- ash/shelf/overflow_bubble_view.cc | 2 +- ash/shelf/shelf.cc | 2 +- ash/shelf/shelf_layout_manager.cc | 8 +- ash/shelf/shelf_layout_manager.h | 6 +- ash/shelf/shelf_layout_manager_observer.h | 2 +- ash/shelf/shelf_layout_manager_unittest.cc | 2 +- ash/shelf/shelf_types.h | 2 +- ash/shelf/shelf_view.cc | 2 +- ash/shelf/shelf_widget.cc | 6 +- ash/shelf/shelf_widget.h | 2 +- ash/shelf/shelf_window_watcher.cc | 2 +- .../shelf_window_watcher_item_delegate.cc | 2 +- ash/shelf/shelf_window_watcher_unittest.cc | 4 +- ash/shell.cc | 4 +- ash/shell/shell_delegate_impl.cc | 2 +- ash/shell/toplevel_window.cc | 4 +- ash/shell_window_ids.h | 2 +- ash/system/cast/tray_cast.cc | 2 +- ash/system/chromeos/network/tray_network.cc | 2 +- .../screen_security/screen_tray_item.cc | 2 +- .../virtual_keyboard/virtual_keyboard_tray.cc | 2 +- ash/system/date/tray_date.cc | 2 +- ash/system/overview/overview_button_tray.cc | 2 +- ash/system/status_area_widget.cc | 4 +- ash/system/status_area_widget_delegate.cc | 2 +- ash/system/tray/system_tray.cc | 2 +- ash/system/tray/tray_background_view.cc | 2 +- ash/system/tray/tray_background_view.h | 2 +- ash/system/tray/tray_image_item.cc | 2 +- ash/system/tray/tray_item_view.cc | 2 +- ash/system/tray/tray_utils.cc | 2 +- ash/system/user/tray_user.cc | 2 +- .../web_notification/web_notification_tray.cc | 2 +- .../web_notification_tray_unittest.cc | 2 +- ash/test/ash_test_base.cc | 2 +- ash/test/test_shell_delegate.cc | 2 +- ash/test/ui_controls_factory_ash.cc | 2 +- ash/wm/always_on_top_controller_unittest.cc | 6 +- ash/wm/ash_focus_rules.cc | 2 +- ash/wm/ash_focus_rules_unittest.cc | 2 +- ash/wm/aura/aura_layout_manager_adapter.cc | 2 +- ash/wm/aura/wm_globals_aura.cc | 6 +- ash/wm/aura/wm_globals_aura.h | 2 +- ash/wm/aura/wm_lookup_aura.cc | 2 +- ash/wm/aura/wm_lookup_aura.h | 2 +- ash/wm/aura/wm_root_window_controller_aura.cc | 2 +- ash/wm/aura/wm_root_window_controller_aura.h | 2 +- ash/wm/aura/wm_shelf_aura.cc | 4 +- ash/wm/aura/wm_shelf_aura.h | 2 +- ash/wm/aura/wm_window_aura.cc | 8 +- ash/wm/aura/wm_window_aura.h | 2 +- ash/wm/common/ash_wm_common.gyp | 130 ------------- .../docked_window_layout_manager_unittest.cc | 8 +- ash/wm/dock/docked_window_resizer_unittest.cc | 10 +- ash/wm/drag_window_resizer.cc | 4 +- ash/wm/drag_window_resizer.h | 2 +- ash/wm/drag_window_resizer_unittest.cc | 2 +- ash/wm/gestures/shelf_gesture_handler.cc | 2 +- ash/wm/immersive_fullscreen_controller.cc | 2 +- ...mmersive_fullscreen_controller_unittest.cc | 2 +- ash/wm/lock_layout_manager.cc | 4 +- ash/wm/lock_layout_manager.h | 2 +- ash/wm/lock_layout_manager_unittest.cc | 2 +- ash/wm/lock_window_state.cc | 10 +- ash/wm/lock_window_state.h | 2 +- .../maximize_mode_window_manager.cc | 4 +- .../maximize_mode_window_manager.h | 2 +- .../maximize_mode_window_manager_unittest.cc | 6 +- .../maximize_mode_window_state.cc | 12 +- .../maximize_mode_window_state.h | 2 +- .../workspace_backdrop_delegate.cc | 2 +- .../workspace_backdrop_delegate.h | 2 +- ash/wm/mru_window_tracker.cc | 4 +- ash/wm/mru_window_tracker_unittest.cc | 2 +- ash/wm/overview/DEPS | 2 +- .../scoped_transform_overview_window.cc | 4 +- ash/wm/overview/window_grid.cc | 12 +- ash/wm/overview/window_grid.h | 2 +- ash/wm/overview/window_selector.cc | 20 +- ash/wm/overview/window_selector.h | 4 +- ash/wm/overview/window_selector_controller.cc | 6 +- ash/wm/overview/window_selector_item.cc | 14 +- ash/wm/overview/window_selector_item.h | 2 +- ash/wm/overview/window_selector_unittest.cc | 6 +- .../panels/attached_panel_window_targeter.cc | 2 +- .../panels/panel_layout_manager_unittest.cc | 4 +- ash/wm/panels/panel_window_event_handler.cc | 2 +- .../panels/panel_window_resizer_unittest.cc | 6 +- ash/wm/resize_handle_window_targeter.cc | 2 +- ash/wm/resize_handle_window_targeter.h | 2 +- ash/wm/resize_shadow_and_cursor_unittest.cc | 2 +- ash/wm/stacking_controller.cc | 2 +- .../system_gesture_event_filter_unittest.cc | 4 +- ash/wm/toplevel_window_event_handler.h | 4 +- .../toplevel_window_event_handler_unittest.cc | 2 +- ash/wm/video_detector.cc | 2 +- ash/wm/video_detector_unittest.cc | 4 +- ash/wm/window_animations.cc | 2 +- ash/wm/window_animations_unittest.cc | 4 +- ash/wm/window_cycle_controller_unittest.cc | 2 +- ash/wm/window_cycle_list.cc | 2 +- ash/wm/window_positioner_unittest.cc | 6 +- ash/wm/window_properties.cc | 2 +- ash/wm/window_state_aura.cc | 2 +- ash/wm/window_state_unittest.cc | 6 +- ash/wm/window_util.cc | 8 +- ash/wm/window_util_unittest.cc | 4 +- .../workspace/magnetism_matcher_unittest.cc | 2 +- ...multi_window_resize_controller_unittest.cc | 2 +- ash/wm/workspace/workspace_event_handler.cc | 6 +- ash/wm/workspace/workspace_event_handler.h | 2 +- .../workspace_event_handler_unittest.cc | 4 +- .../workspace_layout_manager_unittest.cc | 8 +- .../workspace_window_resizer_unittest.cc | 10 +- ash/wm/workspace_controller.cc | 8 +- ash/wm/workspace_controller.h | 2 +- ash/wm/workspace_controller_unittest.cc | 6 +- .../background/ash_user_wallpaper_delegate.cc | 2 +- .../browser/chromeos/events/event_rewriter.cc | 2 +- .../events/event_rewriter_unittest.cc | 2 +- .../extensions/wallpaper_private_api.cc | 2 +- .../wallpaper_private_api_unittest.cc | 2 +- .../chromeos/login/lock/screen_locker.cc | 4 +- .../login/lock/screen_locker_browsertest.cc | 2 +- ...imize_on_first_run_chromeos_browsertest.cc | 2 +- .../fullscreen_notification_blocker.cc | 2 +- .../ash/accelerator_commands_browsertest.cc | 2 +- .../ash/accelerator_controller_browsertest.cc | 2 +- .../browser/ui/ash/chrome_shell_delegate.cc | 2 +- .../arc_app_window_launcher_controller.cc | 2 +- .../chrome_launcher_controller_browsertest.cc | 2 +- ...ion_app_window_launcher_item_controller.cc | 2 +- .../multi_user_window_manager_chromeos.cc | 2 +- ...i_user_window_manager_chromeos_unittest.cc | 4 +- .../user_switch_animator_chromeos.cc | 4 +- .../solid_color_user_wallpaper_delegate.cc | 2 +- .../ui/ash/window_positioner_unittest.cc | 4 +- ...chrome_native_app_window_views_aura_ash.cc | 6 +- .../browser/ui/views/chrome_views_delegate.cc | 2 +- .../ui/views/frame/browser_frame_ash.cc | 4 +- .../frame/immersive_mode_controller_ash.cc | 2 +- .../frame/immersive_mode_controller_ash.h | 2 +- .../browser/ui/views/status_bubble_views.cc | 2 +- .../ui/views/tabs/tab_drag_controller.cc | 2 +- .../tab_drag_controller_interactive_uitest.cc | 4 +- .../ui/views/tabs/window_finder_ash.cc | 2 +- .../browser/ui/window_sizer/window_sizer.cc | 2 +- .../ui/window_sizer/window_sizer_ash.cc | 4 +- .../window_sizer/window_sizer_ash_unittest.cc | 6 +- .../window_sizer_common_unittest.cc | 2 +- components/exo/display.cc | 2 +- components/exo/display_unittest.cc | 2 +- components/exo/pointer_unittest.cc | 2 +- components/exo/shell_surface.cc | 4 +- components/exo/shell_surface.h | 4 +- components/exo/touch_unittest.cc | 2 +- components/exo/wayland/server.cc | 2 +- mash/wm/DEPS | 2 +- mash/wm/bridge/mus_layout_manager_adapter.cc | 2 +- mash/wm/bridge/wm_globals_mus.cc | 6 +- mash/wm/bridge/wm_globals_mus.h | 2 +- mash/wm/bridge/wm_lookup_mus.h | 2 +- .../bridge/wm_root_window_controller_mus.cc | 2 +- .../wm/bridge/wm_root_window_controller_mus.h | 2 +- mash/wm/bridge/wm_shelf_mus.h | 2 +- mash/wm/bridge/wm_window_mus.cc | 10 +- mash/wm/bridge/wm_window_mus.h | 4 +- mash/wm/container_ids.cc | 2 +- mash/wm/container_ids.h | 2 +- mash/wm/drag_window_resizer.h | 2 +- mash/wm/frame/move_event_handler.h | 2 +- mash/wm/root_window_controller.cc | 12 +- mash/wm/window_manager.cc | 2 +- .../workspace_layout_manager_unittest.cc | 12 +- 296 files changed, 855 insertions(+), 985 deletions(-) rename ash/{wm => }/common/DEPS (79%) rename ash/{wm/common => common/wm}/always_on_top_controller.cc (89%) rename ash/{wm/common => common/wm}/always_on_top_controller.h (88%) rename ash/{wm/common => common/wm}/background_animator.cc (97%) rename ash/{wm/common => common/wm}/background_animator.h (93%) rename ash/{wm/common => common/wm}/container_finder.cc (91%) rename ash/{wm/common => common/wm}/container_finder.h (86%) rename ash/{wm/common => common/wm}/default_state.cc (97%) rename ash/{wm/common => common/wm}/default_state.h (94%) rename ash/{wm/common => common/wm}/default_window_resizer.cc (89%) rename ash/{wm/common => common/wm}/default_window_resizer.h (88%) rename ash/{wm/common => common/wm}/dock/dock_types.h (93%) rename ash/{wm/common => common/wm}/dock/docked_window_layout_manager.cc (98%) rename ash/{wm/common => common/wm}/dock/docked_window_layout_manager.h (95%) rename ash/{wm/common => common/wm}/dock/docked_window_layout_manager_observer.h (83%) rename ash/{wm/common => common/wm}/dock/docked_window_resizer.cc (96%) rename ash/{wm/common => common/wm}/dock/docked_window_resizer.h (93%) rename ash/{wm/common => common/wm}/drag_details.cc (95%) rename ash/{wm/common => common/wm}/drag_details.h (92%) rename ash/{wm/common => common/wm}/fullscreen_window_finder.cc (87%) rename ash/{wm/common => common/wm}/fullscreen_window_finder.h (76%) rename ash/{wm/common => common/wm}/panels/OWNERS (100%) rename ash/{wm/common => common/wm}/panels/panel_layout_manager.cc (98%) rename ash/{wm/common => common/wm}/panels/panel_layout_manager.h (91%) rename ash/{wm/common => common/wm}/panels/panel_window_resizer.cc (94%) rename ash/{wm/common => common/wm}/panels/panel_window_resizer.h (93%) rename ash/{wm/common => common/wm}/root_window_finder.cc (86%) rename ash/{wm/common => common/wm}/root_window_finder.h (84%) rename ash/{wm/common => common/wm}/shelf/wm_shelf.h (87%) rename ash/{wm/common => common/wm}/shelf/wm_shelf_constants.cc (86%) rename ash/{wm/common => common/wm}/shelf/wm_shelf_constants.h (76%) rename ash/{wm/common => common/wm}/shelf/wm_shelf_observer.h (73%) rename ash/{wm/common => common/wm}/shelf/wm_shelf_types.h (87%) rename ash/{wm/common => common/wm}/shelf/wm_shelf_util.cc (89%) rename ash/{wm/common => common/wm}/shelf/wm_shelf_util.h (67%) rename ash/{wm/common => common/wm}/switchable_windows.cc (87%) rename ash/{wm/common => common/wm}/switchable_windows.h (84%) rename ash/{wm/common => common/wm}/window_animation_types.h (82%) rename ash/{wm/common => common/wm}/window_parenting_utils.cc (91%) rename ash/{wm/common => common/wm}/window_parenting_utils.h (86%) rename ash/{wm/common => common/wm}/window_positioner.cc (98%) rename ash/{wm/common => common/wm}/window_positioner.h (97%) rename ash/{wm/common => common/wm}/window_positioning_utils.cc (95%) rename ash/{wm/common => common/wm}/window_positioning_utils.h (91%) rename ash/{wm/common => common/wm}/window_resizer.cc (97%) rename ash/{wm/common => common/wm}/window_resizer.h (94%) rename ash/{wm/common => common/wm}/window_state.cc (97%) rename ash/{wm/common => common/wm}/window_state.h (98%) rename ash/{wm/common => common/wm}/window_state_delegate.cc (91%) rename ash/{wm/common => common/wm}/window_state_delegate.h (89%) rename ash/{wm/common => common/wm}/window_state_observer.h (88%) rename ash/{wm/common => common/wm}/window_state_util.cc (82%) rename ash/{wm/common => common/wm}/window_state_util.h (79%) rename ash/{wm/common => common/wm}/wm_activation_observer.h (86%) rename ash/{wm/common => common/wm}/wm_display_observer.h (82%) rename ash/{wm/common => common/wm}/wm_event.cc (92%) rename ash/{wm/common => common/wm}/wm_event.h (96%) rename ash/{wm/common => common/wm}/wm_globals.cc (91%) rename ash/{wm/common => common/wm}/wm_globals.h (96%) rename ash/{wm/common => common/wm}/wm_layout_manager.h (93%) rename ash/{wm/common => common/wm}/wm_lookup.cc (91%) rename ash/{wm/common => common/wm}/wm_lookup.h (89%) rename ash/{wm/common => common/wm}/wm_overview_mode_observer.h (73%) rename ash/{wm/common => common/wm}/wm_root_window_controller.h (89%) rename ash/{wm/common => common/wm}/wm_root_window_controller_observer.h (75%) rename ash/{wm/common => common/wm}/wm_screen_util.cc (88%) rename ash/{wm/common => common/wm}/wm_screen_util.h (82%) rename ash/{wm/common => common/wm}/wm_shell_window_ids.h (93%) rename ash/{wm/common => common/wm}/wm_snap_to_pixel_layout_manager.cc (91%) rename ash/{wm/common => common/wm}/wm_snap_to_pixel_layout_manager.h (82%) rename ash/{wm/common => common/wm}/wm_toplevel_window_event_handler.cc (98%) rename ash/{wm/common => common/wm}/wm_toplevel_window_event_handler.h (93%) rename ash/{wm/common => common/wm}/wm_types.cc (97%) rename ash/{wm/common => common/wm}/wm_types.h (94%) rename ash/{wm/common => common/wm}/wm_user_metrics_action.h (81%) rename ash/{wm/common => common/wm}/wm_window.h (98%) rename ash/{wm/common => common/wm}/wm_window_observer.h (91%) rename ash/{wm/common => common/wm}/wm_window_property.h (77%) rename ash/{wm/common => common/wm}/wm_window_tracker.h (62%) rename ash/{wm/common => common/wm}/workspace/magnetism_matcher.cc (99%) rename ash/{wm/common => common/wm}/workspace/magnetism_matcher.h (97%) rename ash/{wm/common => common/wm}/workspace/multi_window_resize_controller.cc (98%) rename ash/{wm/common => common/wm}/workspace/multi_window_resize_controller.h (95%) rename ash/{wm/common => common/wm}/workspace/phantom_window_controller.cc (95%) rename ash/{wm/common => common/wm}/workspace/phantom_window_controller.h (89%) rename ash/{wm/common => common/wm}/workspace/two_step_edge_cycler.cc (97%) rename ash/{wm/common => common/wm}/workspace/two_step_edge_cycler.h (90%) rename ash/{wm/common => common/wm}/workspace/workspace_layout_manager.cc (94%) rename ash/{wm/common => common/wm}/workspace/workspace_layout_manager.h (91%) rename ash/{wm/common => common/wm}/workspace/workspace_layout_manager_backdrop_delegate.h (85%) rename ash/{wm/common => common/wm}/workspace/workspace_layout_manager_delegate.h (77%) rename ash/{wm/common => common/wm}/workspace/workspace_types.h (80%) rename ash/{wm/common => common/wm}/workspace/workspace_window_resizer.cc (97%) rename ash/{wm/common => common/wm}/workspace/workspace_window_resizer.h (96%) delete mode 100644 ash/wm/common/ash_wm_common.gyp diff --git a/ash/DEPS b/ash/DEPS index 7fdc4d887731cb..bcca1ff9fa86fe 100644 --- a/ash/DEPS +++ b/ash/DEPS @@ -27,9 +27,9 @@ specific_include_rules = { "root_window_controller_common\.*": [ "-ash", "+ash/ash_export.h", + "+ash/common", "+ash/root_window_controller_common.h", "+ash/shell_window_ids.h", - "+ash/wm/common", "-ui/aura", ], "shell.cc": [ diff --git a/ash/README.md b/ash/README.md index e0396e03e34d6e..b5424c6dfa1fe7 100644 --- a/ash/README.md +++ b/ash/README.md @@ -3,6 +3,6 @@ Mus+ash Ash is transitioning from using aura to using mus. During the transition period ash has support for both aura and mus. In order to work with both toolkits ash has a porting layer. This layer exists in -ash/wm/common. As portions of ash are converted to the porting layer -DEPS files are put in place to ensure aura specific dependencies are -not added back. +ash/common. As portions of ash are converted to the porting layer they +should move to ash/common. DEPS files may also be used to ensure new +dependencies do not get added. diff --git a/ash/accelerators/accelerator_commands.cc b/ash/accelerators/accelerator_commands.cc index 71acf98acd18ab..cbe295c843fc05 100644 --- a/ash/accelerators/accelerator_commands.cc +++ b/ash/accelerators/accelerator_commands.cc @@ -4,12 +4,12 @@ #include "ash/accelerators/accelerator_commands.h" +#include "ash/common/wm/window_state.h" +#include "ash/common/wm/wm_event.h" #include "ash/display/display_manager.h" #include "ash/display/display_util.h" #include "ash/shell.h" #include "ash/shell_delegate.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_event.h" #include "ash/wm/mru_window_tracker.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" diff --git a/ash/accelerators/accelerator_commands_unittest.cc b/ash/accelerators/accelerator_commands_unittest.cc index 61e9d8a904055a..dfc16488665279 100644 --- a/ash/accelerators/accelerator_commands_unittest.cc +++ b/ash/accelerators/accelerator_commands_unittest.cc @@ -6,8 +6,8 @@ #include +#include "ash/common/wm/window_state.h" #include "ash/test/ash_test_base.h" -#include "ash/wm/common/window_state.h" #include "ash/wm/window_state_aura.h" #include "ui/aura/window.h" diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc index 0b2bba82a852e4..a38737625bbd50 100644 --- a/ash/accelerators/accelerator_controller.cc +++ b/ash/accelerators/accelerator_controller.cc @@ -12,6 +12,8 @@ #include "ash/accelerators/accelerator_commands.h" #include "ash/accelerators/debug_commands.h" #include "ash/ash_switches.h" +#include "ash/common/wm/window_state.h" +#include "ash/common/wm/wm_event.h" #include "ash/debug.h" #include "ash/display/window_tree_host_manager.h" #include "ash/focus_cycler.h" @@ -46,8 +48,6 @@ #include "ash/touch/touch_hud_debug.h" #include "ash/utility/screenshot_controller.h" #include "ash/volume_control_delegate.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_event.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" diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc index de10c1bb5b2378..52a6ab1f52c744 100644 --- a/ash/accelerators/accelerator_controller_unittest.cc +++ b/ash/accelerators/accelerator_controller_unittest.cc @@ -7,6 +7,10 @@ #include "ash/accelerators/accelerator_table.h" #include "ash/accessibility_delegate.h" #include "ash/ash_switches.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/display/display_manager.h" #include "ash/ime_control_delegate.h" #include "ash/screen_util.h" @@ -24,10 +28,6 @@ #include "ash/test/test_volume_control_delegate.h" #include "ash/volume_control_delegate.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/panels/panel_layout_manager.h" -#include "ash/wm/common/window_positioning_utils.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_event.h" #include "ash/wm/lock_state_controller.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" diff --git a/ash/accelerators/accelerator_delegate.cc b/ash/accelerators/accelerator_delegate.cc index d831510056dd71..d4419e862f9df0 100644 --- a/ash/accelerators/accelerator_delegate.cc +++ b/ash/accelerators/accelerator_delegate.cc @@ -5,8 +5,8 @@ #include "ash/accelerators/accelerator_delegate.h" #include "ash/accelerators/accelerator_controller.h" +#include "ash/common/wm/window_state.h" #include "ash/shell.h" -#include "ash/wm/common/window_state.h" #include "ash/wm/window_state_aura.h" #include "ui/base/accelerators/accelerator.h" #include "ui/events/event.h" diff --git a/ash/accelerators/accelerator_filter_unittest.cc b/ash/accelerators/accelerator_filter_unittest.cc index c60a86dd6aa76b..70b68492f9a405 100644 --- a/ash/accelerators/accelerator_filter_unittest.cc +++ b/ash/accelerators/accelerator_filter_unittest.cc @@ -8,13 +8,13 @@ #include "ash/accelerators/accelerator_controller.h" #include "ash/accelerators/accelerator_delegate.h" +#include "ash/common/wm/window_state.h" #include "ash/shell.h" #include "ash/shell_window_ids.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/common/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 f9b59da9112a15..a3f5d42d9d036f 100644 --- a/ash/accelerators/accelerator_interactive_uitest_chromeos.cc +++ b/ash/accelerators/accelerator_interactive_uitest_chromeos.cc @@ -4,6 +4,7 @@ #include "ash/accelerators/accelerator_controller.h" +#include "ash/common/wm/window_state.h" #include "ash/shell.h" #include "ash/shell_observer.h" #include "ash/system/chromeos/network/network_observer.h" @@ -12,7 +13,6 @@ #include "ash/test/ash_interactive_ui_test_base.h" #include "ash/test/test_screenshot_delegate.h" #include "ash/test/test_volume_control_delegate.h" -#include "ash/wm/common/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/ash.gyp b/ash/ash.gyp index d7c5a47df45a81..6ae93a0a7fa562 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -49,6 +49,96 @@ 'cancel_mode.h', 'cast_config_delegate.cc', 'cast_config_delegate.h', + 'common/wm/always_on_top_controller.cc', + 'common/wm/always_on_top_controller.h', + 'common/wm/background_animator.cc', + 'common/wm/background_animator.h', + 'common/wm/container_finder.cc', + 'common/wm/container_finder.h', + 'common/wm/default_state.cc', + 'common/wm/default_state.h', + 'common/wm/default_window_resizer.cc', + 'common/wm/default_window_resizer.h', + 'common/wm/dock/docked_window_layout_manager.cc', + 'common/wm/dock/docked_window_layout_manager.h', + 'common/wm/dock/docked_window_layout_manager_observer.h', + 'common/wm/dock/docked_window_resizer.cc', + 'common/wm/dock/docked_window_resizer.h', + 'common/wm/drag_details.cc', + 'common/wm/drag_details.h', + 'common/wm/fullscreen_window_finder.cc', + 'common/wm/fullscreen_window_finder.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/shelf/wm_shelf.h', + 'common/wm/shelf/wm_shelf_constants.cc', + 'common/wm/shelf/wm_shelf_constants.h', + 'common/wm/shelf/wm_shelf_observer.h', + 'common/wm/shelf/wm_shelf_types.h', + 'common/wm/shelf/wm_shelf_util.cc', + 'common/wm/shelf/wm_shelf_util.h', + 'common/wm/switchable_windows.cc', + 'common/wm/switchable_windows.h', + 'common/wm/window_animation_types.h', + 'common/wm/window_parenting_utils.cc', + 'common/wm/window_parenting_utils.h', + 'common/wm/window_positioner.cc', + 'common/wm/window_positioner.h', + 'common/wm/window_positioning_utils.cc', + 'common/wm/window_positioning_utils.h', + 'common/wm/window_resizer.cc', + 'common/wm/window_resizer.h', + 'common/wm/window_state.cc', + 'common/wm/window_state.h', + 'common/wm/window_state_delegate.cc', + 'common/wm/window_state_delegate.h', + 'common/wm/window_state_observer.h', + 'common/wm/window_state_util.cc', + 'common/wm/window_state_util.h', + 'common/wm/wm_activation_observer.h', + 'common/wm/wm_display_observer.h', + 'common/wm/wm_event.cc', + 'common/wm/wm_event.h', + 'common/wm/wm_globals.cc', + 'common/wm/wm_globals.h', + 'common/wm/wm_layout_manager.h', + 'common/wm/wm_lookup.cc', + 'common/wm/wm_lookup.h', + 'common/wm/wm_overview_mode_observer.h', + 'common/wm/wm_root_window_controller.h', + 'common/wm/wm_root_window_controller_observer.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_user_metrics_action.h', + 'common/wm/wm_window.h', + 'common/wm/wm_window_observer.h', + 'common/wm/wm_window_property.h', + 'common/wm/wm_window_tracker.h', + 'common/wm/workspace/magnetism_matcher.cc', + 'common/wm/workspace/magnetism_matcher.h', + 'common/wm/workspace/multi_window_resize_controller.cc', + 'common/wm/workspace/multi_window_resize_controller.h', + 'common/wm/workspace/phantom_window_controller.cc', + 'common/wm/workspace/phantom_window_controller.h', + 'common/wm/workspace/two_step_edge_cycler.cc', + 'common/wm/workspace/two_step_edge_cycler.h', + 'common/wm/workspace/workspace_layout_manager.cc', + 'common/wm/workspace/workspace_layout_manager.h', + 'common/wm/workspace/workspace_layout_manager_backdrop_delegate.h', + 'common/wm/workspace/workspace_layout_manager_delegate.h', + 'common/wm/workspace/workspace_types.h', + 'common/wm/workspace/workspace_window_resizer.cc', + 'common/wm/workspace/workspace_window_resizer.h', 'container_delegate.h', 'container_delegate_aura.cc', 'container_delegate_aura.h', @@ -546,96 +636,6 @@ 'wm/aura/wm_window_aura.h', 'wm/boot_splash_screen_chromeos.cc', 'wm/boot_splash_screen_chromeos.h', - 'wm/common/always_on_top_controller.cc', - 'wm/common/always_on_top_controller.h', - 'wm/common/background_animator.cc', - 'wm/common/background_animator.h', - 'wm/common/container_finder.cc', - 'wm/common/container_finder.h', - 'wm/common/default_state.cc', - 'wm/common/default_state.h', - 'wm/common/default_window_resizer.cc', - 'wm/common/default_window_resizer.h', - 'wm/common/dock/docked_window_layout_manager.cc', - 'wm/common/dock/docked_window_layout_manager.h', - 'wm/common/dock/docked_window_layout_manager_observer.h', - 'wm/common/dock/docked_window_resizer.cc', - 'wm/common/dock/docked_window_resizer.h', - 'wm/common/drag_details.cc', - 'wm/common/drag_details.h', - 'wm/common/fullscreen_window_finder.cc', - 'wm/common/fullscreen_window_finder.h', - 'wm/common/panels/panel_layout_manager.cc', - 'wm/common/panels/panel_layout_manager.h', - 'wm/common/panels/panel_window_resizer.cc', - 'wm/common/panels/panel_window_resizer.h', - 'wm/common/root_window_finder.cc', - 'wm/common/root_window_finder.h', - 'wm/common/shelf/wm_shelf.h', - 'wm/common/shelf/wm_shelf_constants.cc', - 'wm/common/shelf/wm_shelf_constants.h', - 'wm/common/shelf/wm_shelf_observer.h', - 'wm/common/shelf/wm_shelf_types.h', - 'wm/common/shelf/wm_shelf_util.cc', - 'wm/common/shelf/wm_shelf_util.h', - 'wm/common/switchable_windows.cc', - 'wm/common/switchable_windows.h', - 'wm/common/window_animation_types.h', - 'wm/common/window_parenting_utils.cc', - 'wm/common/window_parenting_utils.h', - 'wm/common/window_positioner.cc', - 'wm/common/window_positioner.h', - 'wm/common/window_positioning_utils.cc', - 'wm/common/window_positioning_utils.h', - 'wm/common/window_resizer.cc', - 'wm/common/window_resizer.h', - 'wm/common/window_state.cc', - 'wm/common/window_state.h', - 'wm/common/window_state_delegate.cc', - 'wm/common/window_state_delegate.h', - 'wm/common/window_state_observer.h', - 'wm/common/window_state_util.cc', - 'wm/common/window_state_util.h', - 'wm/common/wm_activation_observer.h', - 'wm/common/wm_display_observer.h', - 'wm/common/wm_event.cc', - 'wm/common/wm_event.h', - 'wm/common/wm_globals.cc', - 'wm/common/wm_globals.h', - 'wm/common/wm_layout_manager.h', - 'wm/common/wm_lookup.cc', - 'wm/common/wm_lookup.h', - 'wm/common/wm_overview_mode_observer.h', - 'wm/common/wm_root_window_controller.h', - 'wm/common/wm_root_window_controller_observer.h', - 'wm/common/wm_screen_util.cc', - 'wm/common/wm_screen_util.h', - 'wm/common/wm_snap_to_pixel_layout_manager.cc', - 'wm/common/wm_snap_to_pixel_layout_manager.h', - 'wm/common/wm_toplevel_window_event_handler.cc', - 'wm/common/wm_toplevel_window_event_handler.h', - 'wm/common/wm_types.cc', - 'wm/common/wm_types.h', - 'wm/common/wm_user_metrics_action.h', - 'wm/common/wm_window.h', - 'wm/common/wm_window_observer.h', - 'wm/common/wm_window_property.h', - 'wm/common/wm_window_tracker.h', - 'wm/common/workspace/magnetism_matcher.cc', - 'wm/common/workspace/magnetism_matcher.h', - 'wm/common/workspace/multi_window_resize_controller.cc', - 'wm/common/workspace/multi_window_resize_controller.h', - 'wm/common/workspace/phantom_window_controller.cc', - 'wm/common/workspace/phantom_window_controller.h', - 'wm/common/workspace/two_step_edge_cycler.cc', - 'wm/common/workspace/two_step_edge_cycler.h', - 'wm/common/workspace/workspace_layout_manager.cc', - 'wm/common/workspace/workspace_layout_manager.h', - 'wm/common/workspace/workspace_layout_manager_backdrop_delegate.h', - 'wm/common/workspace/workspace_layout_manager_delegate.h', - 'wm/common/workspace/workspace_types.h', - 'wm/common/workspace/workspace_window_resizer.cc', - 'wm/common/workspace/workspace_window_resizer.h', 'wm/cursor_manager_chromeos.cc', 'wm/cursor_manager_chromeos.h', 'wm/dim_window.cc', diff --git a/ash/autoclick/autoclick_controller.cc b/ash/autoclick/autoclick_controller.cc index 47846dcaa5aeea..058d2f5609da64 100644 --- a/ash/autoclick/autoclick_controller.cc +++ b/ash/autoclick/autoclick_controller.cc @@ -4,9 +4,9 @@ #include "ash/autoclick/autoclick_controller.h" +#include "ash/common/wm/root_window_finder.h" #include "ash/shell.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/root_window_finder.h" #include "base/timer/timer.h" #include "ui/aura/env.h" #include "ui/aura/window_tree_host.h" diff --git a/ash/wm/common/DEPS b/ash/common/DEPS similarity index 79% rename from ash/wm/common/DEPS rename to ash/common/DEPS index ec1cc2131680ae..1412c1f7eaf334 100644 --- a/ash/wm/common/DEPS +++ b/ash/common/DEPS @@ -1,7 +1,7 @@ include_rules = [ "-ash", "+ash/ash_export.h", - "+ash/wm/common", + "+ash/common", "+ui", "-ui/aura", ] diff --git a/ash/wm/common/always_on_top_controller.cc b/ash/common/wm/always_on_top_controller.cc similarity index 89% rename from ash/wm/common/always_on_top_controller.cc rename to ash/common/wm/always_on_top_controller.cc index 34042e5f810f03..468cb35b9b8ac6 100644 --- a/ash/wm/common/always_on_top_controller.cc +++ b/ash/common/wm/always_on_top_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/common/always_on_top_controller.h" +#include "ash/common/wm/always_on_top_controller.h" -#include "ash/wm/common/wm_shell_window_ids.h" -#include "ash/wm/common/wm_window.h" -#include "ash/wm/common/wm_window_property.h" -#include "ash/wm/common/workspace/workspace_layout_manager.h" -#include "ash/wm/common/workspace/workspace_layout_manager_delegate.h" +#include "ash/common/wm/wm_shell_window_ids.h" +#include "ash/common/wm/wm_window.h" +#include "ash/common/wm/wm_window_property.h" +#include "ash/common/wm/workspace/workspace_layout_manager.h" +#include "ash/common/wm/workspace/workspace_layout_manager_delegate.h" #include "base/memory/ptr_util.h" namespace ash { diff --git a/ash/wm/common/always_on_top_controller.h b/ash/common/wm/always_on_top_controller.h similarity index 88% rename from ash/wm/common/always_on_top_controller.h rename to ash/common/wm/always_on_top_controller.h index dd990b2ab48892..11ef10a5f89aea 100644 --- a/ash/wm/common/always_on_top_controller.h +++ b/ash/common/wm/always_on_top_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_COMMON_ALWAYS_ON_TOP_CONTROLLER_H_ -#define ASH_WM_COMMON_ALWAYS_ON_TOP_CONTROLLER_H_ +#ifndef ASH_COMMON_WM_ALWAYS_ON_TOP_CONTROLLER_H_ +#define ASH_COMMON_WM_ALWAYS_ON_TOP_CONTROLLER_H_ #include #include "ash/ash_export.h" -#include "ash/wm/common/wm_window_observer.h" +#include "ash/common/wm/wm_window_observer.h" #include "base/macros.h" namespace ash { @@ -46,4 +46,4 @@ class ASH_EXPORT AlwaysOnTopController : public wm::WmWindowObserver { } // namepsace ash -#endif // ASH_WM_COMMON_ALWAYS_ON_TOP_CONTROLLER_H_ +#endif // ASH_COMMON_WM_ALWAYS_ON_TOP_CONTROLLER_H_ diff --git a/ash/wm/common/background_animator.cc b/ash/common/wm/background_animator.cc similarity index 97% rename from ash/wm/common/background_animator.cc rename to ash/common/wm/background_animator.cc index ffdc7c964d1b38..b8596fb2760f91 100644 --- a/ash/wm/common/background_animator.cc +++ b/ash/common/wm/background_animator.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/common/background_animator.h" +#include "ash/common/wm/background_animator.h" namespace ash { namespace { diff --git a/ash/wm/common/background_animator.h b/ash/common/wm/background_animator.h similarity index 93% rename from ash/wm/common/background_animator.h rename to ash/common/wm/background_animator.h index 53d2514464368a..83a1f8c43df55a 100644 --- a/ash/wm/common/background_animator.h +++ b/ash/common/wm/background_animator.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_COMMON_BACKGROUND_ANIMATOR_H_ -#define ASH_WM_COMMON_BACKGROUND_ANIMATOR_H_ +#ifndef ASH_COMMON_WM_BACKGROUND_ANIMATOR_H_ +#define ASH_COMMON_WM_BACKGROUND_ANIMATOR_H_ #include "ash/ash_export.h" #include "base/macros.h" @@ -69,4 +69,4 @@ class ASH_EXPORT BackgroundAnimator : public gfx::AnimationDelegate { } // namespace ash -#endif // ASH_WM_COMMON_BACKGROUND_ANIMATOR_H_ +#endif // ASH_COMMON_WM_BACKGROUND_ANIMATOR_H_ diff --git a/ash/wm/common/container_finder.cc b/ash/common/wm/container_finder.cc similarity index 91% rename from ash/wm/common/container_finder.cc rename to ash/common/wm/container_finder.cc index 12b776cf984573..cb5042baf6445e 100644 --- a/ash/wm/common/container_finder.cc +++ b/ash/common/wm/container_finder.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/common/container_finder.h" +#include "ash/common/wm/container_finder.h" -#include "ash/wm/common/always_on_top_controller.h" -#include "ash/wm/common/root_window_finder.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_globals.h" -#include "ash/wm/common/wm_root_window_controller.h" -#include "ash/wm/common/wm_shell_window_ids.h" -#include "ash/wm/common/wm_window.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/wm_globals.h" +#include "ash/common/wm/wm_root_window_controller.h" +#include "ash/common/wm/wm_shell_window_ids.h" +#include "ash/common/wm/wm_window.h" #include "ui/gfx/geometry/rect.h" namespace ash { diff --git a/ash/wm/common/container_finder.h b/ash/common/wm/container_finder.h similarity index 86% rename from ash/wm/common/container_finder.h rename to ash/common/wm/container_finder.h index 48ec3445e3e46b..980b100c47752e 100644 --- a/ash/wm/common/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_COMMON_CONTAINER_FINDER_H_ -#define ASH_WM_COMMON_CONTAINER_FINDER_H_ +#ifndef ASH_COMMON_WM_CONTAINER_FINDER_H_ +#define ASH_COMMON_WM_CONTAINER_FINDER_H_ #include "ash/ash_export.h" @@ -29,4 +29,4 @@ ASH_EXPORT WmWindow* GetDefaultParent(WmWindow* context, } // namespace wm } // namespace ash -#endif // ASH_WM_COMMON_CONTAINER_FINDER_H_ +#endif // ASH_COMMON_WM_CONTAINER_FINDER_H_ diff --git a/ash/wm/common/default_state.cc b/ash/common/wm/default_state.cc similarity index 97% rename from ash/wm/common/default_state.cc rename to ash/common/wm/default_state.cc index c9a44df797c54e..dce14c95dc4326 100644 --- a/ash/wm/common/default_state.cc +++ b/ash/common/wm/default_state.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/wm/common/default_state.h" - -#include "ash/wm/common/dock/docked_window_layout_manager.h" -#include "ash/wm/common/window_animation_types.h" -#include "ash/wm/common/window_parenting_utils.h" -#include "ash/wm/common/window_positioning_utils.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/window_state_delegate.h" -#include "ash/wm/common/window_state_util.h" -#include "ash/wm/common/wm_event.h" -#include "ash/wm/common/wm_globals.h" -#include "ash/wm/common/wm_root_window_controller.h" -#include "ash/wm/common/wm_screen_util.h" -#include "ash/wm/common/wm_shell_window_ids.h" -#include "ash/wm/common/wm_window.h" +#include "ash/common/wm/default_state.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_globals.h" +#include "ash/common/wm/wm_root_window_controller.h" +#include "ash/common/wm/wm_screen_util.h" +#include "ash/common/wm/wm_shell_window_ids.h" +#include "ash/common/wm/wm_window.h" #include "ui/display/display.h" #include "ui/display/screen.h" diff --git a/ash/wm/common/default_state.h b/ash/common/wm/default_state.h similarity index 94% rename from ash/wm/common/default_state.h rename to ash/common/wm/default_state.h index ca35b213376e46..b7cee4c06a4e1a 100644 --- a/ash/wm/common/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_COMMON_DEFAULT_STATE_H_ -#define ASH_WM_COMMON_DEFAULT_STATE_H_ +#ifndef ASH_COMMON_WM_DEFAULT_STATE_H_ +#define ASH_COMMON_WM_DEFAULT_STATE_H_ -#include "ash/wm/common/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 @@ class DefaultState : public WindowState::State { } // namespace wm } // namespace ash -#endif // ASH_WM_COMMON_DEFAULT_STATE_H_ +#endif // ASH_COMMON_WM_DEFAULT_STATE_H_ diff --git a/ash/wm/common/default_window_resizer.cc b/ash/common/wm/default_window_resizer.cc similarity index 89% rename from ash/wm/common/default_window_resizer.cc rename to ash/common/wm/default_window_resizer.cc index 4bea179bd80d53..bae8f079b60409 100644 --- a/ash/wm/common/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/common/default_window_resizer.h" +#include "ash/common/wm/default_window_resizer.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_globals.h" -#include "ash/wm/common/wm_window.h" +#include "ash/common/wm/window_state.h" +#include "ash/common/wm/wm_globals.h" +#include "ash/common/wm/wm_window.h" namespace ash { diff --git a/ash/wm/common/default_window_resizer.h b/ash/common/wm/default_window_resizer.h similarity index 88% rename from ash/wm/common/default_window_resizer.h rename to ash/common/wm/default_window_resizer.h index 468dca57bd1722..0af11c4f172934 100644 --- a/ash/wm/common/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_COMMON_DEFAULT_WINDOW_RESIZER_H_ -#define ASH_WM_COMMON_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/common/window_resizer.h" +#include "ash/common/wm/window_resizer.h" #include "base/macros.h" namespace ash { @@ -50,4 +50,4 @@ class ASH_EXPORT DefaultWindowResizer : public WindowResizer { } // namespace aura -#endif // ASH_WM_COMMON_DEFAULT_WINDOW_RESIZER_H_ +#endif // ASH_COMMON_WM_DEFAULT_WINDOW_RESIZER_H_ diff --git a/ash/wm/common/dock/dock_types.h b/ash/common/wm/dock/dock_types.h similarity index 93% rename from ash/wm/common/dock/dock_types.h rename to ash/common/wm/dock/dock_types.h index 93bdec3b26f9ed..02e8b45027a3d1 100644 --- a/ash/wm/common/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_COMMON_DOCK_DOCK_TYPES_H_ -#define ASH_WM_COMMON_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 @@ enum DockedActionSource { } // namespace ash -#endif // ASH_WM_COMMON_DOCK_DOCK_TYPES_H_ +#endif // ASH_COMMON_WM_DOCK_DOCK_TYPES_H_ diff --git a/ash/wm/common/dock/docked_window_layout_manager.cc b/ash/common/wm/dock/docked_window_layout_manager.cc similarity index 98% rename from ash/wm/common/dock/docked_window_layout_manager.cc rename to ash/common/wm/dock/docked_window_layout_manager.cc index 9a9434492baa15..9e37ea56ac80fb 100644 --- a/ash/wm/common/dock/docked_window_layout_manager.cc +++ b/ash/common/wm/dock/docked_window_layout_manager.cc @@ -2,20 +2,20 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/wm/common/dock/docked_window_layout_manager.h" - -#include "ash/wm/common/shelf/wm_shelf.h" -#include "ash/wm/common/shelf/wm_shelf_constants.h" -#include "ash/wm/common/shelf/wm_shelf_observer.h" -#include "ash/wm/common/window_animation_types.h" -#include "ash/wm/common/window_parenting_utils.h" -#include "ash/wm/common/window_resizer.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_globals.h" -#include "ash/wm/common/wm_lookup.h" -#include "ash/wm/common/wm_root_window_controller.h" -#include "ash/wm/common/wm_shell_window_ids.h" -#include "ash/wm/common/wm_window.h" +#include "ash/common/wm/dock/docked_window_layout_manager.h" + +#include "ash/common/wm/shelf/wm_shelf.h" +#include "ash/common/wm/shelf/wm_shelf_constants.h" +#include "ash/common/wm/shelf/wm_shelf_observer.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/wm_globals.h" +#include "ash/common/wm/wm_lookup.h" +#include "ash/common/wm/wm_root_window_controller.h" +#include "ash/common/wm/wm_shell_window_ids.h" +#include "ash/common/wm/wm_window.h" #include "base/auto_reset.h" #include "base/metrics/histogram.h" #include "grit/ash_resources.h" diff --git a/ash/wm/common/dock/docked_window_layout_manager.h b/ash/common/wm/dock/docked_window_layout_manager.h similarity index 95% rename from ash/wm/common/dock/docked_window_layout_manager.h rename to ash/common/wm/dock/docked_window_layout_manager.h index 6056fd73922251..99b86fd880eb50 100644 --- a/ash/wm/common/dock/docked_window_layout_manager.h +++ b/ash/common/wm/dock/docked_window_layout_manager.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_WM_COMMON_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_ -#define ASH_WM_COMMON_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 #include "ash/ash_export.h" -#include "ash/wm/common/dock/dock_types.h" -#include "ash/wm/common/dock/docked_window_layout_manager_observer.h" -#include "ash/wm/common/window_state_observer.h" -#include "ash/wm/common/wm_activation_observer.h" -#include "ash/wm/common/wm_root_window_controller_observer.h" -#include "ash/wm/common/wm_snap_to_pixel_layout_manager.h" -#include "ash/wm/common/wm_window_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_activation_observer.h" +#include "ash/common/wm/wm_root_window_controller_observer.h" +#include "ash/common/wm/wm_snap_to_pixel_layout_manager.h" +#include "ash/common/wm/wm_window_observer.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "base/observer_list.h" @@ -312,4 +312,4 @@ class ASH_EXPORT DockedWindowLayoutManager } // namespace ash -#endif // ASH_WM_COMMON_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_ +#endif // ASH_COMMON_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_ diff --git a/ash/wm/common/dock/docked_window_layout_manager_observer.h b/ash/common/wm/dock/docked_window_layout_manager_observer.h similarity index 83% rename from ash/wm/common/dock/docked_window_layout_manager_observer.h rename to ash/common/wm/dock/docked_window_layout_manager_observer.h index 71b2a335837af8..5a3484fd38e66a 100644 --- a/ash/wm/common/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_COMMON_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_OBSERVER_H_ -#define ASH_WM_COMMON_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 @@ class ASH_EXPORT DockedWindowLayoutManagerObserver { } // namespace ash -#endif // ASH_WM_COMMON_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_OBSERVER_H_ +#endif // ASH_COMMON_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_OBSERVER_H_ diff --git a/ash/wm/common/dock/docked_window_resizer.cc b/ash/common/wm/dock/docked_window_resizer.cc similarity index 96% rename from ash/wm/common/dock/docked_window_resizer.cc rename to ash/common/wm/dock/docked_window_resizer.cc index 40227eb02a3d91..5e3273a90badc7 100644 --- a/ash/wm/common/dock/docked_window_resizer.cc +++ b/ash/common/wm/dock/docked_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/common/dock/docked_window_resizer.h" +#include "ash/common/wm/dock/docked_window_resizer.h" -#include "ash/wm/common/dock/docked_window_layout_manager.h" -#include "ash/wm/common/window_parenting_utils.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_event.h" -#include "ash/wm/common/wm_lookup.h" -#include "ash/wm/common/wm_root_window_controller.h" -#include "ash/wm/common/wm_shell_window_ids.h" -#include "ash/wm/common/wm_window.h" -#include "ash/wm/common/workspace/magnetism_matcher.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/wm_lookup.h" +#include "ash/common/wm/wm_root_window_controller.h" +#include "ash/common/wm/wm_shell_window_ids.h" +#include "ash/common/wm/wm_window.h" +#include "ash/common/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/common/dock/docked_window_resizer.h b/ash/common/wm/dock/docked_window_resizer.h similarity index 93% rename from ash/wm/common/dock/docked_window_resizer.h rename to ash/common/wm/dock/docked_window_resizer.h index 9d34ce3c8fb5f1..277bde81e5efd7 100644 --- a/ash/wm/common/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_COMMON_DOCK_DOCKED_WINDOW_RESIZER_H_ -#define ASH_WM_COMMON_DOCK_DOCKED_WINDOW_RESIZER_H_ +#ifndef ASH_COMMON_WM_DOCK_DOCKED_WINDOW_RESIZER_H_ +#define ASH_COMMON_WM_DOCK_DOCKED_WINDOW_RESIZER_H_ #include #include "ash/ash_export.h" -#include "ash/wm/common/dock/dock_types.h" -#include "ash/wm/common/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 @@ class ASH_EXPORT DockedWindowResizer : public WindowResizer { } // namespace ash -#endif // ASH_WM_COMMON_DOCK_DOCKED_WINDOW_RESIZER_H_ +#endif // ASH_COMMON_WM_DOCK_DOCKED_WINDOW_RESIZER_H_ diff --git a/ash/wm/common/drag_details.cc b/ash/common/wm/drag_details.cc similarity index 95% rename from ash/wm/common/drag_details.cc rename to ash/common/wm/drag_details.cc index 1248b5cbfa9f75..5b8b779288888c 100644 --- a/ash/wm/common/drag_details.cc +++ b/ash/common/wm/drag_details.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/wm/common/drag_details.h" +#include "ash/common/wm/drag_details.h" -#include "ash/wm/common/window_resizer.h" -#include "ash/wm/common/wm_window.h" +#include "ash/common/wm/window_resizer.h" +#include "ash/common/wm/wm_window.h" #include "ui/base/hit_test.h" #include "ui/compositor/layer.h" diff --git a/ash/wm/common/drag_details.h b/ash/common/wm/drag_details.h similarity index 92% rename from ash/wm/common/drag_details.h rename to ash/common/wm/drag_details.h index 95b7e04fbe5298..05c597298d7e53 100644 --- a/ash/wm/common/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_COMMON_DRAG_DETAILS_H_ -#define ASH_WM_COMMON_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/common/wm_types.h" +#include "ash/common/wm/wm_types.h" #include "ui/gfx/geometry/rect.h" #include "ui/wm/public/window_move_client.h" @@ -68,4 +68,4 @@ struct ASH_EXPORT DragDetails { } // namespace ash -#endif // ASH_WM_COMMON_DRAG_DETAILS_H_ +#endif // ASH_COMMON_WM_DRAG_DETAILS_H_ diff --git a/ash/wm/common/fullscreen_window_finder.cc b/ash/common/wm/fullscreen_window_finder.cc similarity index 87% rename from ash/wm/common/fullscreen_window_finder.cc rename to ash/common/wm/fullscreen_window_finder.cc index f817cc73e14d2d..1dae831aad8d29 100644 --- a/ash/wm/common/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/common/fullscreen_window_finder.h" +#include "ash/common/wm/fullscreen_window_finder.h" -#include "ash/wm/common/switchable_windows.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_globals.h" -#include "ash/wm/common/wm_shell_window_ids.h" -#include "ash/wm/common/wm_window.h" +#include "ash/common/wm/switchable_windows.h" +#include "ash/common/wm/window_state.h" +#include "ash/common/wm/wm_globals.h" +#include "ash/common/wm/wm_shell_window_ids.h" +#include "ash/common/wm/wm_window.h" #include "ui/compositor/layer.h" namespace ash { diff --git a/ash/wm/common/fullscreen_window_finder.h b/ash/common/wm/fullscreen_window_finder.h similarity index 76% rename from ash/wm/common/fullscreen_window_finder.h rename to ash/common/wm/fullscreen_window_finder.h index efac0ed402129c..ecbe8b7be186f1 100644 --- a/ash/wm/common/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_COMMON_FULLSCREEN_WINDOW_FINDER_H_ -#define ASH_WM_COMMON_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" @@ -19,4 +19,4 @@ ASH_EXPORT WmWindow* GetWindowForFullscreenMode(WmWindow* context); } // namespace wm } // namespace ash -#endif // ASH_WM_COMMON_FULLSCREEN_WINDOW_FINDER_H_ +#endif // ASH_COMMON_WM_FULLSCREEN_WINDOW_FINDER_H_ diff --git a/ash/wm/common/panels/OWNERS b/ash/common/wm/panels/OWNERS similarity index 100% rename from ash/wm/common/panels/OWNERS rename to ash/common/wm/panels/OWNERS diff --git a/ash/wm/common/panels/panel_layout_manager.cc b/ash/common/wm/panels/panel_layout_manager.cc similarity index 98% rename from ash/wm/common/panels/panel_layout_manager.cc rename to ash/common/wm/panels/panel_layout_manager.cc index 8f02d58af218cf..f511b5e7ace0ce 100644 --- a/ash/wm/common/panels/panel_layout_manager.cc +++ b/ash/common/wm/panels/panel_layout_manager.cc @@ -2,23 +2,23 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/wm/common/panels/panel_layout_manager.h" +#include "ash/common/wm/panels/panel_layout_manager.h" #include #include #include -#include "ash/wm/common/shelf/wm_shelf.h" -#include "ash/wm/common/shelf/wm_shelf_util.h" -#include "ash/wm/common/window_animation_types.h" -#include "ash/wm/common/window_parenting_utils.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_globals.h" -#include "ash/wm/common/wm_lookup.h" -#include "ash/wm/common/wm_root_window_controller.h" -#include "ash/wm/common/wm_shell_window_ids.h" -#include "ash/wm/common/wm_window.h" -#include "ash/wm/common/wm_window_property.h" +#include "ash/common/wm/shelf/wm_shelf.h" +#include "ash/common/wm/shelf/wm_shelf_util.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/wm_globals.h" +#include "ash/common/wm/wm_lookup.h" +#include "ash/common/wm/wm_root_window_controller.h" +#include "ash/common/wm/wm_shell_window_ids.h" +#include "ash/common/wm/wm_window.h" +#include "ash/common/wm/wm_window_property.h" #include "base/auto_reset.h" #include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkPaint.h" diff --git a/ash/wm/common/panels/panel_layout_manager.h b/ash/common/wm/panels/panel_layout_manager.h similarity index 91% rename from ash/wm/common/panels/panel_layout_manager.h rename to ash/common/wm/panels/panel_layout_manager.h index c2bfa88babe35f..5a8b9dd7b0dc26 100644 --- a/ash/wm/common/panels/panel_layout_manager.h +++ b/ash/common/wm/panels/panel_layout_manager.h @@ -2,22 +2,22 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_WM_COMMON_PANELS_PANEL_LAYOUT_MANAGER_H_ -#define ASH_WM_COMMON_PANELS_PANEL_LAYOUT_MANAGER_H_ +#ifndef ASH_COMMON_WM_PANELS_PANEL_LAYOUT_MANAGER_H_ +#define ASH_COMMON_WM_PANELS_PANEL_LAYOUT_MANAGER_H_ #include #include #include "ash/ash_export.h" -#include "ash/wm/common/shelf/wm_shelf_observer.h" -#include "ash/wm/common/window_state_observer.h" -#include "ash/wm/common/wm_activation_observer.h" -#include "ash/wm/common/wm_display_observer.h" -#include "ash/wm/common/wm_layout_manager.h" -#include "ash/wm/common/wm_overview_mode_observer.h" -#include "ash/wm/common/wm_root_window_controller_observer.h" -#include "ash/wm/common/wm_window_observer.h" -#include "ash/wm/common/wm_window_tracker.h" +#include "ash/common/wm/shelf/wm_shelf_observer.h" +#include "ash/common/wm/window_state_observer.h" +#include "ash/common/wm/wm_activation_observer.h" +#include "ash/common/wm/wm_display_observer.h" +#include "ash/common/wm/wm_layout_manager.h" +#include "ash/common/wm/wm_overview_mode_observer.h" +#include "ash/common/wm/wm_root_window_controller_observer.h" +#include "ash/common/wm/wm_window_observer.h" +#include "ash/common/wm/wm_window_tracker.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "base/memory/weak_ptr.h" @@ -210,4 +210,4 @@ class ASH_EXPORT PanelLayoutManager } // namespace ash -#endif // ASH_WM_COMMON_PANELS_PANEL_LAYOUT_MANAGER_H_ +#endif // ASH_COMMON_WM_PANELS_PANEL_LAYOUT_MANAGER_H_ diff --git a/ash/wm/common/panels/panel_window_resizer.cc b/ash/common/wm/panels/panel_window_resizer.cc similarity index 94% rename from ash/wm/common/panels/panel_window_resizer.cc rename to ash/common/wm/panels/panel_window_resizer.cc index 22be66667080e3..fddd2f40af7938 100644 --- a/ash/wm/common/panels/panel_window_resizer.cc +++ b/ash/common/wm/panels/panel_window_resizer.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/common/panels/panel_window_resizer.h" - -#include "ash/wm/common/panels/panel_layout_manager.h" -#include "ash/wm/common/shelf/wm_shelf.h" -#include "ash/wm/common/window_parenting_utils.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_lookup.h" -#include "ash/wm/common/wm_root_window_controller.h" -#include "ash/wm/common/wm_shell_window_ids.h" -#include "ash/wm/common/wm_window.h" +#include "ash/common/wm/panels/panel_window_resizer.h" + +#include "ash/common/wm/panels/panel_layout_manager.h" +#include "ash/common/wm/shelf/wm_shelf.h" +#include "ash/common/wm/window_parenting_utils.h" +#include "ash/common/wm/window_state.h" +#include "ash/common/wm/wm_lookup.h" +#include "ash/common/wm/wm_root_window_controller.h" +#include "ash/common/wm/wm_shell_window_ids.h" +#include "ash/common/wm/wm_window.h" #include "ui/base/hit_test.h" #include "ui/base/ui_base_types.h" #include "ui/display/display.h" diff --git a/ash/wm/common/panels/panel_window_resizer.h b/ash/common/wm/panels/panel_window_resizer.h similarity index 93% rename from ash/wm/common/panels/panel_window_resizer.h rename to ash/common/wm/panels/panel_window_resizer.h index 4b777e8f767366..b104d5ced7a9ec 100644 --- a/ash/wm/common/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_COMMON_PANELS_PANEL_WINDOW_RESIZER_H_ -#define ASH_WM_COMMON_PANELS_PANEL_WINDOW_RESIZER_H_ +#ifndef ASH_COMMON_WM_PANELS_PANEL_WINDOW_RESIZER_H_ +#define ASH_COMMON_WM_PANELS_PANEL_WINDOW_RESIZER_H_ #include #include "ash/ash_export.h" -#include "ash/wm/common/window_resizer.h" +#include "ash/common/wm/window_resizer.h" #include "base/macros.h" #include "base/memory/weak_ptr.h" @@ -84,4 +84,4 @@ class ASH_EXPORT PanelWindowResizer : public WindowResizer { } // namespace ash -#endif // ASH_WM_COMMON_PANELS_PANEL_WINDOW_RESIZER_H_ +#endif // ASH_COMMON_WM_PANELS_PANEL_WINDOW_RESIZER_H_ diff --git a/ash/wm/common/root_window_finder.cc b/ash/common/wm/root_window_finder.cc similarity index 86% rename from ash/wm/common/root_window_finder.cc rename to ash/common/wm/root_window_finder.cc index eb2cead1f110a1..6865662d3da8cc 100644 --- a/ash/wm/common/root_window_finder.cc +++ b/ash/common/wm/root_window_finder.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/common/root_window_finder.h" +#include "ash/common/wm/root_window_finder.h" -#include "ash/wm/common/wm_lookup.h" -#include "ash/wm/common/wm_root_window_controller.h" -#include "ash/wm/common/wm_window.h" +#include "ash/common/wm/wm_lookup.h" +#include "ash/common/wm/wm_root_window_controller.h" +#include "ash/common/wm/wm_window.h" #include "ui/display/display.h" #include "ui/display/screen.h" #include "ui/gfx/geometry/point.h" diff --git a/ash/wm/common/root_window_finder.h b/ash/common/wm/root_window_finder.h similarity index 84% rename from ash/wm/common/root_window_finder.h rename to ash/common/wm/root_window_finder.h index f35459a6c44671..00750b14905307 100644 --- a/ash/wm/common/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_COMMON_ROOT_WINDOW_FINDER_H_ -#define ASH_WM_COMMON_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" @@ -29,4 +29,4 @@ ASH_EXPORT WmWindow* GetRootWindowMatching(const gfx::Rect& rect); } // namespace wm } // namespace ash -#endif // ASH_WM_COMMON_ROOT_WINDOW_FINDER_H_ +#endif // ASH_COMMON_WM_ROOT_WINDOW_FINDER_H_ diff --git a/ash/wm/common/shelf/wm_shelf.h b/ash/common/wm/shelf/wm_shelf.h similarity index 87% rename from ash/wm/common/shelf/wm_shelf.h rename to ash/common/wm/shelf/wm_shelf.h index 488400addbf0f2..dcc8f0b68651cf 100644 --- a/ash/wm/common/shelf/wm_shelf.h +++ b/ash/common/wm/shelf/wm_shelf.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_COMMON_SHELF_WM_SHELF_H_ -#define ASH_WM_COMMON_SHELF_WM_SHELF_H_ +#ifndef ASH_COMMON_WM_SHELF_WM_SHELF_H_ +#define ASH_COMMON_WM_SHELF_WM_SHELF_H_ #include "ash/ash_export.h" -#include "ash/wm/common/shelf/wm_shelf_types.h" +#include "ash/common/wm/shelf/wm_shelf_types.h" namespace gfx { class Rect; @@ -49,4 +49,4 @@ class ASH_EXPORT WmShelf { } // namespace wm } // namespace ash -#endif // ASH_WM_COMMON_SHELF_WM_SHELF_H_ +#endif // ASH_COMMON_WM_SHELF_WM_SHELF_H_ diff --git a/ash/wm/common/shelf/wm_shelf_constants.cc b/ash/common/wm/shelf/wm_shelf_constants.cc similarity index 86% rename from ash/wm/common/shelf/wm_shelf_constants.cc rename to ash/common/wm/shelf/wm_shelf_constants.cc index fa0425c97a671e..e393c26073777a 100644 --- a/ash/wm/common/shelf/wm_shelf_constants.cc +++ b/ash/common/wm/shelf/wm_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/wm/common/shelf/wm_shelf_constants.h" +#include "ash/common/wm/shelf/wm_shelf_constants.h" namespace ash { namespace wm { diff --git a/ash/wm/common/shelf/wm_shelf_constants.h b/ash/common/wm/shelf/wm_shelf_constants.h similarity index 76% rename from ash/wm/common/shelf/wm_shelf_constants.h rename to ash/common/wm/shelf/wm_shelf_constants.h index e112d0aed20465..15c977121593bf 100644 --- a/ash/wm/common/shelf/wm_shelf_constants.h +++ b/ash/common/wm/shelf/wm_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_WM_COMMON_SHELF_WM_SHELF_CONSTANTS_H_ -#define ASH_WM_COMMON_SHELF_WM_SHELF_CONSTANTS_H_ +#ifndef ASH_COMMON_WM_SHELF_WM_SHELF_CONSTANTS_H_ +#define ASH_COMMON_WM_SHELF_WM_SHELF_CONSTANTS_H_ #include "ash/ash_export.h" @@ -19,4 +19,4 @@ ASH_EXPORT extern const int kTimeToSwitchBackgroundMs; } // namespace wm } // namespace ash -#endif // ASH_WM_COMMON_SHELF_WM_SHELF_CONSTANTS_H_ +#endif // ASH_COMMON_WM_SHELF_WM_SHELF_CONSTANTS_H_ diff --git a/ash/wm/common/shelf/wm_shelf_observer.h b/ash/common/wm/shelf/wm_shelf_observer.h similarity index 73% rename from ash/wm/common/shelf/wm_shelf_observer.h rename to ash/common/wm/shelf/wm_shelf_observer.h index 299e6b84d92367..1fa2f6a331cdbe 100644 --- a/ash/wm/common/shelf/wm_shelf_observer.h +++ b/ash/common/wm/shelf/wm_shelf_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_WM_COMMON_SHELF_WM_SHELF_OBSERVER_H_ -#define ASH_WM_COMMON_SHELF_WM_SHELF_OBSERVER_H_ +#ifndef ASH_COMMON_WM_SHELF_WM_SHELF_OBSERVER_H_ +#define ASH_COMMON_WM_SHELF_WM_SHELF_OBSERVER_H_ #include "ash/ash_export.h" -#include "ash/wm/common/background_animator.h" -#include "ash/wm/common/shelf/wm_shelf_types.h" +#include "ash/common/wm/background_animator.h" +#include "ash/common/wm/shelf/wm_shelf_types.h" namespace ash { namespace wm { @@ -29,4 +29,4 @@ class ASH_EXPORT WmShelfObserver { } // namespace wm } // namespace ash -#endif // ASH_WM_COMMON_SHELF_WM_SHELF_OBSERVER_H_ +#endif // ASH_COMMON_WM_SHELF_WM_SHELF_OBSERVER_H_ diff --git a/ash/wm/common/shelf/wm_shelf_types.h b/ash/common/wm/shelf/wm_shelf_types.h similarity index 87% rename from ash/wm/common/shelf/wm_shelf_types.h rename to ash/common/wm/shelf/wm_shelf_types.h index 7c05d83c8a9184..b6cdc13c0169b7 100644 --- a/ash/wm/common/shelf/wm_shelf_types.h +++ b/ash/common/wm/shelf/wm_shelf_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_COMMON_SHELF_WM_SHELF_TYPES_H_ -#define ASH_WM_COMMON_SHELF_WM_SHELF_TYPES_H_ +#ifndef ASH_COMMON_WM_SHELF_WM_SHELF_TYPES_H_ +#define ASH_COMMON_WM_SHELF_WM_SHELF_TYPES_H_ namespace ash { @@ -45,4 +45,4 @@ enum ShelfBackgroundType { } // namespace wm } // namespace ash -#endif // ASH_WM_COMMON_SHELF_WM_SHELF_TYPES_H_ +#endif // ASH_COMMON_WM_SHELF_WM_SHELF_TYPES_H_ diff --git a/ash/wm/common/shelf/wm_shelf_util.cc b/ash/common/wm/shelf/wm_shelf_util.cc similarity index 89% rename from ash/wm/common/shelf/wm_shelf_util.cc rename to ash/common/wm/shelf/wm_shelf_util.cc index 5133feb7600ddb..71a60fadff493a 100644 --- a/ash/wm/common/shelf/wm_shelf_util.cc +++ b/ash/common/wm/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/wm/common/shelf/wm_shelf_util.h" +#include "ash/common/wm/shelf/wm_shelf_util.h" namespace ash { namespace wm { diff --git a/ash/wm/common/shelf/wm_shelf_util.h b/ash/common/wm/shelf/wm_shelf_util.h similarity index 67% rename from ash/wm/common/shelf/wm_shelf_util.h rename to ash/common/wm/shelf/wm_shelf_util.h index 2405622d2360bb..e8865f342ad701 100644 --- a/ash/wm/common/shelf/wm_shelf_util.h +++ b/ash/common/wm/shelf/wm_shelf_util.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_COMMON_SHELF_WM_SHELF_UTIL_H_ -#define ASH_WM_COMMON_SHELF_WM_SHELF_UTIL_H_ +#ifndef ASH_COMMON_WM_SHELF_WM_SHELF_UTIL_H_ +#define ASH_COMMON_WM_SHELF_WM_SHELF_UTIL_H_ #include "ash/ash_export.h" -#include "ash/wm/common/shelf/wm_shelf_types.h" +#include "ash/common/wm/shelf/wm_shelf_types.h" namespace ash { namespace wm { @@ -17,4 +17,4 @@ ASH_EXPORT bool IsHorizontalAlignment(ShelfAlignment alignment); } // namespace wm } // namespace ash -#endif // ASH_WM_COMMON_SHELF_WM_SHELF_UTIL_H_ +#endif // ASH_COMMON_WM_SHELF_WM_SHELF_UTIL_H_ diff --git a/ash/wm/common/switchable_windows.cc b/ash/common/wm/switchable_windows.cc similarity index 87% rename from ash/wm/common/switchable_windows.cc rename to ash/common/wm/switchable_windows.cc index 081d83684a89fc..990fab2b0ed974 100644 --- a/ash/wm/common/switchable_windows.cc +++ b/ash/common/wm/switchable_windows.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/wm/common/switchable_windows.h" +#include "ash/common/wm/switchable_windows.h" -#include "ash/wm/common/wm_shell_window_ids.h" -#include "ash/wm/common/wm_window.h" +#include "ash/common/wm/wm_shell_window_ids.h" +#include "ash/common/wm/wm_window.h" namespace ash { namespace wm { diff --git a/ash/wm/common/switchable_windows.h b/ash/common/wm/switchable_windows.h similarity index 84% rename from ash/wm/common/switchable_windows.h rename to ash/common/wm/switchable_windows.h index f3c687ccfe78cb..e7303d8dbec6d0 100644 --- a/ash/wm/common/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_COMMON_SWITCHABLE_WINDOWS_H_ -#define ASH_WM_COMMON_SWITCHABLE_WINDOWS_H_ +#ifndef ASH_COMMON_WM_SWITCHABLE_WINDOWS_H_ +#define ASH_COMMON_WM_SWITCHABLE_WINDOWS_H_ #include @@ -27,4 +27,4 @@ ASH_EXPORT bool IsSwitchableContainer(const WmWindow* window); } // namespace wm } // namespace ash -#endif // ASH_WM_COMMON_SWITCHABLE_WINDOWS_H_ +#endif // ASH_COMMON_WM_SWITCHABLE_WINDOWS_H_ diff --git a/ash/wm/common/window_animation_types.h b/ash/common/wm/window_animation_types.h similarity index 82% rename from ash/wm/common/window_animation_types.h rename to ash/common/wm/window_animation_types.h index 29bc047a756ce8..4ea91c46988a29 100644 --- a/ash/wm/common/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_COMMON_WINDOW_ANIMATION_TYPES_H_ -#define ASH_WM_COMMON_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 @@ enum WindowVisibilityAnimationType { } // namespace wm } // namespace ash -#endif // ASH_WM_COMMON_WINDOW_ANIMATION_TYPES_H_ +#endif // ASH_COMMON_WM_WINDOW_ANIMATION_TYPES_H_ diff --git a/ash/wm/common/window_parenting_utils.cc b/ash/common/wm/window_parenting_utils.cc similarity index 91% rename from ash/wm/common/window_parenting_utils.cc rename to ash/common/wm/window_parenting_utils.cc index 1e31fc4417ab26..253c044dfd5d2e 100644 --- a/ash/wm/common/window_parenting_utils.cc +++ b/ash/common/wm/window_parenting_utils.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/wm/common/window_parenting_utils.h" +#include "ash/common/wm/window_parenting_utils.h" -#include "ash/wm/common/wm_window.h" +#include "ash/common/wm/wm_window.h" namespace ash { namespace wm { diff --git a/ash/wm/common/window_parenting_utils.h b/ash/common/wm/window_parenting_utils.h similarity index 86% rename from ash/wm/common/window_parenting_utils.h rename to ash/common/wm/window_parenting_utils.h index 50b127f6b1f5d4..e19d659ce6cbe5 100644 --- a/ash/wm/common/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_COMMON_WINDOW_PARENTING_UTILS_H_ -#define ASH_WM_COMMON_WINDOW_PARENTING_UTILS_H_ +#ifndef ASH_COMMON_WM_WINDOW_PARENTING_UTILS_H_ +#define ASH_COMMON_WM_WINDOW_PARENTING_UTILS_H_ namespace ash { namespace wm { @@ -26,4 +26,4 @@ void ReparentTransientChildrenOfChild(WmWindow* child, } // namespace wm } // namespace ash -#endif // ASH_WM_COMMON_WINDOW_PARENTING_UTILS_H_ +#endif // ASH_COMMON_WM_WINDOW_PARENTING_UTILS_H_ diff --git a/ash/wm/common/window_positioner.cc b/ash/common/wm/window_positioner.cc similarity index 98% rename from ash/wm/common/window_positioner.cc rename to ash/common/wm/window_positioner.cc index afb4795535ce50..65bf88712dd163 100644 --- a/ash/wm/common/window_positioner.cc +++ b/ash/common/wm/window_positioner.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/common/window_positioner.h" +#include "ash/common/wm/window_positioner.h" -#include "ash/wm/common/window_positioning_utils.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_globals.h" -#include "ash/wm/common/wm_screen_util.h" -#include "ash/wm/common/wm_window.h" +#include "ash/common/wm/window_positioning_utils.h" +#include "ash/common/wm/window_state.h" +#include "ash/common/wm/wm_globals.h" +#include "ash/common/wm/wm_screen_util.h" +#include "ash/common/wm/wm_window.h" #include "ui/compositor/layer.h" #include "ui/display/display.h" #include "ui/display/screen.h" diff --git a/ash/wm/common/window_positioner.h b/ash/common/wm/window_positioner.h similarity index 97% rename from ash/wm/common/window_positioner.h rename to ash/common/wm/window_positioner.h index 7b5219899fd66a..1598626466ecbe 100644 --- a/ash/wm/common/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_COMMON_WINDOW_POSITIONER_H_ -#define ASH_WM_COMMON_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" @@ -129,4 +129,4 @@ class ASH_EXPORT WindowPositioner { } // namespace ash -#endif // ASH_WM_COMMON_WINDOW_POSITIONER_H_ +#endif // ASH_COMMON_WM_WINDOW_POSITIONER_H_ diff --git a/ash/wm/common/window_positioning_utils.cc b/ash/common/wm/window_positioning_utils.cc similarity index 95% rename from ash/wm/common/window_positioning_utils.cc rename to ash/common/wm/window_positioning_utils.cc index a1105ea4df1dc0..6cce67f3d4cfc7 100644 --- a/ash/wm/common/window_positioning_utils.cc +++ b/ash/common/wm/window_positioning_utils.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/common/window_positioning_utils.h" +#include "ash/common/wm/window_positioning_utils.h" #include -#include "ash/wm/common/wm_screen_util.h" -#include "ash/wm/common/wm_window.h" +#include "ash/common/wm/wm_screen_util.h" +#include "ash/common/wm/wm_window.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/size.h" diff --git a/ash/wm/common/window_positioning_utils.h b/ash/common/wm/window_positioning_utils.h similarity index 91% rename from ash/wm/common/window_positioning_utils.h rename to ash/common/wm/window_positioning_utils.h index b0ad13501500bd..12bce36918c3cc 100644 --- a/ash/wm/common/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_COMMON_WINDOW_POSITIONING_UTILS_H_ -#define ASH_WM_COMMON_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" @@ -53,4 +53,4 @@ ASH_EXPORT gfx::Rect GetDefaultRightSnappedWindowBoundsInParent( } // namespace wm } // namespace ash -#endif // ASH_WM_COMMON_WINDOW_POSITIONING_UTILS_H_ +#endif // ASH_COMMON_WM_WINDOW_POSITIONING_UTILS_H_ diff --git a/ash/wm/common/window_resizer.cc b/ash/common/wm/window_resizer.cc similarity index 97% rename from ash/wm/common/window_resizer.cc rename to ash/common/wm/window_resizer.cc index b07c96c7643c03..bba8f4126b0fda 100644 --- a/ash/wm/common/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/common/window_resizer.h" +#include "ash/common/wm/window_resizer.h" -#include "ash/wm/common/dock/docked_window_layout_manager.h" -#include "ash/wm/common/root_window_finder.h" -#include "ash/wm/common/window_positioning_utils.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_window.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/wm_window.h" #include "ui/base/hit_test.h" #include "ui/base/ui_base_types.h" #include "ui/display/display.h" diff --git a/ash/wm/common/window_resizer.h b/ash/common/wm/window_resizer.h similarity index 94% rename from ash/wm/common/window_resizer.h rename to ash/common/wm/window_resizer.h index 34e71ef7d05569..888384e20a36ac 100644 --- a/ash/wm/common/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_COMMON_WINDOW_RESIZER_H_ -#define ASH_WM_COMMON_WINDOW_RESIZER_H_ +#ifndef ASH_COMMON_WM_WINDOW_RESIZER_H_ +#define ASH_COMMON_WM_WINDOW_RESIZER_H_ #include #include "ash/ash_export.h" -#include "ash/wm/common/drag_details.h" -#include "ash/wm/common/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" @@ -108,4 +108,4 @@ ASH_EXPORT std::unique_ptr CreateWindowResizer( } // namespace ash -#endif // ASH_WM_COMMON_WINDOW_RESIZER_H_ +#endif // ASH_COMMON_WM_WINDOW_RESIZER_H_ diff --git a/ash/wm/common/window_state.cc b/ash/common/wm/window_state.cc similarity index 97% rename from ash/wm/common/window_state.cc rename to ash/common/wm/window_state.cc index 60398452a341fc..09570feb20a0f3 100644 --- a/ash/wm/common/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/common/window_state.h" +#include "ash/common/wm/window_state.h" #include -#include "ash/wm/common/default_state.h" -#include "ash/wm/common/window_positioning_utils.h" -#include "ash/wm/common/window_state_delegate.h" -#include "ash/wm/common/window_state_observer.h" -#include "ash/wm/common/wm_event.h" -#include "ash/wm/common/wm_screen_util.h" -#include "ash/wm/common/wm_window.h" +#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/wm_window.h" #include "base/auto_reset.h" namespace ash { diff --git a/ash/wm/common/window_state.h b/ash/common/wm/window_state.h similarity index 98% rename from ash/wm/common/window_state.h rename to ash/common/wm/window_state.h index 5bcb23e05271c0..3db2c8b5af0574 100644 --- a/ash/wm/common/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_COMMON_WINDOW_STATE_H_ -#define ASH_WM_COMMON_WINDOW_STATE_H_ +#ifndef ASH_COMMON_WM_WINDOW_STATE_H_ +#define ASH_COMMON_WM_WINDOW_STATE_H_ #include #include "ash/ash_export.h" -#include "ash/wm/common/drag_details.h" -#include "ash/wm/common/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" @@ -396,4 +396,4 @@ class ASH_EXPORT WindowState { } // namespace wm } // namespace ash -#endif // ASH_WM_COMMON_WINDOW_STATE_H_ +#endif // ASH_COMMON_WM_WINDOW_STATE_H_ diff --git a/ash/wm/common/window_state_delegate.cc b/ash/common/wm/window_state_delegate.cc similarity index 91% rename from ash/wm/common/window_state_delegate.cc rename to ash/common/wm/window_state_delegate.cc index 4286f61325c9bc..0c3fe59adeeaa6 100644 --- a/ash/wm/common/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/common/window_state_delegate.h" +#include "ash/common/wm/window_state_delegate.h" namespace ash { namespace wm { diff --git a/ash/wm/common/window_state_delegate.h b/ash/common/wm/window_state_delegate.h similarity index 89% rename from ash/wm/common/window_state_delegate.h rename to ash/common/wm/window_state_delegate.h index ee14d35db36257..11bd17f880e5e6 100644 --- a/ash/wm/common/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_COMMON_WINDOW_STATE_DELEGATE_H_ -#define ASH_WM_COMMON_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 @@ class ASH_EXPORT WindowStateDelegate { } // namespace wm } // namespace ash -#endif // ASH_WM_COMMON_WINDOW_STATE_DELEGATE_H_ +#endif // ASH_COMMON_WM_WINDOW_STATE_DELEGATE_H_ diff --git a/ash/wm/common/window_state_observer.h b/ash/common/wm/window_state_observer.h similarity index 88% rename from ash/wm/common/window_state_observer.h rename to ash/common/wm/window_state_observer.h index 683773eae946fc..c13d290f9e1fc7 100644 --- a/ash/wm/common/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_COMMON_WINDOW_STATE_OBSERVER_H_ -#define ASH_WM_COMMON_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/common/wm_types.h" +#include "ash/common/wm/wm_types.h" namespace ash { namespace wm { @@ -37,4 +37,4 @@ class ASH_EXPORT WindowStateObserver { } // namespace wm } // namespace ash -#endif // ASH_WM_COMMON_WINDOW_STATE_OBSERVER_H_ +#endif // ASH_COMMON_WM_WINDOW_STATE_OBSERVER_H_ diff --git a/ash/wm/common/window_state_util.cc b/ash/common/wm/window_state_util.cc similarity index 82% rename from ash/wm/common/window_state_util.cc rename to ash/common/wm/window_state_util.cc index b8f5841da0ed41..bb54a90b5f27fa 100644 --- a/ash/wm/common/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/common/window_state_util.h" +#include "ash/common/wm/window_state_util.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/window_state_delegate.h" -#include "ash/wm/common/wm_window.h" +#include "ash/common/wm/window_state.h" +#include "ash/common/wm/window_state_delegate.h" +#include "ash/common/wm/wm_window.h" namespace ash { namespace wm { diff --git a/ash/wm/common/window_state_util.h b/ash/common/wm/window_state_util.h similarity index 79% rename from ash/wm/common/window_state_util.h rename to ash/common/wm/window_state_util.h index 6a270447588457..33bb590dc66364 100644 --- a/ash/wm/common/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_COMMON_WINDOW_STATE_UTIL_H_ -#define ASH_WM_COMMON_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 @@ ASH_EXPORT void ToggleFullScreen(WindowState* window_state, } // namespace wm } // namespace ash -#endif // ASH_WM_COMMON_WINDOW_STATE_UTIL_H_ +#endif // ASH_COMMON_WM_WINDOW_STATE_UTIL_H_ diff --git a/ash/wm/common/wm_activation_observer.h b/ash/common/wm/wm_activation_observer.h similarity index 86% rename from ash/wm/common/wm_activation_observer.h rename to ash/common/wm/wm_activation_observer.h index 6f1e33efb5a8b3..c643d5f76b1f70 100644 --- a/ash/wm/common/wm_activation_observer.h +++ b/ash/common/wm/wm_activation_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_COMMON_WM_ACTIVATION_OBSERVER_H_ -#define ASH_WM_COMMON_WM_ACTIVATION_OBSERVER_H_ +#ifndef ASH_COMMON_WM_WM_ACTIVATION_OBSERVER_H_ +#define ASH_COMMON_WM_WM_ACTIVATION_OBSERVER_H_ #include "ash/ash_export.h" @@ -31,4 +31,4 @@ class ASH_EXPORT WmActivationObserver { } // namespace wm } // namespace ash -#endif // ASH_WM_COMMON_WM_ACTIVATION_OBSERVER_H_ +#endif // ASH_COMMON_WM_WM_ACTIVATION_OBSERVER_H_ diff --git a/ash/wm/common/wm_display_observer.h b/ash/common/wm/wm_display_observer.h similarity index 82% rename from ash/wm/common/wm_display_observer.h rename to ash/common/wm/wm_display_observer.h index e3e9b721204d75..937ff9c312bd49 100644 --- a/ash/wm/common/wm_display_observer.h +++ b/ash/common/wm/wm_display_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_COMMON_WM_DISPLAY_OBSERVER_H_ -#define ASH_WM_COMMON_WM_DISPLAY_OBSERVER_H_ +#ifndef ASH_COMMON_WM_WM_DISPLAY_OBSERVER_H_ +#define ASH_COMMON_WM_WM_DISPLAY_OBSERVER_H_ #include "ash/ash_export.h" @@ -28,4 +28,4 @@ class ASH_EXPORT WmDisplayObserver { } // namespace wm } // namespace ash -#endif // ASH_WM_COMMON_WM_DISPLAY_OBSERVER_H_ +#endif // ASH_COMMON_WM_WM_DISPLAY_OBSERVER_H_ diff --git a/ash/wm/common/wm_event.cc b/ash/common/wm/wm_event.cc similarity index 92% rename from ash/wm/common/wm_event.cc rename to ash/common/wm/wm_event.cc index 0f5a15e2052a8d..f4c0364372cd42 100644 --- a/ash/wm/common/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/common/wm_event.h" +#include "ash/common/wm/wm_event.h" namespace ash { namespace wm { diff --git a/ash/wm/common/wm_event.h b/ash/common/wm/wm_event.h similarity index 96% rename from ash/wm/common/wm_event.h rename to ash/common/wm/wm_event.h index 8f6b87c960177c..60d4d05760d508 100644 --- a/ash/wm/common/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_COMMON_WM_EVENT_H_ -#define ASH_WM_COMMON_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/common/wm_types.h" +#include "ash/common/wm/wm_types.h" #include "base/macros.h" #include "ui/gfx/geometry/rect.h" @@ -120,4 +120,4 @@ class ASH_EXPORT SetBoundsEvent : public WMEvent { } // namespace wm } // namespace ash -#endif // ASH_WM_COMMON_WM_EVENT_H_ +#endif // ASH_COMMON_WM_WM_EVENT_H_ diff --git a/ash/wm/common/wm_globals.cc b/ash/common/wm/wm_globals.cc similarity index 91% rename from ash/wm/common/wm_globals.cc rename to ash/common/wm/wm_globals.cc index 0e61bdca5ed13b..5fb1a5f7039c5d 100644 --- a/ash/wm/common/wm_globals.cc +++ b/ash/common/wm/wm_globals.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/common/wm_globals.h" +#include "ash/common/wm/wm_globals.h" namespace ash { namespace wm { diff --git a/ash/wm/common/wm_globals.h b/ash/common/wm/wm_globals.h similarity index 96% rename from ash/wm/common/wm_globals.h rename to ash/common/wm/wm_globals.h index a57f308fa0d3b5..c0ac5ee1e760e4 100644 --- a/ash/wm/common/wm_globals.h +++ b/ash/common/wm/wm_globals.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_COMMON_WM_GLOBALS_H_ -#define ASH_WM_COMMON_WM_GLOBALS_H_ +#ifndef ASH_COMMON_WM_WM_GLOBALS_H_ +#define ASH_COMMON_WM_WM_GLOBALS_H_ #include @@ -107,4 +107,4 @@ class ASH_EXPORT WmGlobals { } // namespace wm } // namespace ash -#endif // ASH_WM_COMMON_WM_GLOBALS_H_ +#endif // ASH_COMMON_WM_WM_GLOBALS_H_ diff --git a/ash/wm/common/wm_layout_manager.h b/ash/common/wm/wm_layout_manager.h similarity index 93% rename from ash/wm/common/wm_layout_manager.h rename to ash/common/wm/wm_layout_manager.h index d8be091f5a964f..f0d3c53d82caf3 100644 --- a/ash/wm/common/wm_layout_manager.h +++ b/ash/common/wm/wm_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_COMMON_WM_LAYOUT_MANAGER_H_ -#define ASH_WM_COMMON_WM_LAYOUT_MANAGER_H_ +#ifndef ASH_COMMON_WM_WM_LAYOUT_MANAGER_H_ +#define ASH_COMMON_WM_WM_LAYOUT_MANAGER_H_ #include "ash/ash_export.h" @@ -54,4 +54,4 @@ class ASH_EXPORT WmLayoutManager { } // namespace wm } // namespace ash -#endif // ASH_WM_COMMON_WM_LAYOUT_MANAGER_H_ +#endif // ASH_COMMON_WM_WM_LAYOUT_MANAGER_H_ diff --git a/ash/wm/common/wm_lookup.cc b/ash/common/wm/wm_lookup.cc similarity index 91% rename from ash/wm/common/wm_lookup.cc rename to ash/common/wm/wm_lookup.cc index 91f9dc255edeb0..28a7f536154e82 100644 --- a/ash/wm/common/wm_lookup.cc +++ b/ash/common/wm/wm_lookup.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/common/wm_lookup.h" +#include "ash/common/wm/wm_lookup.h" namespace ash { namespace wm { diff --git a/ash/wm/common/wm_lookup.h b/ash/common/wm/wm_lookup.h similarity index 89% rename from ash/wm/common/wm_lookup.h rename to ash/common/wm/wm_lookup.h index 76b14dc8876d85..b8417e5a3c5185 100644 --- a/ash/wm/common/wm_lookup.h +++ b/ash/common/wm/wm_lookup.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_COMMON_WM_LOOKUP_H_ -#define ASH_WM_COMMON_WM_LOOKUP_H_ +#ifndef ASH_COMMON_WM_WM_LOOKUP_H_ +#define ASH_COMMON_WM_WM_LOOKUP_H_ #include @@ -43,4 +43,4 @@ class ASH_EXPORT WmLookup { } // namespace wm } // namespace ash -#endif // ASH_WM_COMMON_WM_LOOKUP_H_ +#endif // ASH_COMMON_WM_WM_LOOKUP_H_ diff --git a/ash/wm/common/wm_overview_mode_observer.h b/ash/common/wm/wm_overview_mode_observer.h similarity index 73% rename from ash/wm/common/wm_overview_mode_observer.h rename to ash/common/wm/wm_overview_mode_observer.h index c49699fe95576a..b7ae9c4095385c 100644 --- a/ash/wm/common/wm_overview_mode_observer.h +++ b/ash/common/wm/wm_overview_mode_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_COMMON_WM_OVERVIEW_MODE_OBSERVER_H_ -#define ASH_WM_COMMON_WM_OVERVIEW_MODE_OBSERVER_H_ +#ifndef ASH_COMMON_WM_WM_OVERVIEW_MODE_OBSERVER_H_ +#define ASH_COMMON_WM_WM_OVERVIEW_MODE_OBSERVER_H_ #include "ash/ash_export.h" @@ -23,4 +23,4 @@ class ASH_EXPORT WmOverviewModeObserver { } // namespace wm } // namespace ash -#endif // ASH_WM_COMMON_WM_OVERVIEW_MODE_OBSERVER_H_ +#endif // ASH_COMMON_WM_WM_OVERVIEW_MODE_OBSERVER_H_ diff --git a/ash/wm/common/wm_root_window_controller.h b/ash/common/wm/wm_root_window_controller.h similarity index 89% rename from ash/wm/common/wm_root_window_controller.h rename to ash/common/wm/wm_root_window_controller.h index a59a61f3f5eac4..0429440ad817e5 100644 --- a/ash/wm/common/wm_root_window_controller.h +++ b/ash/common/wm/wm_root_window_controller.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_COMMON_WM_ROOT_CONTROLLER_H_ -#define ASH_WM_COMMON_WM_ROOT_CONTROLLER_H_ +#ifndef ASH_COMMON_WM_WM_ROOT_WINDOW_CONTROLLER_H_ +#define ASH_COMMON_WM_WM_ROOT_WINDOW_CONTROLLER_H_ #include "ash/ash_export.h" -#include "ash/wm/common/workspace/workspace_types.h" +#include "ash/common/wm/workspace/workspace_types.h" #include "ui/views/widget/widget.h" namespace gfx { @@ -63,4 +63,4 @@ class ASH_EXPORT WmRootWindowController { } // namespace wm } // namespace ash -#endif // ASH_WM_COMMON_WM_ROOT_CONTROLLER_H_ +#endif // ASH_COMMON_WM_WM_ROOT_WINDOW_CONTROLLER_H_ diff --git a/ash/wm/common/wm_root_window_controller_observer.h b/ash/common/wm/wm_root_window_controller_observer.h similarity index 75% rename from ash/wm/common/wm_root_window_controller_observer.h rename to ash/common/wm/wm_root_window_controller_observer.h index 8e9e916fa14f9c..048f09e33b65fb 100644 --- a/ash/wm/common/wm_root_window_controller_observer.h +++ b/ash/common/wm/wm_root_window_controller_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_COMMON_WM_ROOT_WINDOW_CONTROLLER_OBSERVER_H_ -#define ASH_WM_COMMON_WM_ROOT_WINDOW_CONTROLLER_OBSERVER_H_ +#ifndef ASH_COMMON_WM_WM_ROOT_WINDOW_CONTROLLER_OBSERVER_H_ +#define ASH_COMMON_WM_WM_ROOT_WINDOW_CONTROLLER_OBSERVER_H_ #include "ash/ash_export.h" @@ -25,4 +25,4 @@ class ASH_EXPORT WmRootWindowControllerObserver { } // namespace wm } // namespace ash -#endif // ASH_WM_COMMON_WM_ROOT_WINDOW_CONTROLLER_OBSERVER_H_ +#endif // ASH_COMMON_WM_WM_ROOT_WINDOW_CONTROLLER_OBSERVER_H_ diff --git a/ash/wm/common/wm_screen_util.cc b/ash/common/wm/wm_screen_util.cc similarity index 88% rename from ash/wm/common/wm_screen_util.cc rename to ash/common/wm/wm_screen_util.cc index 7ae244858eec31..b42f8c23597a67 100644 --- a/ash/wm/common/wm_screen_util.cc +++ b/ash/common/wm/wm_screen_util.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/wm/common/wm_screen_util.h" +#include "ash/common/wm/wm_screen_util.h" -#include "ash/wm/common/wm_root_window_controller.h" -#include "ash/wm/common/wm_window.h" +#include "ash/common/wm/wm_root_window_controller.h" +#include "ash/common/wm/wm_window.h" #include "ui/display/display.h" namespace ash { diff --git a/ash/wm/common/wm_screen_util.h b/ash/common/wm/wm_screen_util.h similarity index 82% rename from ash/wm/common/wm_screen_util.h rename to ash/common/wm/wm_screen_util.h index e016b5b043cb02..671993629b3ac7 100644 --- a/ash/wm/common/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_COMMON_WM_SCREEN_UTIL_H_ -#define ASH_WM_COMMON_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" @@ -24,4 +24,4 @@ ASH_EXPORT gfx::Rect GetMaximizedWindowBoundsInParent(WmWindow* window); } // namespace wm } // namespace ash -#endif // ASH_WM_COMMON_WM_SCREEN_UTIL_H_ +#endif // ASH_COMMON_WM_WM_SCREEN_UTIL_H_ diff --git a/ash/wm/common/wm_shell_window_ids.h b/ash/common/wm/wm_shell_window_ids.h similarity index 93% rename from ash/wm/common/wm_shell_window_ids.h rename to ash/common/wm/wm_shell_window_ids.h index b9aa45e3e795b2..5d1e5a0b8a9b93 100644 --- a/ash/wm/common/wm_shell_window_ids.h +++ b/ash/common/wm/wm_shell_window_ids.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_COMMON_WM_SHELL_WINDOW_IDS_H_ -#define ASH_WM_COMMON_WM_SHELL_WINDOW_IDS_H_ +#ifndef ASH_COMMON_WM_WM_SHELL_WINDOW_IDS_H_ +#define ASH_COMMON_WM_WM_SHELL_WINDOW_IDS_H_ // Defines the ids assigned to known containers. The id for a WmWindow is // accessed via GetShellWindowId(). @@ -61,4 +61,4 @@ const int kShellWindowId_PhantomWindow = 23; } // namespace ash -#endif // ASH_WM_COMMON_WM_SHELL_WINDOW_IDS_H_ +#endif // ASH_COMMON_WM_WM_SHELL_WINDOW_IDS_H_ diff --git a/ash/wm/common/wm_snap_to_pixel_layout_manager.cc b/ash/common/wm/wm_snap_to_pixel_layout_manager.cc similarity index 91% rename from ash/wm/common/wm_snap_to_pixel_layout_manager.cc rename to ash/common/wm/wm_snap_to_pixel_layout_manager.cc index bd1f10aeac1821..02b2bc9078af8b 100644 --- a/ash/wm/common/wm_snap_to_pixel_layout_manager.cc +++ b/ash/common/wm/wm_snap_to_pixel_layout_manager.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/wm/common/wm_snap_to_pixel_layout_manager.h" +#include "ash/common/wm/wm_snap_to_pixel_layout_manager.h" -#include "ash/wm/common/wm_window.h" +#include "ash/common/wm/wm_window.h" namespace ash { namespace wm { diff --git a/ash/wm/common/wm_snap_to_pixel_layout_manager.h b/ash/common/wm/wm_snap_to_pixel_layout_manager.h similarity index 82% rename from ash/wm/common/wm_snap_to_pixel_layout_manager.h rename to ash/common/wm/wm_snap_to_pixel_layout_manager.h index b5f865811b79a9..6d7a8c355f0751 100644 --- a/ash/wm/common/wm_snap_to_pixel_layout_manager.h +++ b/ash/common/wm/wm_snap_to_pixel_layout_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_WM_COMMON_WM_SNAP_TO_PIXEL_LAYOUT_MANAGER_H_ -#define ASH_WM_COMMON_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/wm/common/wm_layout_manager.h" +#include "ash/common/wm/wm_layout_manager.h" #include "base/macros.h" namespace ash { @@ -36,4 +36,4 @@ class ASH_EXPORT WmSnapToPixelLayoutManager : public WmLayoutManager { } // namespace wm } // namespace ash -#endif // ASH_WM_COMMON_WM_SNAP_TO_PIXEL_LAYOUT_MANAGER_H_ +#endif // ASH_COMMON_WM_WM_SNAP_TO_PIXEL_LAYOUT_MANAGER_H_ diff --git a/ash/wm/common/wm_toplevel_window_event_handler.cc b/ash/common/wm/wm_toplevel_window_event_handler.cc similarity index 98% rename from ash/wm/common/wm_toplevel_window_event_handler.cc rename to ash/common/wm/wm_toplevel_window_event_handler.cc index 349411ced6f2f7..6c5e9bbdbe5182 100644 --- a/ash/wm/common/wm_toplevel_window_event_handler.cc +++ b/ash/common/wm/wm_toplevel_window_event_handler.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/common/wm_toplevel_window_event_handler.h" - -#include "ash/wm/common/window_resizer.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/window_state_observer.h" -#include "ash/wm/common/wm_event.h" -#include "ash/wm/common/wm_globals.h" -#include "ash/wm/common/wm_window.h" -#include "ash/wm/common/wm_window_observer.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/wm_globals.h" +#include "ash/common/wm/wm_window.h" +#include "ash/common/wm/wm_window_observer.h" #include "ui/base/hit_test.h" #include "ui/events/event.h" diff --git a/ash/wm/common/wm_toplevel_window_event_handler.h b/ash/common/wm/wm_toplevel_window_event_handler.h similarity index 93% rename from ash/wm/common/wm_toplevel_window_event_handler.h rename to ash/common/wm/wm_toplevel_window_event_handler.h index 550ed5264511e8..27b0107baa97dc 100644 --- a/ash/wm/common/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 #include "ash/ash_export.h" -#include "ash/wm/common/wm_display_observer.h" -#include "ash/wm/common/wm_types.h" +#include "ash/common/wm/wm_display_observer.h" +#include "ash/common/wm/wm_types.h" #include "base/callback.h" #include "base/macros.h" #include "ui/gfx/geometry/rect.h" @@ -127,4 +127,4 @@ class ASH_EXPORT WmToplevelWindowEventHandler : public WmDisplayObserver { } // 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/common/wm_types.cc b/ash/common/wm/wm_types.cc similarity index 97% rename from ash/wm/common/wm_types.cc rename to ash/common/wm/wm_types.cc index b7ea734130ebbb..7e8023874a60d1 100644 --- a/ash/wm/common/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/common/wm_types.h" +#include "ash/common/wm/wm_types.h" #include "base/logging.h" diff --git a/ash/wm/common/wm_types.h b/ash/common/wm/wm_types.h similarity index 94% rename from ash/wm/common/wm_types.h rename to ash/common/wm/wm_types.h index 5d85ae74d06f8e..1f385b7c181ef6 100644 --- a/ash/wm/common/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_COMMON_WM_TYPES_H_ -#define ASH_WM_COMMON_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" @@ -56,4 +56,4 @@ ASH_EXPORT bool IsMaximizedOrFullscreenWindowStateType(WindowStateType type); } // namespace wm } // namespace ash -#endif // ASH_WM_COMMON_WM_TYPES_H_ +#endif // ASH_COMMON_WM_WM_TYPES_H_ diff --git a/ash/wm/common/wm_user_metrics_action.h b/ash/common/wm/wm_user_metrics_action.h similarity index 81% rename from ash/wm/common/wm_user_metrics_action.h rename to ash/common/wm/wm_user_metrics_action.h index 695937ac3579ee..eedb9b29bf661c 100644 --- a/ash/wm/common/wm_user_metrics_action.h +++ b/ash/common/wm/wm_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_WM_COMMON_WM_USER_METRICS_ACTION_H_ -#define ASH_WM_COMMON_WM_USER_METRICS_ACTION_H_ +#ifndef ASH_COMMON_WM_WM_USER_METRICS_ACTION_H_ +#define ASH_COMMON_WM_WM_USER_METRICS_ACTION_H_ namespace ash { namespace wm { @@ -25,4 +25,4 @@ enum class WmUserMetricsAction { } // namespace wm } // namespace ash -#endif // ASH_WM_COMMON_WM_USER_METRICS_ACTION_H_ +#endif // ASH_COMMON_WM_WM_USER_METRICS_ACTION_H_ diff --git a/ash/wm/common/wm_window.h b/ash/common/wm/wm_window.h similarity index 98% rename from ash/wm/common/wm_window.h rename to ash/common/wm/wm_window.h index 8450e70f64e3c7..e00f59d000a353 100644 --- a/ash/wm/common/wm_window.h +++ b/ash/common/wm/wm_window.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_COMMON_WM_WINDOW_H_ -#define ASH_WM_COMMON_WM_WINDOW_H_ +#ifndef ASH_COMMON_WM_WM_WINDOW_H_ +#define ASH_COMMON_WM_WM_WINDOW_H_ #include #include @@ -260,4 +260,4 @@ class ASH_EXPORT WmWindow { } // namespace wm } // namespace ash -#endif // ASH_WM_COMMON_WM_WINDOW_H_ +#endif // ASH_COMMON_WM_WM_WINDOW_H_ diff --git a/ash/wm/common/wm_window_observer.h b/ash/common/wm/wm_window_observer.h similarity index 91% rename from ash/wm/common/wm_window_observer.h rename to ash/common/wm/wm_window_observer.h index 1189babbfb19be..501bba5aa796c2 100644 --- a/ash/wm/common/wm_window_observer.h +++ b/ash/common/wm/wm_window_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_COMMON_WM_WINDOW_OBSERVER_H_ -#define ASH_WM_COMMON_WM_WINDOW_OBSERVER_H_ +#ifndef ASH_COMMON_WM_WM_WINDOW_OBSERVER_H_ +#define ASH_COMMON_WM_WM_WINDOW_OBSERVER_H_ #include @@ -54,4 +54,4 @@ class ASH_EXPORT WmWindowObserver { } // namespace wm } // namespace ash -#endif // ASH_WM_COMMON_WM_WINDOW_OBSERVER_H_ +#endif // ASH_COMMON_WM_WM_WINDOW_OBSERVER_H_ diff --git a/ash/wm/common/wm_window_property.h b/ash/common/wm/wm_window_property.h similarity index 77% rename from ash/wm/common/wm_window_property.h rename to ash/common/wm/wm_window_property.h index 64f92e680c6806..9a9b947685ef1f 100644 --- a/ash/wm/common/wm_window_property.h +++ b/ash/common/wm/wm_window_property.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_COMMON_WM_WINDOW_PROPERTY_H_ -#define ASH_WM_COMMON_WM_WINDOW_PROPERTY_H_ +#ifndef ASH_COMMON_WM_WM_WINDOW_PROPERTY_H_ +#define ASH_COMMON_WM_WM_WINDOW_PROPERTY_H_ namespace ash { namespace wm { @@ -25,4 +25,4 @@ enum class WmWindowProperty { } // namespace wm } // namespace ash -#endif // ASH_WM_COMMON_WM_WINDOW_PROPERTY_H_ +#endif // ASH_COMMON_WM_WM_WINDOW_PROPERTY_H_ diff --git a/ash/wm/common/wm_window_tracker.h b/ash/common/wm/wm_window_tracker.h similarity index 62% rename from ash/wm/common/wm_window_tracker.h rename to ash/common/wm/wm_window_tracker.h index 7909b07d3f3da0..cb3840ce37bb80 100644 --- a/ash/wm/common/wm_window_tracker.h +++ b/ash/common/wm/wm_window_tracker.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_COMMON_WM_WINDOW_TRACKER_H_ -#define ASH_WM_COMMON_WM_WINDOW_TRACKER_H_ +#ifndef ASH_COMMON_WM_WM_WINDOW_TRACKER_H_ +#define ASH_COMMON_WM_WM_WINDOW_TRACKER_H_ -#include "ash/wm/common/wm_window.h" -#include "ash/wm/common/wm_window_observer.h" +#include "ash/common/wm/wm_window.h" +#include "ash/common/wm/wm_window_observer.h" #include "ui/base/window_tracker_template.h" namespace ash { @@ -17,4 +17,4 @@ using WmWindowTracker = ui::WindowTrackerTemplate; } // namespace wm } // namespace ash -#endif // ASH_WM_COMMON_WM_WINDOW_TRACKER_H_ +#endif // ASH_COMMON_WM_WM_WINDOW_TRACKER_H_ diff --git a/ash/wm/common/workspace/magnetism_matcher.cc b/ash/common/wm/workspace/magnetism_matcher.cc similarity index 99% rename from ash/wm/common/workspace/magnetism_matcher.cc rename to ash/common/wm/workspace/magnetism_matcher.cc index e46bc263ba99ae..b9cdd4d82774b3 100644 --- a/ash/wm/common/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/common/workspace/magnetism_matcher.h" +#include "ash/common/wm/workspace/magnetism_matcher.h" #include #include diff --git a/ash/wm/common/workspace/magnetism_matcher.h b/ash/common/wm/workspace/magnetism_matcher.h similarity index 97% rename from ash/wm/common/workspace/magnetism_matcher.h rename to ash/common/wm/workspace/magnetism_matcher.h index 5ec3eb938b025e..167b45cd29a406 100644 --- a/ash/wm/common/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_COMMON_WORKSPACE_MAGNETISM_MATCHER_H_ -#define ASH_WM_COMMON_WORKSPACE_MAGNETISM_MATCHER_H_ +#ifndef ASH_COMMON_WM_WORKSPACE_MAGNETISM_MATCHER_H_ +#define ASH_COMMON_WM_WORKSPACE_MAGNETISM_MATCHER_H_ #include @@ -189,4 +189,4 @@ class ASH_EXPORT MagnetismMatcher { } // namespace ash -#endif // ASH_WM_COMMON_WORKSPACE_MAGNETISM_MATCHER_H_ +#endif // ASH_COMMON_WM_WORKSPACE_MAGNETISM_MATCHER_H_ diff --git a/ash/wm/common/workspace/multi_window_resize_controller.cc b/ash/common/wm/workspace/multi_window_resize_controller.cc similarity index 98% rename from ash/wm/common/workspace/multi_window_resize_controller.cc rename to ash/common/wm/workspace/multi_window_resize_controller.cc index 69661bc926f927..68fe709bf571c9 100644 --- a/ash/wm/common/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/common/workspace/multi_window_resize_controller.h" +#include "ash/common/wm/workspace/multi_window_resize_controller.h" -#include "ash/wm/common/wm_lookup.h" -#include "ash/wm/common/wm_root_window_controller.h" -#include "ash/wm/common/wm_shell_window_ids.h" -#include "ash/wm/common/wm_window.h" -#include "ash/wm/common/workspace/workspace_window_resizer.h" +#include "ash/common/wm/wm_lookup.h" +#include "ash/common/wm/wm_root_window_controller.h" +#include "ash/common/wm/wm_shell_window_ids.h" +#include "ash/common/wm/wm_window.h" +#include "ash/common/wm/workspace/workspace_window_resizer.h" #include "grit/ash_resources.h" #include "ui/base/cursor/cursor.h" #include "ui/base/hit_test.h" diff --git a/ash/wm/common/workspace/multi_window_resize_controller.h b/ash/common/wm/workspace/multi_window_resize_controller.h similarity index 95% rename from ash/wm/common/workspace/multi_window_resize_controller.h rename to ash/common/wm/workspace/multi_window_resize_controller.h index a0bab3fea061b8..009fa683f139dd 100644 --- a/ash/wm/common/workspace/multi_window_resize_controller.h +++ b/ash/common/wm/workspace/multi_window_resize_controller.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_COMMON_WORKSPACE_MULTI_WINDOW_RESIZE_CONTROLLER_H_ -#define ASH_WM_COMMON_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 #include #include "ash/ash_export.h" -#include "ash/wm/common/wm_window_observer.h" +#include "ash/common/wm/wm_window_observer.h" #include "base/macros.h" #include "base/timer/timer.h" #include "ui/gfx/geometry/rect.h" @@ -177,4 +177,4 @@ class ASH_EXPORT MultiWindowResizeController } // namespace ash -#endif // ASH_WM_COMMON_WORKSPACE_MULTI_WINDOW_RESIZE_CONTROLLER_H_ +#endif // ASH_COMMON_WM_WORKSPACE_MULTI_WINDOW_RESIZE_CONTROLLER_H_ diff --git a/ash/wm/common/workspace/phantom_window_controller.cc b/ash/common/wm/workspace/phantom_window_controller.cc similarity index 95% rename from ash/wm/common/workspace/phantom_window_controller.cc rename to ash/common/wm/workspace/phantom_window_controller.cc index 7779d9baca9fa1..88eac7855fe263 100644 --- a/ash/wm/common/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/common/workspace/phantom_window_controller.h" +#include "ash/common/wm/workspace/phantom_window_controller.h" #include -#include "ash/wm/common/root_window_finder.h" -#include "ash/wm/common/wm_lookup.h" -#include "ash/wm/common/wm_root_window_controller.h" -#include "ash/wm/common/wm_shell_window_ids.h" -#include "ash/wm/common/wm_window.h" +#include "ash/common/wm/root_window_finder.h" +#include "ash/common/wm/wm_lookup.h" +#include "ash/common/wm/wm_root_window_controller.h" +#include "ash/common/wm/wm_shell_window_ids.h" +#include "ash/common/wm/wm_window.h" #include "grit/ash_resources.h" #include "ui/compositor/layer.h" #include "ui/compositor/scoped_layer_animation_settings.h" diff --git a/ash/wm/common/workspace/phantom_window_controller.h b/ash/common/wm/workspace/phantom_window_controller.h similarity index 89% rename from ash/wm/common/workspace/phantom_window_controller.h rename to ash/common/wm/workspace/phantom_window_controller.h index c383c2db687dae..1970e868db074f 100644 --- a/ash/wm/common/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_COMMON_WORKSPACE_PHANTOM_WINDOW_CONTROLLER_H_ -#define ASH_WM_COMMON_WORKSPACE_PHANTOM_WINDOW_CONTROLLER_H_ +#ifndef ASH_COMMON_WM_WORKSPACE_PHANTOM_WINDOW_CONTROLLER_H_ +#define ASH_COMMON_WM_WORKSPACE_PHANTOM_WINDOW_CONTROLLER_H_ #include @@ -55,4 +55,4 @@ class ASH_EXPORT PhantomWindowController { } // namespace ash -#endif // ASH_WM_COMMON_WORKSPACE_PHANTOM_WINDOW_CONTROLLER_H_ +#endif // ASH_COMMON_WM_WORKSPACE_PHANTOM_WINDOW_CONTROLLER_H_ diff --git a/ash/wm/common/workspace/two_step_edge_cycler.cc b/ash/common/wm/workspace/two_step_edge_cycler.cc similarity index 97% rename from ash/wm/common/workspace/two_step_edge_cycler.cc rename to ash/common/wm/workspace/two_step_edge_cycler.cc index 1e3c8150bfaf0e..9e87de9763943d 100644 --- a/ash/wm/common/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/common/workspace/two_step_edge_cycler.h" +#include "ash/common/wm/workspace/two_step_edge_cycler.h" #include diff --git a/ash/wm/common/workspace/two_step_edge_cycler.h b/ash/common/wm/workspace/two_step_edge_cycler.h similarity index 90% rename from ash/wm/common/workspace/two_step_edge_cycler.h rename to ash/common/wm/workspace/two_step_edge_cycler.h index f4c76d17878a73..64743eb18ab902 100644 --- a/ash/wm/common/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_COMMON_WORKSPACE_TWO_STEP_EDGE_CYCLER_H_ -#define ASH_WM_COMMON_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 @@ class ASH_EXPORT TwoStepEdgeCycler { } // namespace ash -#endif // ASH_WM_COMMON_WORKSPACE_TWO_STEP_EDGE_CYCLER_H_ +#endif // ASH_COMMON_WM_WORKSPACE_TWO_STEP_EDGE_CYCLER_H_ diff --git a/ash/wm/common/workspace/workspace_layout_manager.cc b/ash/common/wm/workspace/workspace_layout_manager.cc similarity index 94% rename from ash/wm/common/workspace/workspace_layout_manager.cc rename to ash/common/wm/workspace/workspace_layout_manager.cc index d9d2c62e57a94e..0e0df27309bfc9 100644 --- a/ash/wm/common/workspace/workspace_layout_manager.cc +++ b/ash/common/wm/workspace/workspace_layout_manager.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/common/workspace/workspace_layout_manager.h" +#include "ash/common/wm/workspace/workspace_layout_manager.h" #include -#include "ash/wm/common/always_on_top_controller.h" -#include "ash/wm/common/fullscreen_window_finder.h" -#include "ash/wm/common/window_positioner.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_event.h" -#include "ash/wm/common/wm_globals.h" -#include "ash/wm/common/wm_root_window_controller.h" -#include "ash/wm/common/wm_screen_util.h" -#include "ash/wm/common/wm_window.h" -#include "ash/wm/common/wm_window_property.h" -#include "ash/wm/common/workspace/workspace_layout_manager_backdrop_delegate.h" -#include "ash/wm/common/workspace/workspace_layout_manager_delegate.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_globals.h" +#include "ash/common/wm/wm_root_window_controller.h" +#include "ash/common/wm/wm_screen_util.h" +#include "ash/common/wm/wm_window.h" +#include "ash/common/wm/wm_window_property.h" +#include "ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h" +#include "ash/common/wm/workspace/workspace_layout_manager_delegate.h" #include "ui/compositor/layer.h" #include "ui/keyboard/keyboard_controller_observer.h" diff --git a/ash/wm/common/workspace/workspace_layout_manager.h b/ash/common/wm/workspace/workspace_layout_manager.h similarity index 91% rename from ash/wm/common/workspace/workspace_layout_manager.h rename to ash/common/wm/workspace/workspace_layout_manager.h index a5a17013447c34..ba7d75179b2b5f 100644 --- a/ash/wm/common/workspace/workspace_layout_manager.h +++ b/ash/common/wm/workspace/workspace_layout_manager.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_WM_COMMON_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_ -#define ASH_WM_COMMON_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_ +#ifndef ASH_COMMON_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_ +#define ASH_COMMON_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_ #include #include #include "ash/ash_export.h" -#include "ash/wm/common/window_state_observer.h" -#include "ash/wm/common/wm_activation_observer.h" -#include "ash/wm/common/wm_layout_manager.h" -#include "ash/wm/common/wm_root_window_controller_observer.h" -#include "ash/wm/common/wm_types.h" -#include "ash/wm/common/wm_window_observer.h" +#include "ash/common/wm/window_state_observer.h" +#include "ash/common/wm/wm_activation_observer.h" +#include "ash/common/wm/wm_layout_manager.h" +#include "ash/common/wm/wm_root_window_controller_observer.h" +#include "ash/common/wm/wm_types.h" +#include "ash/common/wm/wm_window_observer.h" #include "base/macros.h" #include "ui/gfx/geometry/rect.h" #include "ui/keyboard/keyboard_controller_observer.h" @@ -145,4 +145,4 @@ class ASH_EXPORT WorkspaceLayoutManager } // namespace ash -#endif // ASH_WM_COMMON_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_ +#endif // ASH_COMMON_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_H_ diff --git a/ash/wm/common/workspace/workspace_layout_manager_backdrop_delegate.h b/ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h similarity index 85% rename from ash/wm/common/workspace/workspace_layout_manager_backdrop_delegate.h rename to ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h index 109be43a1736a4..74023ec00ba1d9 100644 --- a/ash/wm/common/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_COMMON_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_BACKDROP_DELEGATE_H_ -#define ASH_WM_COMMON_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/common/wm_types.h" +#include "ash/common/wm/wm_types.h" namespace ash { namespace wm { @@ -43,4 +43,4 @@ class ASH_EXPORT WorkspaceLayoutManagerBackdropDelegate { } // namespace ash -#endif // ASH_WM_COMMON_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_BACKDROP_DELEGATE_H_ +#endif // ASH_COMMON_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_BACKDROP_DELEGATE_H_ diff --git a/ash/wm/common/workspace/workspace_layout_manager_delegate.h b/ash/common/wm/workspace/workspace_layout_manager_delegate.h similarity index 77% rename from ash/wm/common/workspace/workspace_layout_manager_delegate.h rename to ash/common/wm/workspace/workspace_layout_manager_delegate.h index e0ffb40930f1b0..7abc6231800454 100644 --- a/ash/wm/common/workspace/workspace_layout_manager_delegate.h +++ b/ash/common/wm/workspace/workspace_layout_manager_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_COMMON_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_DELEGATE_H_ -#define ASH_WM_COMMON_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_DELEGATE_H_ +#ifndef ASH_COMMON_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_DELEGATE_H_ +#define ASH_COMMON_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_DELEGATE_H_ #include "ash/ash_export.h" @@ -24,4 +24,4 @@ class ASH_EXPORT WorkspaceLayoutManagerDelegate { } // namespace wm } // namespace ash -#endif // ASH_WM_COMMON_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_DELEGATE_H_ +#endif // ASH_COMMON_WM_WORKSPACE_WORKSPACE_LAYOUT_MANAGER_DELEGATE_H_ diff --git a/ash/wm/common/workspace/workspace_types.h b/ash/common/wm/workspace/workspace_types.h similarity index 80% rename from ash/wm/common/workspace/workspace_types.h rename to ash/common/wm/workspace/workspace_types.h index dadd70f1d2bf37..b51eabccd97409 100644 --- a/ash/wm/common/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_COMMON_WORKSPACE_WORKSPACE_TYPES_H_ -#define ASH_WM_COMMON_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 @@ enum WorkspaceWindowState { } // namespace wm } // namespace ash -#endif // ASH_WM_COMMON_WORKSPACE_WORKSPACE_TYPES_H_ +#endif // ASH_COMMON_WM_WORKSPACE_WORKSPACE_TYPES_H_ diff --git a/ash/wm/common/workspace/workspace_window_resizer.cc b/ash/common/wm/workspace/workspace_window_resizer.cc similarity index 97% rename from ash/wm/common/workspace/workspace_window_resizer.cc rename to ash/common/wm/workspace/workspace_window_resizer.cc index 3601a935966b10..905682a9bb7f4f 100644 --- a/ash/wm/common/workspace/workspace_window_resizer.cc +++ b/ash/common/wm/workspace/workspace_window_resizer.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/common/workspace/workspace_window_resizer.h" +#include "ash/common/wm/workspace/workspace_window_resizer.h" #include #include #include #include -#include "ash/wm/common/default_window_resizer.h" -#include "ash/wm/common/dock/docked_window_layout_manager.h" -#include "ash/wm/common/dock/docked_window_resizer.h" -#include "ash/wm/common/panels/panel_window_resizer.h" -#include "ash/wm/common/window_positioning_utils.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_event.h" -#include "ash/wm/common/wm_globals.h" -#include "ash/wm/common/wm_lookup.h" -#include "ash/wm/common/wm_root_window_controller.h" -#include "ash/wm/common/wm_screen_util.h" -#include "ash/wm/common/wm_shell_window_ids.h" -#include "ash/wm/common/wm_user_metrics_action.h" -#include "ash/wm/common/wm_window.h" -#include "ash/wm/common/workspace/phantom_window_controller.h" -#include "ash/wm/common/workspace/two_step_edge_cycler.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_globals.h" +#include "ash/common/wm/wm_lookup.h" +#include "ash/common/wm/wm_root_window_controller.h" +#include "ash/common/wm/wm_screen_util.h" +#include "ash/common/wm/wm_shell_window_ids.h" +#include "ash/common/wm/wm_user_metrics_action.h" +#include "ash/common/wm/wm_window.h" +#include "ash/common/wm/workspace/phantom_window_controller.h" +#include "ash/common/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/common/workspace/workspace_window_resizer.h b/ash/common/wm/workspace/workspace_window_resizer.h similarity index 96% rename from ash/wm/common/workspace/workspace_window_resizer.h rename to ash/common/wm/workspace/workspace_window_resizer.h index dd32fc4d44a546..582d269e9ebc4c 100644 --- a/ash/wm/common/workspace/workspace_window_resizer.h +++ b/ash/common/wm/workspace/workspace_window_resizer.h @@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_WM_COMMON_WORKSPACE_WORKSPACE_WINDOW_RESIZER_H_ -#define ASH_WM_COMMON_WORKSPACE_WORKSPACE_WINDOW_RESIZER_H_ +#ifndef ASH_COMMON_WM_WORKSPACE_WORKSPACE_WINDOW_RESIZER_H_ +#define ASH_COMMON_WM_WORKSPACE_WORKSPACE_WINDOW_RESIZER_H_ #include #include #include -#include "ash/wm/common/window_resizer.h" -#include "ash/wm/common/wm_window_tracker.h" -#include "ash/wm/common/workspace/magnetism_matcher.h" +#include "ash/common/wm/window_resizer.h" +#include "ash/common/wm/wm_window_tracker.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 @@ class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer { } // namespace ash -#endif // ASH_WM_COMMON_WORKSPACE_WORKSPACE_WINDOW_RESIZER_H_ +#endif // ASH_COMMON_WM_WORKSPACE_WORKSPACE_WINDOW_RESIZER_H_ diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc index fd8491b5e5bdfe..5bc508b71f26da 100644 --- a/ash/display/display_manager_unittest.cc +++ b/ash/display/display_manager_unittest.cc @@ -6,6 +6,7 @@ #include "ash/accelerators/accelerator_commands.h" #include "ash/ash_switches.h" +#include "ash/common/wm/window_state.h" #include "ash/display/display_configuration_controller.h" #include "ash/display/display_info.h" #include "ash/display/display_layout_store.h" @@ -17,7 +18,6 @@ #include "ash/test/ash_test_base.h" #include "ash/test/display_manager_test_api.h" #include "ash/test/mirror_window_test_api.h" -#include "ash/wm/common/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/screen_ash.cc b/ash/display/screen_ash.cc index bf45e9f5037cb0..5e987f4216488c 100644 --- a/ash/display/screen_ash.cc +++ b/ash/display/screen_ash.cc @@ -4,6 +4,7 @@ #include "ash/display/screen_ash.h" +#include "ash/common/wm/root_window_finder.h" #include "ash/display/display_manager.h" #include "ash/display/window_tree_host_manager.h" #include "ash/root_window_controller.h" @@ -12,7 +13,6 @@ #include "ash/shelf/shelf_widget.h" #include "ash/shell.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/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_position_controller.cc b/ash/display/screen_position_controller.cc index 8373c5e42e03b2..c03403a03f9e00 100644 --- a/ash/display/screen_position_controller.cc +++ b/ash/display/screen_position_controller.cc @@ -4,11 +4,11 @@ #include "ash/display/screen_position_controller.h" +#include "ash/common/wm/window_state.h" #include "ash/display/window_tree_host_manager.h" #include "ash/root_window_controller.h" #include "ash/shell.h" #include "ash/shell_window_ids.h" -#include "ash/wm/common/window_state.h" #include "ash/wm/system_modal_container_layout_manager.h" #include "ash/wm/window_properties.h" #include "ui/aura/client/capture_client.h" diff --git a/ash/display/window_tree_host_manager_unittest.cc b/ash/display/window_tree_host_manager_unittest.cc index a1df9c65a948f2..8cb8fa30aa9fab 100644 --- a/ash/display/window_tree_host_manager_unittest.cc +++ b/ash/display/window_tree_host_manager_unittest.cc @@ -7,6 +7,8 @@ #include #include "ash/ash_switches.h" +#include "ash/common/wm/window_state.h" +#include "ash/common/wm/wm_event.h" #include "ash/display/display_info.h" #include "ash/display/display_layout_store.h" #include "ash/display/display_manager.h" @@ -20,8 +22,6 @@ #include "ash/test/cursor_manager_test_api.h" #include "ash/test/display_manager_test_api.h" #include "ash/test/test_shell_delegate.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_event.h" #include "ash/wm/window_state_aura.h" #include "base/command_line.h" #include "ui/aura/client/focus_change_observer.h" diff --git a/ash/drag_drop/drag_drop_tracker.cc b/ash/drag_drop/drag_drop_tracker.cc index 7c7080a3459615..2b2591efd91d8a 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/shell.h" #include "ash/shell_window_ids.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/root_window_finder.h" #include "ui/aura/client/window_tree_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 b32209d912b388..f556ce325f25dd 100644 --- a/ash/extended_desktop_unittest.cc +++ b/ash/extended_desktop_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/wm/root_window_finder.h" #include "ash/display/display_manager.h" #include "ash/root_window_controller.h" #include "ash/screen_util.h" @@ -10,7 +11,6 @@ #include "ash/system/tray/system_tray.h" #include "ash/test/ash_test_base.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/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/focus_cycler.cc b/ash/focus_cycler.cc index 2ef8b7c3a493cf..6b26930193ed78 100644 --- a/ash/focus_cycler.cc +++ b/ash/focus_cycler.cc @@ -4,8 +4,8 @@ #include "ash/focus_cycler.h" +#include "ash/common/wm/window_state.h" #include "ash/shell.h" -#include "ash/wm/common/window_state.h" #include "ash/wm/mru_window_tracker.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" diff --git a/ash/focus_cycler_unittest.cc b/ash/focus_cycler_unittest.cc index 03923b1e61dcac..78fee39bff77e0 100644 --- a/ash/focus_cycler_unittest.cc +++ b/ash/focus_cycler_unittest.cc @@ -6,6 +6,8 @@ #include +#include "ash/common/wm/wm_globals.h" +#include "ash/common/wm/wm_window.h" #include "ash/shelf/shelf.h" #include "ash/shelf/shelf_widget.h" #include "ash/shell.h" @@ -15,8 +17,6 @@ #include "ash/system/status_area_widget_delegate.h" #include "ash/system/tray/system_tray.h" #include "ash/test/ash_test_base.h" -#include "ash/wm/common/wm_globals.h" -#include "ash/wm/common/wm_window.h" #include "ash/wm/window_util.h" #include "ui/aura/test/test_windows.h" #include "ui/aura/window.h" diff --git a/ash/frame/caption_buttons/frame_size_button.cc b/ash/frame/caption_buttons/frame_size_button.cc index c69bcf16df5fc6..02457c09ddfbb7 100644 --- a/ash/frame/caption_buttons/frame_size_button.cc +++ b/ash/frame/caption_buttons/frame_size_button.cc @@ -4,14 +4,14 @@ #include "ash/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/metrics/user_metrics_recorder.h" #include "ash/screen_util.h" #include "ash/shell.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/window_positioning_utils.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_event.h" -#include "ash/wm/common/workspace/phantom_window_controller.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "base/i18n/rtl.h" diff --git a/ash/frame/caption_buttons/frame_size_button_unittest.cc b/ash/frame/caption_buttons/frame_size_button_unittest.cc index af9420bcd448bf..d521a909e29883 100644 --- a/ash/frame/caption_buttons/frame_size_button_unittest.cc +++ b/ash/frame/caption_buttons/frame_size_button_unittest.cc @@ -5,11 +5,11 @@ #include "ash/frame/caption_buttons/frame_size_button.h" #include "ash/ash_layout_constants.h" +#include "ash/common/wm/window_state.h" #include "ash/frame/caption_buttons/frame_caption_button.h" #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" -#include "ash/wm/common/window_state.h" #include "ash/wm/window_state_aura.h" #include "base/i18n/rtl.h" #include "grit/ash_resources.h" diff --git a/ash/frame/custom_frame_view_ash.cc b/ash/frame/custom_frame_view_ash.cc index 51289fdb646ddd..6a16bdd900d322 100644 --- a/ash/frame/custom_frame_view_ash.cc +++ b/ash/frame/custom_frame_view_ash.cc @@ -8,6 +8,9 @@ #include #include "ash/ash_switches.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/frame/caption_buttons/frame_caption_button_container_view.h" #include "ash/frame/default_header_painter.h" #include "ash/frame/frame_border_hit_test_controller.h" @@ -16,9 +19,6 @@ #include "ash/shell.h" #include "ash/shell_observer.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/window_state_delegate.h" -#include "ash/wm/common/window_state_observer.h" #include "ash/wm/immersive_fullscreen_controller.h" #include "ash/wm/window_state_aura.h" #include "base/command_line.h" diff --git a/ash/frame/default_header_painter_unittest.cc b/ash/frame/default_header_painter_unittest.cc index a5a64f2f64d065..9446856b3e6f36 100644 --- a/ash/frame/default_header_painter_unittest.cc +++ b/ash/frame/default_header_painter_unittest.cc @@ -6,10 +6,10 @@ #include +#include "ash/common/wm/window_state.h" #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" -#include "ash/wm/common/window_state.h" #include "ui/gfx/font_list.h" #include "ui/views/test/test_views.h" #include "ui/views/widget/widget.h" diff --git a/ash/frame/frame_border_hit_test_controller.cc b/ash/frame/frame_border_hit_test_controller.cc index 13bc6c09e69eb3..5e46cce6187fe4 100644 --- a/ash/frame/frame_border_hit_test_controller.cc +++ b/ash/frame/frame_border_hit_test_controller.cc @@ -7,8 +7,8 @@ #include #include "ash/ash_constants.h" +#include "ash/common/wm/window_state_observer.h" #include "ash/frame/caption_buttons/frame_caption_button_container_view.h" -#include "ash/wm/common/window_state_observer.h" #include "ash/wm/resize_handle_window_targeter.h" #include "ui/aura/env.h" #include "ui/aura/window.h" diff --git a/ash/metrics/user_metrics_recorder.cc b/ash/metrics/user_metrics_recorder.cc index 16ecc6d414c371..19f3bdca915b2a 100644 --- a/ash/metrics/user_metrics_recorder.cc +++ b/ash/metrics/user_metrics_recorder.cc @@ -4,6 +4,8 @@ #include "ash/metrics/user_metrics_recorder.h" +#include "ash/common/wm/window_state.h" +#include "ash/common/wm/wm_user_metrics_action.h" #include "ash/metrics/desktop_task_switch_metric_recorder.h" #include "ash/session/session_state_delegate.h" #include "ash/shelf/shelf.h" @@ -14,8 +16,6 @@ #include "ash/shell.h" #include "ash/shell_window_ids.h" #include "ash/system/tray/system_tray_delegate.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_user_metrics_action.h" #include "ash/wm/window_state_aura.h" #include "base/metrics/histogram.h" #include "base/metrics/user_metrics.h" diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index 41789970a8b87d..846dc9268a229e 100644 --- a/ash/root_window_controller.cc +++ b/ash/root_window_controller.cc @@ -9,6 +9,17 @@ #include "ash/ash_constants.h" #include "ash/ash_switches.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/panels/panel_layout_manager.h" +#include "ash/common/wm/switchable_windows.h" +#include "ash/common/wm/window_state.h" +#include "ash/common/wm/wm_globals.h" +#include "ash/common/wm/wm_window.h" +#include "ash/common/wm/workspace/workspace_layout_manager.h" +#include "ash/common/wm/workspace/workspace_layout_manager_delegate.h" #include "ash/desktop_background/desktop_background_controller.h" #include "ash/desktop_background/desktop_background_widget_controller.h" #include "ash/desktop_background/user_wallpaper_delegate.h" @@ -35,17 +46,6 @@ #include "ash/wm/aura/aura_layout_manager_adapter.h" #include "ash/wm/aura/wm_shelf_aura.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/always_on_top_controller.h" -#include "ash/wm/common/container_finder.h" -#include "ash/wm/common/dock/docked_window_layout_manager.h" -#include "ash/wm/common/fullscreen_window_finder.h" -#include "ash/wm/common/panels/panel_layout_manager.h" -#include "ash/wm/common/switchable_windows.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_globals.h" -#include "ash/wm/common/wm_window.h" -#include "ash/wm/common/workspace/workspace_layout_manager.h" -#include "ash/wm/common/workspace/workspace_layout_manager_delegate.h" #include "ash/wm/lock_layout_manager.h" #include "ash/wm/panels/attached_panel_window_targeter.h" #include "ash/wm/panels/panel_window_event_handler.h" diff --git a/ash/root_window_controller_common.cc b/ash/root_window_controller_common.cc index 94ca6dc1bae240..80834425ea2f3b 100644 --- a/ash/root_window_controller_common.cc +++ b/ash/root_window_controller_common.cc @@ -4,9 +4,9 @@ #include "ash/root_window_controller_common.h" +#include "ash/common/wm/wm_globals.h" +#include "ash/common/wm/wm_window.h" #include "ash/shell_window_ids.h" -#include "ash/wm/common/wm_globals.h" -#include "ash/wm/common/wm_window.h" namespace ash { namespace { diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc index 58ccc2e0fc3392..b952b9f3063060 100644 --- a/ash/root_window_controller_unittest.cc +++ b/ash/root_window_controller_unittest.cc @@ -6,6 +6,7 @@ #include +#include "ash/common/wm/window_state.h" #include "ash/display/display_manager.h" #include "ash/session/session_state_delegate.h" #include "ash/shelf/shelf_layout_manager.h" @@ -14,7 +15,6 @@ #include "ash/system/tray/system_tray_delegate.h" #include "ash/test/ash_test_base.h" #include "ash/test/display_manager_test_api.h" -#include "ash/wm/common/window_state.h" #include "ash/wm/system_modal_container_layout_manager.h" #include "ash/wm/window_properties.h" #include "ash/wm/window_state_aura.h" diff --git a/ash/shelf/overflow_bubble_view.cc b/ash/shelf/overflow_bubble_view.cc index f797fb6e926d3b..bf3297dc7c6338 100644 --- a/ash/shelf/overflow_bubble_view.cc +++ b/ash/shelf/overflow_bubble_view.cc @@ -6,13 +6,13 @@ #include +#include "ash/common/wm/shelf/wm_shelf_constants.h" #include "ash/root_window_controller.h" #include "ash/shelf/shelf.h" #include "ash/shelf/shelf_constants.h" #include "ash/shelf/shelf_view.h" #include "ash/shell.h" #include "ash/shell_window_ids.h" -#include "ash/wm/common/shelf/wm_shelf_constants.h" #include "ui/display/display.h" #include "ui/display/screen.h" #include "ui/events/event.h" diff --git a/ash/shelf/shelf.cc b/ash/shelf/shelf.cc index 4145b761ce307b..1f6bea45df9698 100644 --- a/ash/shelf/shelf.cc +++ b/ash/shelf/shelf.cc @@ -7,6 +7,7 @@ #include #include +#include "ash/common/wm/shelf/wm_shelf_util.h" #include "ash/focus_cycler.h" #include "ash/root_window_controller.h" #include "ash/screen_util.h" @@ -22,7 +23,6 @@ #include "ash/shell_delegate.h" #include "ash/shell_window_ids.h" #include "ash/wm/aura/wm_shelf_aura.h" -#include "ash/wm/common/shelf/wm_shelf_util.h" #include "ash/wm/window_properties.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc index 30b8cea6e49af4..ee6ed02b872628 100644 --- a/ash/shelf/shelf_layout_manager.cc +++ b/ash/shelf/shelf_layout_manager.cc @@ -12,6 +12,10 @@ #include "ash/accelerators/accelerator_commands.h" #include "ash/ash_switches.h" +#include "ash/common/wm/shelf/wm_shelf_util.h" +#include "ash/common/wm/window_state.h" +#include "ash/common/wm/wm_root_window_controller.h" +#include "ash/common/wm/wm_root_window_controller_observer.h" #include "ash/root_window_controller.h" #include "ash/screen_util.h" #include "ash/session/session_state_delegate.h" @@ -26,10 +30,6 @@ #include "ash/shell_window_ids.h" #include "ash/system/status_area_widget.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/shelf/wm_shelf_util.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_root_window_controller.h" -#include "ash/wm/common/wm_root_window_controller_observer.h" #include "ash/wm/gestures/shelf_gesture_handler.h" #include "ash/wm/lock_state_controller.h" #include "ash/wm/mru_window_tracker.h" diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h index 745c640da518d1..f96ef28172e7a2 100644 --- a/ash/shelf/shelf_layout_manager.h +++ b/ash/shelf/shelf_layout_manager.h @@ -9,15 +9,15 @@ #include #include "ash/ash_export.h" +#include "ash/common/wm/background_animator.h" +#include "ash/common/wm/dock/docked_window_layout_manager_observer.h" +#include "ash/common/wm/workspace/workspace_types.h" #include "ash/session/session_state_observer.h" #include "ash/shelf/shelf.h" #include "ash/shelf/shelf_types.h" #include "ash/shell_observer.h" #include "ash/snap_to_pixel_layout_manager.h" #include "ash/system/status_area_widget.h" -#include "ash/wm/common/background_animator.h" -#include "ash/wm/common/dock/docked_window_layout_manager_observer.h" -#include "ash/wm/common/workspace/workspace_types.h" #include "ash/wm/gestures/shelf_gesture_handler.h" #include "ash/wm/lock_state_observer.h" #include "base/compiler_specific.h" diff --git a/ash/shelf/shelf_layout_manager_observer.h b/ash/shelf/shelf_layout_manager_observer.h index d810495da76173..3d1a51790304f9 100644 --- a/ash/shelf/shelf_layout_manager_observer.h +++ b/ash/shelf/shelf_layout_manager_observer.h @@ -6,8 +6,8 @@ #define ASH_SHELF_SHELF_LAYOUT_MANAGER_OBSERVER_H_ #include "ash/ash_export.h" +#include "ash/common/wm/background_animator.h" #include "ash/shelf/shelf_types.h" -#include "ash/wm/common/background_animator.h" namespace aura { class Window; diff --git a/ash/shelf/shelf_layout_manager_unittest.cc b/ash/shelf/shelf_layout_manager_unittest.cc index 5dba0a9ec53d10..7afe202e3ae6c9 100644 --- a/ash/shelf/shelf_layout_manager_unittest.cc +++ b/ash/shelf/shelf_layout_manager_unittest.cc @@ -7,6 +7,7 @@ #include "ash/accelerators/accelerator_controller.h" #include "ash/accelerators/accelerator_table.h" #include "ash/ash_switches.h" +#include "ash/common/wm/window_state.h" #include "ash/display/display_manager.h" #include "ash/display/window_tree_host_manager.h" #include "ash/focus_cycler.h" @@ -25,7 +26,6 @@ #include "ash/test/ash_test_base.h" #include "ash/test/display_manager_test_api.h" #include "ash/test/shelf_test_api.h" -#include "ash/wm/common/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_types.h b/ash/shelf/shelf_types.h index e680920f2f9e06..4821ff037e69f7 100644 --- a/ash/shelf/shelf_types.h +++ b/ash/shelf/shelf_types.h @@ -6,7 +6,7 @@ #define ASH_SHELF_SHELF_TYPES_H_ // TODO(sky): make callers explicitly include this. -#include "ash/wm/common/shelf/wm_shelf_types.h" +#include "ash/common/wm/shelf/wm_shelf_types.h" namespace ash { diff --git a/ash/shelf/shelf_view.cc b/ash/shelf/shelf_view.cc index 53cb363cc0e0f9..31df20b585bec3 100644 --- a/ash/shelf/shelf_view.cc +++ b/ash/shelf/shelf_view.cc @@ -9,6 +9,7 @@ #include "ash/ash_constants.h" #include "ash/ash_switches.h" +#include "ash/common/wm/root_window_finder.h" #include "ash/drag_drop/drag_image_view.h" #include "ash/metrics/user_metrics_recorder.h" #include "ash/scoped_target_root_window.h" @@ -28,7 +29,6 @@ #include "ash/shell.h" #include "ash/shell_delegate.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/root_window_finder.h" #include "base/auto_reset.h" #include "base/metrics/histogram.h" #include "grit/ash_strings.h" diff --git a/ash/shelf/shelf_widget.cc b/ash/shelf/shelf_widget.cc index a454bd3d10d19c..6554768d944f04 100644 --- a/ash/shelf/shelf_widget.cc +++ b/ash/shelf/shelf_widget.cc @@ -5,6 +5,9 @@ #include "ash/shelf/shelf_widget.h" #include "ash/ash_switches.h" +#include "ash/common/wm/shelf/wm_shelf_constants.h" +#include "ash/common/wm/shelf/wm_shelf_util.h" +#include "ash/common/wm/wm_root_window_controller.h" #include "ash/focus_cycler.h" #include "ash/session/session_state_delegate.h" #include "ash/shelf/shelf_constants.h" @@ -19,9 +22,6 @@ #include "ash/shell_window_ids.h" #include "ash/system/tray/system_tray_delegate.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/shelf/wm_shelf_constants.h" -#include "ash/wm/common/shelf/wm_shelf_util.h" -#include "ash/wm/common/wm_root_window_controller.h" #include "ash/wm/status_area_layout_manager.h" #include "ash/wm/window_properties.h" #include "ash/wm/workspace_controller.h" diff --git a/ash/shelf/shelf_widget.h b/ash/shelf/shelf_widget.h index 249167986326d4..aff1642852d973 100644 --- a/ash/shelf/shelf_widget.h +++ b/ash/shelf/shelf_widget.h @@ -8,9 +8,9 @@ #include #include "ash/ash_export.h" +#include "ash/common/wm/background_animator.h" #include "ash/shelf/shelf_layout_manager_observer.h" #include "ash/shelf/shelf_types.h" -#include "ash/wm/common/background_animator.h" #include "base/macros.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_observer.h" diff --git a/ash/shelf/shelf_window_watcher.cc b/ash/shelf/shelf_window_watcher.cc index 95ea25425073d7..ec1b692e0d03c2 100644 --- a/ash/shelf/shelf_window_watcher.cc +++ b/ash/shelf/shelf_window_watcher.cc @@ -7,6 +7,7 @@ #include #include +#include "ash/common/wm/window_state.h" #include "ash/display/window_tree_host_manager.h" #include "ash/shelf/shelf_constants.h" #include "ash/shelf/shelf_item_delegate_manager.h" @@ -15,7 +16,6 @@ #include "ash/shelf/shelf_window_watcher_item_delegate.h" #include "ash/shell.h" #include "ash/shell_window_ids.h" -#include "ash/wm/common/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/shelf/shelf_window_watcher_item_delegate.cc b/ash/shelf/shelf_window_watcher_item_delegate.cc index 74ce5462cc8f75..fb166bd05e738f 100644 --- a/ash/shelf/shelf_window_watcher_item_delegate.cc +++ b/ash/shelf/shelf_window_watcher_item_delegate.cc @@ -4,9 +4,9 @@ #include "ash/shelf/shelf_window_watcher_item_delegate.h" +#include "ash/common/wm/window_state.h" #include "ash/shelf/shelf_util.h" #include "ash/shell.h" -#include "ash/wm/common/window_state.h" #include "ash/wm/window_state_aura.h" #include "ui/aura/window.h" #include "ui/views/widget/widget.h" diff --git a/ash/shelf/shelf_window_watcher_unittest.cc b/ash/shelf/shelf_window_watcher_unittest.cc index f03a262fbce7b6..b8bbb043dd07f1 100644 --- a/ash/shelf/shelf_window_watcher_unittest.cc +++ b/ash/shelf/shelf_window_watcher_unittest.cc @@ -5,6 +5,8 @@ #include "ash/shelf/shelf_window_watcher.h" #include "ash/ash_switches.h" +#include "ash/common/wm/window_resizer.h" +#include "ash/common/wm/window_state.h" #include "ash/shelf/shelf_item_types.h" #include "ash/shelf/shelf_model.h" #include "ash/shelf/shelf_util.h" @@ -13,8 +15,6 @@ #include "ash/test/ash_test_base.h" #include "ash/test/shell_test_api.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/window_resizer.h" -#include "ash/wm/common/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/shell.cc b/ash/shell.cc index 4276304dd488ca..0d7056692f85af 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -13,6 +13,8 @@ #include "ash/accelerators/focus_manager_factory.h" #include "ash/ash_switches.h" #include "ash/autoclick/autoclick_controller.h" +#include "ash/common/wm/root_window_finder.h" +#include "ash/common/wm/window_positioner.h" #include "ash/container_delegate.h" #include "ash/desktop_background/desktop_background_controller.h" #include "ash/desktop_background/desktop_background_view.h" @@ -63,8 +65,6 @@ #include "ash/wm/ash_native_cursor_manager.h" #include "ash/wm/aura/wm_globals_aura.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/root_window_finder.h" -#include "ash/wm/common/window_positioner.h" #include "ash/wm/event_client_impl.h" #include "ash/wm/lock_state_controller.h" #include "ash/wm/maximize_mode/maximize_mode_controller.h" diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc index 519d2fdfd2a7a2..fb69fd7a5b647f 100644 --- a/ash/shell/shell_delegate_impl.cc +++ b/ash/shell/shell_delegate_impl.cc @@ -6,6 +6,7 @@ #include "ash/accessibility_delegate.h" #include "ash/app_list/app_list_presenter_delegate_factory.h" +#include "ash/common/wm/window_state.h" #include "ash/container_delegate_aura.h" #include "ash/default_accessibility_delegate.h" #include "ash/default_user_wallpaper_delegate.h" @@ -21,7 +22,6 @@ #include "ash/shell_window_ids.h" #include "ash/system/tray/default_system_tray_delegate.h" #include "ash/test/test_keyboard_ui.h" -#include "ash/wm/common/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 cfc4e72da81179..d74cd62f105b6a 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/common/window_positioner.h" -#include "ash/wm/common/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_ids.h b/ash/shell_window_ids.h index 799bc056f9d40f..cb578cc1d52d96 100644 --- a/ash/shell_window_ids.h +++ b/ash/shell_window_ids.h @@ -5,7 +5,7 @@ #ifndef ASH_SHELL_WINDOW_IDS_H_ #define ASH_SHELL_WINDOW_IDS_H_ -#include "ash/wm/common/wm_shell_window_ids.h" +#include "ash/common/wm/wm_shell_window_ids.h" // Declarations of ids of special shell windows. diff --git a/ash/system/cast/tray_cast.cc b/ash/system/cast/tray_cast.cc index 9a7bcce1649c54..f178d549dcf774 100644 --- a/ash/system/cast/tray_cast.cc +++ b/ash/system/cast/tray_cast.cc @@ -4,6 +4,7 @@ #include "ash/system/cast/tray_cast.h" +#include "ash/common/wm/shelf/wm_shelf_util.h" #include "ash/session/session_state_delegate.h" #include "ash/shelf/shelf_types.h" #include "ash/shelf/shelf_util.h" @@ -21,7 +22,6 @@ #include "ash/system/tray/tray_item_more.h" #include "ash/system/tray/tray_item_view.h" #include "ash/system/tray/tray_popup_label_button.h" -#include "ash/wm/common/shelf/wm_shelf_util.h" #include "base/bind.h" #include "grit/ash_resources.h" #include "grit/ash_strings.h" diff --git a/ash/system/chromeos/network/tray_network.cc b/ash/system/chromeos/network/tray_network.cc index 27c735c7018611..2ec1112639cc65 100644 --- a/ash/system/chromeos/network/tray_network.cc +++ b/ash/system/chromeos/network/tray_network.cc @@ -5,6 +5,7 @@ #include "ash/system/chromeos/network/tray_network.h" #include "ash/ash_switches.h" +#include "ash/common/wm/shelf/wm_shelf_util.h" #include "ash/metrics/user_metrics_recorder.h" #include "ash/shelf/shelf_util.h" #include "ash/shell.h" @@ -17,7 +18,6 @@ #include "ash/system/tray/tray_item_more.h" #include "ash/system/tray/tray_item_view.h" #include "ash/system/tray/tray_utils.h" -#include "ash/wm/common/shelf/wm_shelf_util.h" #include "base/command_line.h" #include "base/strings/utf_string_conversions.h" #include "chromeos/network/network_state.h" diff --git a/ash/system/chromeos/screen_security/screen_tray_item.cc b/ash/system/chromeos/screen_security/screen_tray_item.cc index 6322824b227bf7..e274bdc832f876 100644 --- a/ash/system/chromeos/screen_security/screen_tray_item.cc +++ b/ash/system/chromeos/screen_security/screen_tray_item.cc @@ -4,10 +4,10 @@ #include "ash/system/chromeos/screen_security/screen_tray_item.h" +#include "ash/common/wm/shelf/wm_shelf_util.h" #include "ash/shelf/shelf_util.h" #include "ash/system/tray/fixed_sized_image_view.h" #include "ash/system/tray/tray_constants.h" -#include "ash/wm/common/shelf/wm_shelf_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/message_center/message_center.h" #include "ui/views/controls/label.h" diff --git a/ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc b/ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc index 09451cc6f47c4d..d406aa7f4fa5de 100644 --- a/ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc +++ b/ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc @@ -4,6 +4,7 @@ #include "ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h" +#include "ash/common/wm/shelf/wm_shelf_util.h" #include "ash/keyboard/keyboard_ui.h" #include "ash/shelf/shelf.h" #include "ash/shelf/shelf_constants.h" @@ -13,7 +14,6 @@ #include "ash/system/tray/system_tray_notifier.h" #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_utils.h" -#include "ash/wm/common/shelf/wm_shelf_util.h" #include "grit/ash_resources.h" #include "grit/ash_strings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/ash/system/date/tray_date.cc b/ash/system/date/tray_date.cc index 9b7f5bcb894b5d..078024911a5a35 100644 --- a/ash/system/date/tray_date.cc +++ b/ash/system/date/tray_date.cc @@ -4,6 +4,7 @@ #include "ash/system/date/tray_date.h" +#include "ash/common/wm/shelf/wm_shelf_util.h" #include "ash/shelf/shelf_util.h" #include "ash/shell.h" #include "ash/system/date/date_default_view.h" @@ -11,7 +12,6 @@ #include "ash/system/tray/system_tray.h" #include "ash/system/tray/system_tray_notifier.h" #include "ash/system/tray/tray_item_view.h" -#include "ash/wm/common/shelf/wm_shelf_util.h" #if defined(OS_CHROMEOS) #include "ash/system/chromeos/system_clock_observer.h" diff --git a/ash/system/overview/overview_button_tray.cc b/ash/system/overview/overview_button_tray.cc index 4b152b3be60127..c4155add802543 100644 --- a/ash/system/overview/overview_button_tray.cc +++ b/ash/system/overview/overview_button_tray.cc @@ -4,13 +4,13 @@ #include "ash/system/overview/overview_button_tray.h" +#include "ash/common/wm/shelf/wm_shelf_util.h" #include "ash/session/session_state_delegate.h" #include "ash/shelf/shelf_types.h" #include "ash/shelf/shelf_util.h" #include "ash/shell.h" #include "ash/system/tray/system_tray_delegate.h" #include "ash/system/tray/tray_utils.h" -#include "ash/wm/common/shelf/wm_shelf_util.h" #include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "ash/wm/overview/window_selector_controller.h" #include "grit/ash_resources.h" diff --git a/ash/system/status_area_widget.cc b/ash/system/status_area_widget.cc index ff9c36b077e939..a22a193d6e6e05 100644 --- a/ash/system/status_area_widget.cc +++ b/ash/system/status_area_widget.cc @@ -4,6 +4,8 @@ #include "ash/system/status_area_widget.h" +#include "ash/common/wm/wm_root_window_controller.h" +#include "ash/common/wm/wm_window.h" #include "ash/shelf/shelf_layout_manager.h" #include "ash/shelf/shelf_widget.h" #include "ash/shell.h" @@ -14,8 +16,6 @@ #include "ash/system/tray/system_tray.h" #include "ash/system/tray/system_tray_delegate.h" #include "ash/system/web_notification/web_notification_tray.h" -#include "ash/wm/common/wm_root_window_controller.h" -#include "ash/wm/common/wm_window.h" #include "ash/wm/window_properties.h" #include "base/i18n/time_formatting.h" diff --git a/ash/system/status_area_widget_delegate.cc b/ash/system/status_area_widget_delegate.cc index 322e68dea4c9d2..300ca0c65277f9 100644 --- a/ash/system/status_area_widget_delegate.cc +++ b/ash/system/status_area_widget_delegate.cc @@ -6,12 +6,12 @@ #include "ash/ash_export.h" #include "ash/ash_switches.h" +#include "ash/common/wm/shelf/wm_shelf_util.h" #include "ash/focus_cycler.h" #include "ash/shelf/shelf_util.h" #include "ash/shell.h" #include "ash/shell_window_ids.h" #include "ash/system/tray/tray_constants.h" -#include "ash/wm/common/shelf/wm_shelf_util.h" #include "base/strings/utf_string_conversions.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer.h" diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc index 28b3392d221dc3..6106272a974a05 100644 --- a/ash/system/tray/system_tray.cc +++ b/ash/system/tray/system_tray.cc @@ -5,6 +5,7 @@ #include "ash/system/tray/system_tray.h" #include "ash/ash_switches.h" +#include "ash/common/wm/shelf/wm_shelf_util.h" #include "ash/metrics/user_metrics_recorder.h" #include "ash/shelf/shelf_layout_manager.h" #include "ash/shelf/shelf_util.h" @@ -24,7 +25,6 @@ #include "ash/system/user/tray_user.h" #include "ash/system/user/tray_user_separator.h" #include "ash/system/web_notification/web_notification_tray.h" -#include "ash/wm/common/shelf/wm_shelf_util.h" #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/strings/utf_string_conversions.h" diff --git a/ash/system/tray/tray_background_view.cc b/ash/system/tray/tray_background_view.cc index 1f2cf262858275..7b7df0add043a4 100644 --- a/ash/system/tray/tray_background_view.cc +++ b/ash/system/tray/tray_background_view.cc @@ -4,6 +4,7 @@ #include "ash/system/tray/tray_background_view.h" +#include "ash/common/wm/shelf/wm_shelf_util.h" #include "ash/root_window_controller.h" #include "ash/screen_util.h" #include "ash/shelf/shelf_layout_manager.h" @@ -16,7 +17,6 @@ #include "ash/system/tray/system_tray.h" #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_event_filter.h" -#include "ash/wm/common/shelf/wm_shelf_util.h" #include "ash/wm/window_animations.h" #include "base/command_line.h" #include "grit/ash_resources.h" diff --git a/ash/system/tray/tray_background_view.h b/ash/system/tray/tray_background_view.h index 2aecdd54226aa3..df29bde801fbf3 100644 --- a/ash/system/tray/tray_background_view.h +++ b/ash/system/tray/tray_background_view.h @@ -8,9 +8,9 @@ #include #include "ash/ash_export.h" +#include "ash/common/wm/background_animator.h" #include "ash/shelf/shelf_types.h" #include "ash/system/tray/actionable_view.h" -#include "ash/wm/common/background_animator.h" #include "base/macros.h" #include "ui/compositor/layer_animation_observer.h" #include "ui/views/bubble/tray_bubble_view.h" diff --git a/ash/system/tray/tray_image_item.cc b/ash/system/tray/tray_image_item.cc index 5a4475ac17215e..4b42984767464e 100644 --- a/ash/system/tray/tray_image_item.cc +++ b/ash/system/tray/tray_image_item.cc @@ -4,11 +4,11 @@ #include "ash/system/tray/tray_image_item.h" +#include "ash/common/wm/shelf/wm_shelf_util.h" #include "ash/shelf/shelf_util.h" #include "ash/system/tray/system_tray.h" #include "ash/system/tray/tray_item_view.h" #include "ash/system/tray/tray_utils.h" -#include "ash/wm/common/shelf/wm_shelf_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" #include "ui/views/controls/image_view.h" diff --git a/ash/system/tray/tray_item_view.cc b/ash/system/tray/tray_item_view.cc index 0897e96a1a8ac4..5fe35ec32a12e1 100644 --- a/ash/system/tray/tray_item_view.cc +++ b/ash/system/tray/tray_item_view.cc @@ -4,11 +4,11 @@ #include "ash/system/tray/tray_item_view.h" +#include "ash/common/wm/shelf/wm_shelf_util.h" #include "ash/shelf/shelf_types.h" #include "ash/shelf/shelf_util.h" #include "ash/system/tray/system_tray.h" #include "ash/system/tray/system_tray_item.h" -#include "ash/wm/common/shelf/wm_shelf_util.h" #include "ui/compositor/layer.h" #include "ui/gfx/animation/slide_animation.h" #include "ui/views/controls/image_view.h" diff --git a/ash/system/tray/tray_utils.cc b/ash/system/tray/tray_utils.cc index bd6009d8a2ba83..bc1db2d35b2c0a 100644 --- a/ash/system/tray/tray_utils.cc +++ b/ash/system/tray/tray_utils.cc @@ -4,10 +4,10 @@ #include "ash/system/tray/tray_utils.h" +#include "ash/common/wm/shelf/wm_shelf_util.h" #include "ash/shelf/shelf_util.h" #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_item_view.h" -#include "ash/wm/common/shelf/wm_shelf_util.h" #include "ui/accessibility/ax_view_state.h" #include "ui/gfx/font_list.h" #include "ui/gfx/geometry/vector2d.h" diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc index ac9691bf2c2c11..76daae4efbcb17 100644 --- a/ash/system/user/tray_user.cc +++ b/ash/system/user/tray_user.cc @@ -5,6 +5,7 @@ #include "ash/system/user/tray_user.h" #include "ash/ash_switches.h" +#include "ash/common/wm/shelf/wm_shelf_util.h" #include "ash/root_window_controller.h" #include "ash/session/session_state_delegate.h" #include "ash/shelf/shelf_layout_manager.h" @@ -18,7 +19,6 @@ #include "ash/system/tray/tray_utils.h" #include "ash/system/user/rounded_image_view.h" #include "ash/system/user/user_view.h" -#include "ash/wm/common/shelf/wm_shelf_util.h" #include "base/logging.h" #include "base/strings/string16.h" #include "components/signin/core/account_id/account_id.h" diff --git a/ash/system/web_notification/web_notification_tray.cc b/ash/system/web_notification/web_notification_tray.cc index 7aa1d5c9d441ab..4af10bd55e98f7 100644 --- a/ash/system/web_notification/web_notification_tray.cc +++ b/ash/system/web_notification/web_notification_tray.cc @@ -5,6 +5,7 @@ #include "ash/system/web_notification/web_notification_tray.h" #include "ash/ash_switches.h" +#include "ash/common/wm/shelf/wm_shelf_util.h" #include "ash/root_window_controller.h" #include "ash/shelf/shelf_layout_manager.h" #include "ash/shelf/shelf_layout_manager_observer.h" @@ -19,7 +20,6 @@ #include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_utils.h" #include "ash/system/web_notification/ash_popup_alignment_delegate.h" -#include "ash/wm/common/shelf/wm_shelf_util.h" #include "base/auto_reset.h" #include "base/i18n/number_formatting.h" #include "base/i18n/rtl.h" diff --git a/ash/system/web_notification/web_notification_tray_unittest.cc b/ash/system/web_notification/web_notification_tray_unittest.cc index 083dcbcfc7920b..eaf0b614e52f7d 100644 --- a/ash/system/web_notification/web_notification_tray_unittest.cc +++ b/ash/system/web_notification/web_notification_tray_unittest.cc @@ -7,6 +7,7 @@ #include #include +#include "ash/common/wm/window_state.h" #include "ash/display/display_manager.h" #include "ash/root_window_controller.h" #include "ash/shelf/shelf_layout_manager.h" @@ -19,7 +20,6 @@ #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/common/window_state.h" #include "ash/wm/window_state_aura.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc index 3cf40683047b18..46df91c3967406 100644 --- a/ash/test/ash_test_base.cc +++ b/ash/test/ash_test_base.cc @@ -8,6 +8,7 @@ #include #include "ash/ash_switches.h" +#include "ash/common/wm/window_positioner.h" #include "ash/display/window_tree_host_manager.h" #include "ash/ime/input_method_event_handler.h" #include "ash/shell.h" @@ -17,7 +18,6 @@ #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/common/window_positioner.h" #include "base/command_line.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/screen_position_client.h" diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc index eab081ac8e7c8b..466754941ecbc1 100644 --- a/ash/test/test_shell_delegate.cc +++ b/ash/test/test_shell_delegate.cc @@ -8,6 +8,7 @@ #include "ash/app_list/app_list_presenter_delegate.h" #include "ash/app_list/app_list_presenter_delegate_factory.h" +#include "ash/common/wm/window_state.h" #include "ash/container_delegate_aura.h" #include "ash/default_accessibility_delegate.h" #include "ash/gpu_support_stub.h" @@ -22,7 +23,6 @@ #include "ash/test/test_shelf_delegate.h" #include "ash/test/test_system_tray_delegate.h" #include "ash/test/test_user_wallpaper_delegate.h" -#include "ash/wm/common/window_state.h" #include "ash/wm/window_util.h" #include "base/logging.h" #include "base/memory/ptr_util.h" diff --git a/ash/test/ui_controls_factory_ash.cc b/ash/test/ui_controls_factory_ash.cc index 66562bfeb14eff..5fa98bce34c347 100644 --- a/ash/test/ui_controls_factory_ash.cc +++ b/ash/test/ui_controls_factory_ash.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/common/wm/root_window_finder.h" #include "ash/shell.h" #include "ash/shell_factory.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/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/wm/always_on_top_controller_unittest.cc b/ash/wm/always_on_top_controller_unittest.cc index 7818bb2390cf62..a8829f36ce2092 100644 --- a/ash/wm/always_on_top_controller_unittest.cc +++ b/ash/wm/always_on_top_controller_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/wm/common/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/workspace/workspace_layout_manager_delegate.h" #include "ash/root_window_controller.h" #include "ash/shell.h" #include "ash/shell_window_ids.h" #include "ash/test/ash_test_base.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/workspace/workspace_layout_manager.h" -#include "ash/wm/common/workspace/workspace_layout_manager_delegate.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 1c3e1ccd381bc2..1373a4c8242ba1 100644 --- a/ash/wm/ash_focus_rules.cc +++ b/ash/wm/ash_focus_rules.cc @@ -4,10 +4,10 @@ #include "ash/wm/ash_focus_rules.h" +#include "ash/common/wm/window_state.h" #include "ash/shell.h" #include "ash/shell_delegate.h" #include "ash/shell_window_ids.h" -#include "ash/wm/common/window_state.h" #include "ash/wm/mru_window_tracker.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 7034620945efce..d729ab45f675d0 100644 --- a/ash/wm/ash_focus_rules_unittest.cc +++ b/ash/wm/ash_focus_rules_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/wm/window_state.h" #include "ash/session/session_state_delegate.h" #include "ash/shell.h" #include "ash/shell_window_ids.h" @@ -9,7 +10,6 @@ #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/common/window_state.h" #include "ash/wm/lock_state_controller.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" diff --git a/ash/wm/aura/aura_layout_manager_adapter.cc b/ash/wm/aura/aura_layout_manager_adapter.cc index 3bc0bc831ace81..c7cab6b1a70f65 100644 --- a/ash/wm/aura/aura_layout_manager_adapter.cc +++ b/ash/wm/aura/aura_layout_manager_adapter.cc @@ -4,8 +4,8 @@ #include "ash/wm/aura/aura_layout_manager_adapter.h" +#include "ash/common/wm/wm_layout_manager.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/wm_layout_manager.h" namespace ash { namespace wm { diff --git a/ash/wm/aura/wm_globals_aura.cc b/ash/wm/aura/wm_globals_aura.cc index 33561c862e55b4..2967a5fddc934e 100644 --- a/ash/wm/aura/wm_globals_aura.cc +++ b/ash/wm/aura/wm_globals_aura.cc @@ -4,14 +4,14 @@ #include "ash/wm/aura/wm_globals_aura.h" +#include "ash/common/wm/wm_activation_observer.h" +#include "ash/common/wm/wm_display_observer.h" +#include "ash/common/wm/wm_overview_mode_observer.h" #include "ash/display/window_tree_host_manager.h" #include "ash/session/session_state_delegate.h" #include "ash/shell.h" #include "ash/shell_delegate.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/wm_activation_observer.h" -#include "ash/wm/common/wm_display_observer.h" -#include "ash/wm/common/wm_overview_mode_observer.h" #include "ash/wm/drag_window_resizer.h" #include "ash/wm/mru_window_tracker.h" #include "ash/wm/overview/window_selector_controller.h" diff --git a/ash/wm/aura/wm_globals_aura.h b/ash/wm/aura/wm_globals_aura.h index 5cc73f5c389c33..91b55c84b7150e 100644 --- a/ash/wm/aura/wm_globals_aura.h +++ b/ash/wm/aura/wm_globals_aura.h @@ -8,10 +8,10 @@ #include #include "ash/ash_export.h" +#include "ash/common/wm/wm_globals.h" #include "ash/display/window_tree_host_manager.h" #include "ash/shell_observer.h" #include "ash/wm/aura/wm_lookup_aura.h" -#include "ash/wm/common/wm_globals.h" #include "base/macros.h" #include "base/observer_list.h" #include "ui/wm/public/activation_change_observer.h" diff --git a/ash/wm/aura/wm_lookup_aura.cc b/ash/wm/aura/wm_lookup_aura.cc index 1ddaa78fa2626b..c64c9c238108d8 100644 --- a/ash/wm/aura/wm_lookup_aura.cc +++ b/ash/wm/aura/wm_lookup_aura.cc @@ -4,11 +4,11 @@ #include "ash/wm/aura/wm_lookup_aura.h" +#include "ash/common/wm/wm_layout_manager.h" #include "ash/display/window_tree_host_manager.h" #include "ash/shell.h" #include "ash/wm/aura/wm_root_window_controller_aura.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/wm_layout_manager.h" namespace ash { namespace wm { diff --git a/ash/wm/aura/wm_lookup_aura.h b/ash/wm/aura/wm_lookup_aura.h index 572ff719ce87f9..696aebb734ec87 100644 --- a/ash/wm/aura/wm_lookup_aura.h +++ b/ash/wm/aura/wm_lookup_aura.h @@ -5,7 +5,7 @@ #ifndef ASH_WM_AURA_WM_LOOKUP_AURA_H_ #define ASH_WM_AURA_WM_LOOKUP_AURA_H_ -#include "ash/wm/common/wm_lookup.h" +#include "ash/common/wm/wm_lookup.h" #include "base/macros.h" namespace ash { diff --git a/ash/wm/aura/wm_root_window_controller_aura.cc b/ash/wm/aura/wm_root_window_controller_aura.cc index c66233c99a8407..a5e3543e037477 100644 --- a/ash/wm/aura/wm_root_window_controller_aura.cc +++ b/ash/wm/aura/wm_root_window_controller_aura.cc @@ -4,6 +4,7 @@ #include "ash/wm/aura/wm_root_window_controller_aura.h" +#include "ash/common/wm/wm_root_window_controller_observer.h" #include "ash/display/window_tree_host_manager.h" #include "ash/root_window_controller.h" #include "ash/shelf/shelf.h" @@ -12,7 +13,6 @@ #include "ash/wm/aura/wm_globals_aura.h" #include "ash/wm/aura/wm_shelf_aura.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/wm_root_window_controller_observer.h" #include "ash/wm/workspace_controller.h" #include "ui/aura/window.h" #include "ui/aura/window_property.h" diff --git a/ash/wm/aura/wm_root_window_controller_aura.h b/ash/wm/aura/wm_root_window_controller_aura.h index 60378106da65ef..9164f99f780401 100644 --- a/ash/wm/aura/wm_root_window_controller_aura.h +++ b/ash/wm/aura/wm_root_window_controller_aura.h @@ -6,8 +6,8 @@ #define ASH_WM_AURA_WM_ROOT_CONTROLLER_AURA_H_ #include "ash/ash_export.h" +#include "ash/common/wm/wm_root_window_controller.h" #include "ash/shell_observer.h" -#include "ash/wm/common/wm_root_window_controller.h" #include "base/macros.h" #include "base/observer_list.h" diff --git a/ash/wm/aura/wm_shelf_aura.cc b/ash/wm/aura/wm_shelf_aura.cc index 179baee37e877c..82a9ea9bb8663b 100644 --- a/ash/wm/aura/wm_shelf_aura.cc +++ b/ash/wm/aura/wm_shelf_aura.cc @@ -4,11 +4,11 @@ #include "ash/wm/aura/wm_shelf_aura.h" +#include "ash/common/wm/shelf/wm_shelf_observer.h" +#include "ash/common/wm/wm_window.h" #include "ash/shelf/shelf.h" #include "ash/shelf/shelf_layout_manager.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/shelf/wm_shelf_observer.h" -#include "ash/wm/common/wm_window.h" #include "ui/views/widget/widget.h" namespace ash { diff --git a/ash/wm/aura/wm_shelf_aura.h b/ash/wm/aura/wm_shelf_aura.h index fd03c9ec2f7f1a..e078e418b419f0 100644 --- a/ash/wm/aura/wm_shelf_aura.h +++ b/ash/wm/aura/wm_shelf_aura.h @@ -6,9 +6,9 @@ #define ASH_WM_AURA_WM_SHELF_AURA_H_ #include "ash/ash_export.h" +#include "ash/common/wm/shelf/wm_shelf.h" #include "ash/shelf/shelf_icon_observer.h" #include "ash/shelf/shelf_layout_manager_observer.h" -#include "ash/wm/common/shelf/wm_shelf.h" #include "base/macros.h" #include "base/observer_list.h" diff --git a/ash/wm/aura/wm_window_aura.cc b/ash/wm/aura/wm_window_aura.cc index f585ab37df05e0..4f17816d7b2670 100644 --- a/ash/wm/aura/wm_window_aura.cc +++ b/ash/wm/aura/wm_window_aura.cc @@ -5,16 +5,16 @@ #include "ash/wm/aura/wm_window_aura.h" #include "ash/ash_constants.h" +#include "ash/common/wm/window_state.h" +#include "ash/common/wm/wm_layout_manager.h" +#include "ash/common/wm/wm_window_observer.h" +#include "ash/common/wm/wm_window_property.h" #include "ash/screen_util.h" #include "ash/shelf/shelf_util.h" #include "ash/shell.h" #include "ash/wm/aura/aura_layout_manager_adapter.h" #include "ash/wm/aura/wm_globals_aura.h" #include "ash/wm/aura/wm_root_window_controller_aura.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_layout_manager.h" -#include "ash/wm/common/wm_window_observer.h" -#include "ash/wm/common/wm_window_property.h" #include "ash/wm/resize_shadow_controller.h" #include "ash/wm/window_animations.h" #include "ash/wm/window_properties.h" diff --git a/ash/wm/aura/wm_window_aura.h b/ash/wm/aura/wm_window_aura.h index b5181edbc50115..0f58a2ee6245ad 100644 --- a/ash/wm/aura/wm_window_aura.h +++ b/ash/wm/aura/wm_window_aura.h @@ -6,7 +6,7 @@ #define ASH_WM_AURA_WM_WINDOW_AURA_H_ #include "ash/ash_export.h" -#include "ash/wm/common/wm_window.h" +#include "ash/common/wm/wm_window.h" #include "base/macros.h" #include "base/observer_list.h" #include "ui/aura/window_observer.h" diff --git a/ash/wm/common/ash_wm_common.gyp b/ash/wm/common/ash_wm_common.gyp deleted file mode 100644 index a9b64119b6d299..00000000000000 --- a/ash/wm/common/ash_wm_common.gyp +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright 2016 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'targets': [ - { - 'target_name': 'ash_wm_common', - 'type': '<(component)', - 'dependencies': [ - '../../ash_resources.gyp:ash_resources', - '../../../base/base.gyp:base', - '../../../skia/skia.gyp:skia', - '../../../ui/aura/aura.gyp:aura', - '../../../ui/base/ui_base.gyp:ui_base', - '../../../ui/compositor/compositor.gyp:compositor', - '../../../ui/display/display.gyp:display', - '../../../ui/events/events.gyp:events', - '../../../ui/events/events.gyp:events_base', - '../../../ui/gfx/gfx.gyp:gfx', - '../../../ui/gfx/gfx.gyp:gfx_geometry', - '../../../ui/keyboard/keyboard.gyp:keyboard', - '../../../ui/views/views.gyp:views', - '../../../ui/wm/wm.gyp:wm', - ], - 'defines': [ - 'ASH_WM_COMMON_IMPLEMENTATION', - ], - 'sources': [ - 'always_on_top_controller.cc', - 'always_on_top_controller.h', - 'ash_wm_common_export.h', - 'background_animator.cc', - 'background_animator.h', - 'container_finder.cc', - 'container_finder.h', - 'default_state.cc', - 'default_state.h', - 'default_window_resizer.cc', - 'default_window_resizer.h', - 'dock/docked_window_layout_manager.cc', - 'dock/docked_window_layout_manager.h', - 'dock/docked_window_layout_manager_observer.h', - 'dock/docked_window_resizer.cc', - 'dock/docked_window_resizer.h', - 'drag_details.cc', - 'drag_details.h', - 'fullscreen_window_finder.cc', - 'fullscreen_window_finder.h', - 'panels/panel_layout_manager.cc', - 'panels/panel_layout_manager.h', - 'panels/panel_window_resizer.cc', - 'panels/panel_window_resizer.h', - 'root_window_finder.cc', - 'root_window_finder.h', - 'shelf/wm_shelf.h', - 'shelf/wm_shelf_constants.cc', - 'shelf/wm_shelf_constants.h', - 'shelf/wm_shelf_observer.h', - 'shelf/wm_shelf_types.h', - 'shelf/wm_shelf_util.cc', - 'shelf/wm_shelf_util.h', - 'switchable_windows.cc', - 'switchable_windows.h', - 'window_animation_types.h', - 'window_parenting_utils.cc', - 'window_parenting_utils.h', - 'window_positioner.cc', - 'window_positioner.h', - 'window_positioning_utils.cc', - 'window_positioning_utils.h', - 'window_resizer.cc', - 'window_resizer.h', - 'window_state.cc', - 'window_state.h', - 'window_state_delegate.cc', - 'window_state_delegate.h', - 'window_state_observer.h', - 'window_state_util.cc', - 'window_state_util.h', - 'wm_activation_observer.h', - 'wm_display_observer.h', - 'wm_event.cc', - 'wm_event.h', - 'wm_globals.cc', - 'wm_globals.h', - 'wm_layout_manager.h', - 'wm_lookup.cc', - 'wm_lookup.h', - 'wm_overview_mode_observer.h', - 'wm_root_window_controller.h', - 'wm_root_window_controller_observer.h', - 'wm_screen_util.cc', - 'wm_screen_util.h', - 'wm_snap_to_pixel_layout_manager.cc', - 'wm_snap_to_pixel_layout_manager.h', - 'wm_toplevel_window_event_handler.cc', - 'wm_toplevel_window_event_handler.h', - 'wm_types.cc', - 'wm_types.h', - 'wm_user_metrics_action.h', - 'wm_window.h', - 'wm_window_observer.h', - 'wm_window_property.h', - 'wm_window_tracker.h', - 'workspace/magnetism_matcher.cc', - 'workspace/magnetism_matcher.h', - 'workspace/multi_window_resize_controller.cc', - 'workspace/multi_window_resize_controller.h', - 'workspace/phantom_window_controller.cc', - 'workspace/phantom_window_controller.h', - 'workspace/two_step_edge_cycler.cc', - 'workspace/two_step_edge_cycler.h', - 'workspace/workspace_layout_manager.cc', - 'workspace/workspace_layout_manager.h', - 'workspace/workspace_layout_manager_backdrop_delegate.h', - 'workspace/workspace_layout_manager_delegate.h', - 'workspace/workspace_types.h', - 'workspace/workspace_window_resizer.cc', - 'workspace/workspace_window_resizer.h', - ], - 'conditions': [ - ['OS=="win"', { - # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. - 'msvs_disabled_warnings': [ 4267, ], - }], - ], - }, - ], -} diff --git a/ash/wm/dock/docked_window_layout_manager_unittest.cc b/ash/wm/dock/docked_window_layout_manager_unittest.cc index 806c9ff73afd9d..091b1db9649c91 100644 --- a/ash/wm/dock/docked_window_layout_manager_unittest.cc +++ b/ash/wm/dock/docked_window_layout_manager_unittest.cc @@ -2,9 +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/common/dock/docked_window_layout_manager.h" +#include "ash/common/wm/dock/docked_window_layout_manager.h" #include "ash/ash_switches.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/display/display_manager.h" #include "ash/root_window_controller.h" #include "ash/shelf/shelf.h" @@ -21,9 +24,6 @@ #include "ash/test/shell_test_api.h" #include "ash/test/test_shelf_delegate.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/panels/panel_layout_manager.h" -#include "ash/wm/common/window_resizer.h" -#include "ash/wm/common/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 4d6e34a8713f53..4c9b79c514e505 100644 --- a/ash/wm/dock/docked_window_resizer_unittest.cc +++ b/ash/wm/dock/docked_window_resizer_unittest.cc @@ -2,9 +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/common/dock/docked_window_resizer.h" +#include "ash/common/wm/dock/docked_window_resizer.h" #include "ash/ash_switches.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/display/window_tree_host_manager.h" #include "ash/root_window_controller.h" #include "ash/screen_util.h" @@ -20,10 +24,6 @@ #include "ash/test/shell_test_api.h" #include "ash/test/test_shelf_delegate.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/dock/docked_window_layout_manager.h" -#include "ash/wm/common/panels/panel_layout_manager.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_event.h" #include "ash/wm/drag_window_resizer.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" diff --git a/ash/wm/drag_window_resizer.cc b/ash/wm/drag_window_resizer.cc index 6b713081e2c63d..2dddf0a40320d7 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/display/mouse_cursor_event_filter.h" #include "ash/screen_util.h" #include "ash/shell.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/window_positioning_utils.h" -#include "ash/wm/common/window_state.h" #include "ash/wm/drag_window_controller.h" #include "ash/wm/window_util.h" #include "base/memory/weak_ptr.h" diff --git a/ash/wm/drag_window_resizer.h b/ash/wm/drag_window_resizer.h index ae12234df993d5..ab49be7deec1ff 100644 --- a/ash/wm/drag_window_resizer.h +++ b/ash/wm/drag_window_resizer.h @@ -8,7 +8,7 @@ #include #include "ash/ash_export.h" -#include "ash/wm/common/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 9c2adccd11b4c3..680ab6b1bcb24f 100644 --- a/ash/wm/drag_window_resizer_unittest.cc +++ b/ash/wm/drag_window_resizer_unittest.cc @@ -4,6 +4,7 @@ #include "ash/wm/drag_window_resizer.h" +#include "ash/common/wm/window_positioning_utils.h" #include "ash/display/display_manager.h" #include "ash/display/mouse_cursor_event_filter.h" #include "ash/root_window_controller.h" @@ -14,7 +15,6 @@ #include "ash/test/cursor_manager_test_api.h" #include "ash/test/display_manager_test_api.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/window_positioning_utils.h" #include "ash/wm/drag_window_controller.h" #include "ash/wm/window_util.h" #include "base/strings/string_number_conversions.h" diff --git a/ash/wm/gestures/shelf_gesture_handler.cc b/ash/wm/gestures/shelf_gesture_handler.cc index 85e5117cd6316e..7c5cf72c733078 100644 --- a/ash/wm/gestures/shelf_gesture_handler.cc +++ b/ash/wm/gestures/shelf_gesture_handler.cc @@ -4,6 +4,7 @@ #include "ash/wm/gestures/shelf_gesture_handler.h" +#include "ash/common/wm/window_state.h" #include "ash/root_window_controller.h" #include "ash/session/session_state_delegate.h" #include "ash/shelf/shelf_layout_manager.h" @@ -11,7 +12,6 @@ #include "ash/shelf/shelf_widget.h" #include "ash/shell.h" #include "ash/system/status_area_widget.h" -#include "ash/wm/common/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/wm/immersive_fullscreen_controller.cc b/ash/wm/immersive_fullscreen_controller.cc index d9ea0b7a2e7f41..1a12797757bc1d 100644 --- a/ash/wm/immersive_fullscreen_controller.cc +++ b/ash/wm/immersive_fullscreen_controller.cc @@ -7,8 +7,8 @@ #include #include "ash/ash_constants.h" +#include "ash/common/wm/window_state.h" #include "ash/shell.h" -#include "ash/wm/common/window_state.h" #include "ash/wm/resize_handle_window_targeter.h" #include "ash/wm/window_state_aura.h" #include "base/metrics/histogram.h" diff --git a/ash/wm/immersive_fullscreen_controller_unittest.cc b/ash/wm/immersive_fullscreen_controller_unittest.cc index 18b07f7b6e1b5a..b9262ac1bb6571 100644 --- a/ash/wm/immersive_fullscreen_controller_unittest.cc +++ b/ash/wm/immersive_fullscreen_controller_unittest.cc @@ -4,6 +4,7 @@ #include "ash/wm/immersive_fullscreen_controller.h" +#include "ash/common/wm/window_state.h" #include "ash/display/display_manager.h" #include "ash/display/mouse_cursor_event_filter.h" #include "ash/root_window_controller.h" @@ -12,7 +13,6 @@ #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/test/display_manager_test_api.h" -#include "ash/wm/common/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.cc b/ash/wm/lock_layout_manager.cc index 520ed817d1fa44..aff6806a1d6e8c 100644 --- a/ash/wm/lock_layout_manager.cc +++ b/ash/wm/lock_layout_manager.cc @@ -4,10 +4,10 @@ #include "ash/wm/lock_layout_manager.h" +#include "ash/common/wm/window_state.h" +#include "ash/common/wm/wm_event.h" #include "ash/shell.h" #include "ash/shell_delegate.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_event.h" #include "ash/wm/lock_window_state.h" #include "ash/wm/window_state_aura.h" #include "ui/aura/window.h" diff --git a/ash/wm/lock_layout_manager.h b/ash/wm/lock_layout_manager.h index bbc6f3797aa11f..ff579890dc3234 100644 --- a/ash/wm/lock_layout_manager.h +++ b/ash/wm/lock_layout_manager.h @@ -6,9 +6,9 @@ #define ASH_WM_LOCK_LAYOUT_MANAGER_H_ #include "ash/ash_export.h" +#include "ash/common/wm/wm_types.h" #include "ash/shell_delegate.h" #include "ash/snap_to_pixel_layout_manager.h" -#include "ash/wm/common/wm_types.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "ui/aura/layout_manager.h" diff --git a/ash/wm/lock_layout_manager_unittest.cc b/ash/wm/lock_layout_manager_unittest.cc index beffbd81f41caa..721912ea2d7973 100644 --- a/ash/wm/lock_layout_manager_unittest.cc +++ b/ash/wm/lock_layout_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/wm/window_state.h" #include "ash/display/display_manager.h" #include "ash/root_window_controller.h" #include "ash/screen_util.h" #include "ash/shell.h" #include "ash/shell_window_ids.h" #include "ash/test/ash_test_base.h" -#include "ash/wm/common/window_state.h" #include "ash/wm/window_state_aura.h" #include "base/command_line.h" #include "ui/aura/client/aura_constants.h" diff --git a/ash/wm/lock_window_state.cc b/ash/wm/lock_window_state.cc index 266d231d9ceef9..e4973e0034daf7 100644 --- a/ash/wm/lock_window_state.cc +++ b/ash/wm/lock_window_state.cc @@ -6,15 +6,15 @@ #include +#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/display/display_manager.h" #include "ash/screen_util.h" #include "ash/shell.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/window_animation_types.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/window_state_delegate.h" -#include "ash/wm/common/window_state_util.h" -#include "ash/wm/common/wm_event.h" #include "ash/wm/lock_layout_manager.h" #include "ash/wm/window_animations.h" #include "ash/wm/window_state_aura.h" diff --git a/ash/wm/lock_window_state.h b/ash/wm/lock_window_state.h index 00df2a92e1ca7a..d6349f4e4bb451 100644 --- a/ash/wm/lock_window_state.h +++ b/ash/wm/lock_window_state.h @@ -5,7 +5,7 @@ #ifndef ASH_WM_LOCK_WINDOW_STATE_H_ #define ASH_WM_LOCK_WINDOW_STATE_H_ -#include "ash/wm/common/window_state.h" +#include "ash/common/wm/window_state.h" #include "base/macros.h" namespace ash { diff --git a/ash/wm/maximize_mode/maximize_mode_window_manager.cc b/ash/wm/maximize_mode/maximize_mode_window_manager.cc index eede8b9c1b2c91..d1754613400eb2 100644 --- a/ash/wm/maximize_mode/maximize_mode_window_manager.cc +++ b/ash/wm/maximize_mode/maximize_mode_window_manager.cc @@ -5,12 +5,12 @@ #include "ash/wm/maximize_mode/maximize_mode_window_manager.h" #include "ash/ash_switches.h" +#include "ash/common/wm/window_state.h" +#include "ash/common/wm/wm_event.h" #include "ash/root_window_controller.h" #include "ash/session/session_state_delegate.h" #include "ash/shell.h" #include "ash/shell_window_ids.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_event.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" diff --git a/ash/wm/maximize_mode/maximize_mode_window_manager.h b/ash/wm/maximize_mode/maximize_mode_window_manager.h index 77bef7b528b401..25c138968ac998 100644 --- a/ash/wm/maximize_mode/maximize_mode_window_manager.h +++ b/ash/wm/maximize_mode/maximize_mode_window_manager.h @@ -11,8 +11,8 @@ #include #include "ash/ash_export.h" +#include "ash/common/wm/window_state.h" #include "ash/shell_observer.h" -#include "ash/wm/common/window_state.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "ui/aura/window_observer.h" 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 8564086eddc92f..af5cc98fa3bf80 100644 --- a/ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc +++ b/ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc @@ -6,15 +6,15 @@ #include +#include "ash/common/wm/switchable_windows.h" +#include "ash/common/wm/window_state.h" +#include "ash/common/wm/wm_event.h" #include "ash/root_window_controller.h" #include "ash/screen_util.h" #include "ash/shelf/shelf_layout_manager.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/test/shell_test_api.h" -#include "ash/wm/common/switchable_windows.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_event.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" diff --git a/ash/wm/maximize_mode/maximize_mode_window_state.cc b/ash/wm/maximize_mode/maximize_mode_window_state.cc index 23b928a911ad60..006ea886266612 100644 --- a/ash/wm/maximize_mode/maximize_mode_window_state.cc +++ b/ash/wm/maximize_mode/maximize_mode_window_state.cc @@ -6,16 +6,16 @@ #include +#include "ash/common/wm/window_animation_types.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/workspace/workspace_window_resizer.h" #include "ash/screen_util.h" #include "ash/shell.h" #include "ash/shell_window_ids.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/window_animation_types.h" -#include "ash/wm/common/window_state_delegate.h" -#include "ash/wm/common/window_state_util.h" -#include "ash/wm/common/wm_event.h" -#include "ash/wm/common/wm_screen_util.h" -#include "ash/wm/common/workspace/workspace_window_resizer.h" #include "ash/wm/maximize_mode/maximize_mode_window_manager.h" #include "ash/wm/window_animations.h" #include "ash/wm/window_properties.h" diff --git a/ash/wm/maximize_mode/maximize_mode_window_state.h b/ash/wm/maximize_mode/maximize_mode_window_state.h index fe13c363561993..fd7f95fafb7b20 100644 --- a/ash/wm/maximize_mode/maximize_mode_window_state.h +++ b/ash/wm/maximize_mode/maximize_mode_window_state.h @@ -7,7 +7,7 @@ #include -#include "ash/wm/common/window_state.h" +#include "ash/common/wm/window_state.h" #include "base/macros.h" namespace ash { diff --git a/ash/wm/maximize_mode/workspace_backdrop_delegate.cc b/ash/wm/maximize_mode/workspace_backdrop_delegate.cc index 9a74ba66823a54..9c018b6179b41c 100644 --- a/ash/wm/maximize_mode/workspace_backdrop_delegate.cc +++ b/ash/wm/maximize_mode/workspace_backdrop_delegate.cc @@ -4,7 +4,7 @@ #include "ash/wm/maximize_mode/workspace_backdrop_delegate.h" -#include "ash/wm/common/workspace/workspace_layout_manager_backdrop_delegate.h" +#include "ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h" #include "ash/wm/window_animations.h" #include "ash/wm/window_util.h" #include "base/auto_reset.h" diff --git a/ash/wm/maximize_mode/workspace_backdrop_delegate.h b/ash/wm/maximize_mode/workspace_backdrop_delegate.h index 51897331c2750d..925a52af4fb98d 100644 --- a/ash/wm/maximize_mode/workspace_backdrop_delegate.h +++ b/ash/wm/maximize_mode/workspace_backdrop_delegate.h @@ -8,7 +8,7 @@ #include #include "ash/ash_export.h" -#include "ash/wm/common/workspace/workspace_layout_manager_backdrop_delegate.h" +#include "ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h" #include "base/compiler_specific.h" #include "base/macros.h" diff --git a/ash/wm/mru_window_tracker.cc b/ash/wm/mru_window_tracker.cc index 5131357df3d09d..e8db5c172510b6 100644 --- a/ash/wm/mru_window_tracker.cc +++ b/ash/wm/mru_window_tracker.cc @@ -6,13 +6,13 @@ #include +#include "ash/common/wm/switchable_windows.h" +#include "ash/common/wm/window_state.h" #include "ash/session/session_state_delegate.h" #include "ash/shell.h" #include "ash/shell_window_ids.h" #include "ash/wm/ash_focus_rules.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/switchable_windows.h" -#include "ash/wm/common/window_state.h" #include "ash/wm/window_util.h" #include "ash/wm/workspace_controller.h" #include "base/bind.h" diff --git a/ash/wm/mru_window_tracker_unittest.cc b/ash/wm/mru_window_tracker_unittest.cc index 3823b1acf8cbff..da54b3b97e4845 100644 --- a/ash/wm/mru_window_tracker_unittest.cc +++ b/ash/wm/mru_window_tracker_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_state.h" #include "ash/shell.h" #include "ash/shell_window_ids.h" #include "ash/test/ash_test_base.h" #include "ash/test/test_shelf_delegate.h" -#include "ash/wm/common/window_state.h" #include "ash/wm/mru_window_tracker.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" diff --git a/ash/wm/overview/DEPS b/ash/wm/overview/DEPS index 392bbdd5d0fbda..ceb90d2a564ce6 100644 --- a/ash/wm/overview/DEPS +++ b/ash/wm/overview/DEPS @@ -2,8 +2,8 @@ include_rules = [ "-ash", + "+ash/common", "+ash/material_design", - "+ash/wm/common", "+ash/wm/overview", # Aura files should only be included from other aura files. "-ash/wm/overview/scoped_overview_animation_settings_aura.h", diff --git a/ash/wm/overview/scoped_transform_overview_window.cc b/ash/wm/overview/scoped_transform_overview_window.cc index ec787fa5f8c479..e93caec1914e5f 100644 --- a/ash/wm/overview/scoped_transform_overview_window.cc +++ b/ash/wm/overview/scoped_transform_overview_window.cc @@ -7,8 +7,8 @@ #include #include -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_window.h" +#include "ash/common/wm/window_state.h" +#include "ash/common/wm/wm_window.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" diff --git a/ash/wm/overview/window_grid.cc b/ash/wm/overview/window_grid.cc index b04962c14c4ed7..9c4d7b8124fd63 100644 --- a/ash/wm/overview/window_grid.cc +++ b/ash/wm/overview/window_grid.cc @@ -11,12 +11,12 @@ #include #include "ash/ash_switches.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_lookup.h" -#include "ash/wm/common/wm_root_window_controller.h" -#include "ash/wm/common/wm_screen_util.h" -#include "ash/wm/common/wm_shell_window_ids.h" -#include "ash/wm/common/wm_window.h" +#include "ash/common/wm/window_state.h" +#include "ash/common/wm/wm_lookup.h" +#include "ash/common/wm/wm_root_window_controller.h" +#include "ash/common/wm/wm_screen_util.h" +#include "ash/common/wm/wm_shell_window_ids.h" +#include "ash/common/wm/wm_window.h" #include "ash/wm/overview/scoped_transform_overview_window.h" #include "ash/wm/overview/window_selector.h" #include "ash/wm/overview/window_selector_item.h" diff --git a/ash/wm/overview/window_grid.h b/ash/wm/overview/window_grid.h index d5712034356f8b..06b92171915a31 100644 --- a/ash/wm/overview/window_grid.h +++ b/ash/wm/overview/window_grid.h @@ -11,7 +11,7 @@ #include #include -#include "ash/wm/common/wm_window_observer.h" +#include "ash/common/wm/wm_window_observer.h" #include "ash/wm/overview/window_selector.h" #include "base/macros.h" #include "base/memory/scoped_vector.h" diff --git a/ash/wm/overview/window_selector.cc b/ash/wm/overview/window_selector.cc index 05521c6c7aeb3b..615482da4c313f 100644 --- a/ash/wm/overview/window_selector.cc +++ b/ash/wm/overview/window_selector.cc @@ -12,17 +12,17 @@ #include "ash/accessibility_delegate.h" #include "ash/ash_switches.h" +#include "ash/common/wm/panels/panel_layout_manager.h" +#include "ash/common/wm/shelf/wm_shelf.h" +#include "ash/common/wm/switchable_windows.h" +#include "ash/common/wm/window_state.h" +#include "ash/common/wm/wm_globals.h" +#include "ash/common/wm/wm_lookup.h" +#include "ash/common/wm/wm_root_window_controller.h" +#include "ash/common/wm/wm_shell_window_ids.h" +#include "ash/common/wm/wm_user_metrics_action.h" +#include "ash/common/wm/wm_window.h" #include "ash/shell.h" -#include "ash/wm/common/panels/panel_layout_manager.h" -#include "ash/wm/common/shelf/wm_shelf.h" -#include "ash/wm/common/switchable_windows.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_globals.h" -#include "ash/wm/common/wm_lookup.h" -#include "ash/wm/common/wm_root_window_controller.h" -#include "ash/wm/common/wm_shell_window_ids.h" -#include "ash/wm/common/wm_user_metrics_action.h" -#include "ash/wm/common/wm_window.h" #include "ash/wm/overview/window_grid.h" #include "ash/wm/overview/window_selector_delegate.h" #include "ash/wm/overview/window_selector_item.h" diff --git a/ash/wm/overview/window_selector.h b/ash/wm/overview/window_selector.h index e31422eaca3f2f..ff2409f18906da 100644 --- a/ash/wm/overview/window_selector.h +++ b/ash/wm/overview/window_selector.h @@ -13,8 +13,8 @@ #include #include "ash/ash_export.h" -#include "ash/wm/common/wm_activation_observer.h" -#include "ash/wm/common/wm_window_observer.h" +#include "ash/common/wm/wm_activation_observer.h" +#include "ash/common/wm/wm_window_observer.h" #include "base/macros.h" #include "base/time/time.h" #include "ui/display/display_observer.h" diff --git a/ash/wm/overview/window_selector_controller.cc b/ash/wm/overview/window_selector_controller.cc index 06ef4cf9ae92a7..6ce075d3d6729c 100644 --- a/ash/wm/overview/window_selector_controller.cc +++ b/ash/wm/overview/window_selector_controller.cc @@ -6,12 +6,12 @@ #include +#include "ash/common/wm/window_state.h" +#include "ash/common/wm/wm_globals.h" +#include "ash/common/wm/wm_window.h" #include "ash/session/session_state_delegate.h" #include "ash/shell.h" #include "ash/system/tray/system_tray_delegate.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_globals.h" -#include "ash/wm/common/wm_window.h" #include "ash/wm/overview/window_selector.h" #include "base/metrics/histogram.h" diff --git a/ash/wm/overview/window_selector_item.cc b/ash/wm/overview/window_selector_item.cc index e7dc2599a5c3f9..33157463e0c919 100644 --- a/ash/wm/overview/window_selector_item.cc +++ b/ash/wm/overview/window_selector_item.cc @@ -7,14 +7,14 @@ #include #include +#include "ash/common/wm/window_state.h" +#include "ash/common/wm/wm_lookup.h" +#include "ash/common/wm/wm_root_window_controller.h" +#include "ash/common/wm/wm_shell_window_ids.h" +#include "ash/common/wm/wm_shell_window_ids.h" +#include "ash/common/wm/wm_window.h" +#include "ash/common/wm/wm_window_property.h" #include "ash/material_design/material_design_controller.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_lookup.h" -#include "ash/wm/common/wm_root_window_controller.h" -#include "ash/wm/common/wm_shell_window_ids.h" -#include "ash/wm/common/wm_shell_window_ids.h" -#include "ash/wm/common/wm_window.h" -#include "ash/wm/common/wm_window_property.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" diff --git a/ash/wm/overview/window_selector_item.h b/ash/wm/overview/window_selector_item.h index 7b69ca817905b6..e4ebcc75e01943 100644 --- a/ash/wm/overview/window_selector_item.h +++ b/ash/wm/overview/window_selector_item.h @@ -8,7 +8,7 @@ #include #include "ash/ash_export.h" -#include "ash/wm/common/wm_window_observer.h" +#include "ash/common/wm/wm_window_observer.h" #include "ash/wm/overview/scoped_transform_overview_window.h" #include "base/macros.h" #include "ui/gfx/geometry/rect.h" diff --git a/ash/wm/overview/window_selector_unittest.cc b/ash/wm/overview/window_selector_unittest.cc index 35b6370e6d1c02..4c55b02d190c63 100644 --- a/ash/wm/overview/window_selector_unittest.cc +++ b/ash/wm/overview/window_selector_unittest.cc @@ -7,6 +7,9 @@ #include "ash/accessibility_delegate.h" #include "ash/ash_switches.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/drag_drop/drag_drop_controller.h" #include "ash/root_window_controller.h" #include "ash/screen_util.h" @@ -21,9 +24,6 @@ #include "ash/test/shell_test_api.h" #include "ash/test/test_shelf_delegate.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/panels/panel_layout_manager.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_event.h" #include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "ash/wm/mru_window_tracker.h" #include "ash/wm/overview/window_grid.h" diff --git a/ash/wm/panels/attached_panel_window_targeter.cc b/ash/wm/panels/attached_panel_window_targeter.cc index db00849cfb7c53..10ab359aa43dd0 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/wm/panels/panel_layout_manager.h" #include "ash/shelf/shelf.h" #include "ash/shell.h" #include "ash/wm/aura/wm_shelf_aura.h" -#include "ash/wm/common/panels/panel_layout_manager.h" namespace ash { diff --git a/ash/wm/panels/panel_layout_manager_unittest.cc b/ash/wm/panels/panel_layout_manager_unittest.cc index 826d697387a114..ccdb8bcb855650 100644 --- a/ash/wm/panels/panel_layout_manager_unittest.cc +++ b/ash/wm/panels/panel_layout_manager_unittest.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/wm/common/panels/panel_layout_manager.h" +#include "ash/common/wm/panels/panel_layout_manager.h" #include "ash/ash_switches.h" +#include "ash/common/wm/window_state.h" #include "ash/screen_util.h" #include "ash/shelf/shelf.h" #include "ash/shelf/shelf_button.h" @@ -22,7 +23,6 @@ #include "ash/test/shell_test_api.h" #include "ash/test/test_shelf_delegate.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/window_state.h" #include "ash/wm/mru_window_tracker.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" diff --git a/ash/wm/panels/panel_window_event_handler.cc b/ash/wm/panels/panel_window_event_handler.cc index 026b334348e27b..6dfab047cd23db 100644 --- a/ash/wm/panels/panel_window_event_handler.cc +++ b/ash/wm/panels/panel_window_event_handler.cc @@ -4,9 +4,9 @@ #include "ash/wm/panels/panel_window_event_handler.h" +#include "ash/common/wm/window_state.h" #include "ash/metrics/user_metrics_recorder.h" #include "ash/shell.h" -#include "ash/wm/common/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 1329dd73eb4cb7..cb02a79885b1ab 100644 --- a/ash/wm/panels/panel_window_resizer_unittest.cc +++ b/ash/wm/panels/panel_window_resizer_unittest.cc @@ -2,8 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/wm/common/panels/panel_window_resizer.h" +#include "ash/common/wm/panels/panel_window_resizer.h" +#include "ash/common/wm/window_state.h" +#include "ash/common/wm/wm_event.h" #include "ash/root_window_controller.h" #include "ash/shelf/shelf.h" #include "ash/shelf/shelf_layout_manager.h" @@ -18,8 +20,6 @@ #include "ash/test/shell_test_api.h" #include "ash/test/test_shelf_delegate.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_event.h" #include "ash/wm/drag_window_resizer.h" #include "ash/wm/window_state_aura.h" #include "base/i18n/rtl.h" diff --git a/ash/wm/resize_handle_window_targeter.cc b/ash/wm/resize_handle_window_targeter.cc index acb8244e7d1bc6..628b0605533188 100644 --- a/ash/wm/resize_handle_window_targeter.cc +++ b/ash/wm/resize_handle_window_targeter.cc @@ -5,7 +5,7 @@ #include "ash/wm/resize_handle_window_targeter.h" #include "ash/ash_constants.h" -#include "ash/wm/common/window_state.h" +#include "ash/common/wm/window_state.h" #include "ash/wm/immersive_fullscreen_controller.h" #include "ash/wm/window_state_aura.h" #include "ui/aura/window.h" diff --git a/ash/wm/resize_handle_window_targeter.h b/ash/wm/resize_handle_window_targeter.h index 2ddcd9b87702fb..33478c379e60e3 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/common/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 62a2419af10d23..69cc7733405d6b 100644 --- a/ash/wm/resize_shadow_and_cursor_unittest.cc +++ b/ash/wm/resize_shadow_and_cursor_unittest.cc @@ -3,11 +3,11 @@ // found in the LICENSE file. #include "ash/ash_constants.h" +#include "ash/common/wm/window_state.h" #include "ash/frame/custom_frame_view_ash.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/test/cursor_manager_test_api.h" -#include "ash/wm/common/window_state.h" #include "ash/wm/resize_shadow.h" #include "ash/wm/resize_shadow_controller.h" #include "ash/wm/window_state_aura.h" diff --git a/ash/wm/stacking_controller.cc b/ash/wm/stacking_controller.cc index d4ff9fd56ec04e..45d7af894da5ec 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/wm/aura/wm_window_aura.h" -#include "ash/wm/common/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 64972d125e1d7a..b0c3089884b1e6 100644 --- a/ash/wm/system_gesture_event_filter_unittest.cc +++ b/ash/wm/system_gesture_event_filter_unittest.cc @@ -7,6 +7,8 @@ #include #include "ash/accelerators/accelerator_controller.h" +#include "ash/common/wm/window_positioning_utils.h" +#include "ash/common/wm/window_state.h" #include "ash/display/display_manager.h" #include "ash/shelf/shelf.h" #include "ash/shelf/shelf_model.h" @@ -17,8 +19,6 @@ #include "ash/test/shell_test_api.h" #include "ash/test/test_shelf_delegate.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/window_positioning_utils.h" -#include "ash/wm/common/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/toplevel_window_event_handler.h b/ash/wm/toplevel_window_event_handler.h index 751f1518673292..4a46efdcde026b 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/common/wm_toplevel_window_event_handler.h" -#include "ash/wm/common/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 b414d6bc564240..5e2b151678dd6d 100644 --- a/ash/wm/toplevel_window_event_handler_unittest.cc +++ b/ash/wm/toplevel_window_event_handler_unittest.cc @@ -4,11 +4,11 @@ #include "ash/wm/toplevel_window_event_handler.h" +#include "ash/common/wm/window_state.h" #include "ash/root_window_controller.h" #include "ash/shell.h" #include "ash/shell_window_ids.h" #include "ash/test/ash_test_base.h" -#include "ash/wm/common/window_state.h" #include "ash/wm/resize_shadow.h" #include "ash/wm/resize_shadow_controller.h" #include "ash/wm/window_state_aura.h" diff --git a/ash/wm/video_detector.cc b/ash/wm/video_detector.cc index 2617f2ab36a382..e6d696f9cef228 100644 --- a/ash/wm/video_detector.cc +++ b/ash/wm/video_detector.cc @@ -4,9 +4,9 @@ #include "ash/wm/video_detector.h" +#include "ash/common/wm/window_state.h" #include "ash/shell.h" #include "ash/shell_window_ids.h" -#include "ash/wm/common/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 b4523aa4871274..ca9539c2398be0 100644 --- a/ash/wm/video_detector_unittest.cc +++ b/ash/wm/video_detector_unittest.cc @@ -6,10 +6,10 @@ #include +#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/common/window_state.h" -#include "ash/wm/common/wm_event.h" #include "ash/wm/window_state_aura.h" #include "base/compiler_specific.h" #include "base/time/time.h" diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc index 3ae02c87e69dd9..e635553b753fd2 100644 --- a/ash/wm/window_animations.cc +++ b/ash/wm/window_animations.cc @@ -9,11 +9,11 @@ #include #include +#include "ash/common/wm/window_animation_types.h" #include "ash/screen_util.h" #include "ash/shelf/shelf.h" #include "ash/shelf/shelf_layout_manager.h" #include "ash/shelf/shelf_widget.h" -#include "ash/wm/common/window_animation_types.h" #include "ash/wm/window_util.h" #include "ash/wm/workspace_controller.h" #include "base/command_line.h" diff --git a/ash/wm/window_animations_unittest.cc b/ash/wm/window_animations_unittest.cc index 5ec509a5a4f473..6934f67e7e9d02 100644 --- a/ash/wm/window_animations_unittest.cc +++ b/ash/wm/window_animations_unittest.cc @@ -4,10 +4,10 @@ #include "ash/wm/window_animations.h" +#include "ash/common/wm/window_animation_types.h" +#include "ash/common/wm/window_state.h" #include "ash/shell_window_ids.h" #include "ash/test/ash_test_base.h" -#include "ash/wm/common/window_animation_types.h" -#include "ash/wm/common/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/workspace_controller.h" #include "base/time/time.h" diff --git a/ash/wm/window_cycle_controller_unittest.cc b/ash/wm/window_cycle_controller_unittest.cc index a5512e892533d0..0cc940192cc86d 100644 --- a/ash/wm/window_cycle_controller_unittest.cc +++ b/ash/wm/window_cycle_controller_unittest.cc @@ -7,6 +7,7 @@ #include #include +#include "ash/common/wm/window_state.h" #include "ash/session/session_state_delegate.h" #include "ash/shelf/shelf.h" #include "ash/shelf/shelf_widget.h" @@ -17,7 +18,6 @@ #include "ash/test/shelf_view_test_api.h" #include "ash/test/test_shelf_delegate.h" #include "ash/test/test_shell_delegate.h" -#include "ash/wm/common/window_state.h" #include "ash/wm/window_cycle_list.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" diff --git a/ash/wm/window_cycle_list.cc b/ash/wm/window_cycle_list.cc index 6b10c449f8a50f..62444c85bf409f 100644 --- a/ash/wm/window_cycle_list.cc +++ b/ash/wm/window_cycle_list.cc @@ -4,8 +4,8 @@ #include "ash/wm/window_cycle_list.h" +#include "ash/common/wm/window_state.h" #include "ash/shell.h" -#include "ash/wm/common/window_state.h" #include "ash/wm/mru_window_tracker.h" #include "ash/wm/window_animations.h" #include "ash/wm/window_state_aura.h" diff --git a/ash/wm/window_positioner_unittest.cc b/ash/wm/window_positioner_unittest.cc index 02e9f6a1b46a46..12c7705d008ee8 100644 --- a/ash/wm/window_positioner_unittest.cc +++ b/ash/wm/window_positioner_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/common/window_positioner.h" +#include "ash/common/wm/window_positioner.h" #include +#include "ash/common/wm/window_positioner.h" +#include "ash/common/wm/window_state.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/common/window_positioner.h" -#include "ash/wm/common/window_state.h" #include "ash/wm/window_state_aura.h" #include "base/strings/string_number_conversions.h" #include "ui/aura/window_event_dispatcher.h" diff --git a/ash/wm/window_properties.cc b/ash/wm/window_properties.cc index f62734be9573b1..6d381a35aed7df 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/common/window_state.h" +#include "ash/common/wm/window_state.h" #include "ui/aura/window_property.h" DECLARE_WINDOW_PROPERTY_TYPE(ash::wm::WindowState*); diff --git a/ash/wm/window_state_aura.cc b/ash/wm/window_state_aura.cc index 2dfeb49a08017e..6c0e0bbc90b54e 100644 --- a/ash/wm/window_state_aura.cc +++ b/ash/wm/window_state_aura.cc @@ -4,8 +4,8 @@ #include "ash/wm/window_state_aura.h" +#include "ash/common/wm/window_state.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/window_state.h" #include "ash/wm/window_properties.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 35c79a6d7e7d66..21b2431bb94405 100644 --- a/ash/wm/window_state_unittest.cc +++ b/ash/wm/window_state_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/common/window_state.h" +#include "ash/common/wm/window_state.h" #include +#include "ash/common/wm/window_state.h" +#include "ash/common/wm/wm_event.h" #include "ash/screen_util.h" #include "ash/test/ash_test_base.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_event.h" #include "ash/wm/window_state_aura.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 d43b401cc7cc39..daf6f6d4a8f04e 100644 --- a/ash/wm/window_util.cc +++ b/ash/wm/window_util.cc @@ -7,14 +7,14 @@ #include #include "ash/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/wm_window.h" #include "ash/screen_util.h" #include "ash/shell.h" #include "ash/snap_to_pixel_layout_manager.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_event.h" -#include "ash/wm/common/wm_screen_util.h" -#include "ash/wm/common/wm_window.h" #include "ash/wm/window_properties.h" #include "ash/wm/window_state_aura.h" #include "ui/aura/client/aura_constants.h" diff --git a/ash/wm/window_util_unittest.cc b/ash/wm/window_util_unittest.cc index daf56edd8e40c6..66fa9623536510 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/screen_util.h" #include "ash/test/ash_test_base.h" -#include "ash/wm/common/window_positioning_utils.h" -#include "ash/wm/common/window_state.h" #include "ash/wm/window_state_aura.h" #include "ui/aura/window.h" diff --git a/ash/wm/workspace/magnetism_matcher_unittest.cc b/ash/wm/workspace/magnetism_matcher_unittest.cc index 815bc336e5750b..44ec4f1ad54c4a 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/common/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 85110c98e34ad0..10277445b85952 100644 --- a/ash/wm/workspace/multi_window_resize_controller_unittest.cc +++ b/ash/wm/workspace/multi_window_resize_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/common/workspace/multi_window_resize_controller.h" +#include "ash/common/wm/workspace/multi_window_resize_controller.h" #include "ash/ash_constants.h" #include "ash/frame/custom_frame_view_ash.h" diff --git a/ash/wm/workspace/workspace_event_handler.cc b/ash/wm/workspace/workspace_event_handler.cc index 4b42d278fef989..420cb505596087 100644 --- a/ash/wm/workspace/workspace_event_handler.cc +++ b/ash/wm/workspace/workspace_event_handler.cc @@ -4,13 +4,13 @@ #include "ash/wm/workspace/workspace_event_handler.h" +#include "ash/common/wm/window_state.h" +#include "ash/common/wm/wm_event.h" +#include "ash/common/wm/wm_window.h" #include "ash/metrics/user_metrics_recorder.h" #include "ash/shell.h" #include "ash/touch/touch_uma.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_event.h" -#include "ash/wm/common/wm_window.h" #include "ash/wm/window_state_aura.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" diff --git a/ash/wm/workspace/workspace_event_handler.h b/ash/wm/workspace/workspace_event_handler.h index a83fd22cc4f041..ea8d78a989ded7 100644 --- a/ash/wm/workspace/workspace_event_handler.h +++ b/ash/wm/workspace/workspace_event_handler.h @@ -5,7 +5,7 @@ #ifndef ASH_WM_WORKSPACE_WORKSPACE_EVENT_HANDLER_H_ #define ASH_WM_WORKSPACE_WORKSPACE_EVENT_HANDLER_H_ -#include "ash/wm/common/workspace/multi_window_resize_controller.h" +#include "ash/common/wm/workspace/multi_window_resize_controller.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 eb767b71c013c5..ab39217bbde605 100644 --- a/ash/wm/workspace/workspace_event_handler_unittest.cc +++ b/ash/wm/workspace/workspace_event_handler_unittest.cc @@ -4,11 +4,11 @@ #include "ash/wm/workspace/workspace_event_handler.h" +#include "ash/common/wm/window_state.h" +#include "ash/common/wm/wm_event.h" #include "ash/screen_util.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_event.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "ash/wm/workspace_controller.h" diff --git a/ash/wm/workspace/workspace_layout_manager_unittest.cc b/ash/wm/workspace/workspace_layout_manager_unittest.cc index 89603f0f60295e..bd6af5dec9270e 100644 --- a/ash/wm/workspace/workspace_layout_manager_unittest.cc +++ b/ash/wm/workspace/workspace_layout_manager_unittest.cc @@ -2,11 +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/common/workspace/workspace_layout_manager.h" +#include "ash/common/wm/workspace/workspace_layout_manager.h" #include #include +#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/display/display_manager.h" #include "ash/root_window_controller.h" #include "ash/screen_util.h" @@ -19,9 +22,6 @@ #include "ash/test/ash_test_base.h" #include "ash/test/display_manager_test_api.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_event.h" -#include "ash/wm/common/workspace/workspace_window_resizer.h" #include "ash/wm/maximize_mode/workspace_backdrop_delegate.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" diff --git a/ash/wm/workspace/workspace_window_resizer_unittest.cc b/ash/wm/workspace/workspace_window_resizer_unittest.cc index c758f58f49d5a6..2658f65d8843ea 100644 --- a/ash/wm/workspace/workspace_window_resizer_unittest.cc +++ b/ash/wm/workspace/workspace_window_resizer_unittest.cc @@ -2,8 +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/common/workspace/workspace_window_resizer.h" +#include "ash/common/wm/workspace/workspace_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/workspace/phantom_window_controller.h" #include "ash/display/display_manager.h" #include "ash/root_window_controller.h" #include "ash/screen_util.h" @@ -13,10 +17,6 @@ #include "ash/test/ash_test_base.h" #include "ash/test/display_manager_test_api.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/window_positioning_utils.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_event.h" -#include "ash/wm/common/workspace/phantom_window_controller.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "ash/wm/workspace_controller.h" diff --git a/ash/wm/workspace_controller.cc b/ash/wm/workspace_controller.cc index a1e3e3b087a5a5..d3801fafdfbe8b 100644 --- a/ash/wm/workspace_controller.cc +++ b/ash/wm/workspace_controller.cc @@ -6,15 +6,15 @@ #include +#include "ash/common/wm/window_state.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/workspace/workspace_layout_manager_delegate.h" #include "ash/root_window_controller.h" #include "ash/shelf/shelf_layout_manager.h" #include "ash/shell.h" #include "ash/shell_window_ids.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/workspace/workspace_layout_manager.h" -#include "ash/wm/common/workspace/workspace_layout_manager_backdrop_delegate.h" -#include "ash/wm/common/workspace/workspace_layout_manager_delegate.h" #include "ash/wm/window_animations.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" diff --git a/ash/wm/workspace_controller.h b/ash/wm/workspace_controller.h index 289d4403d92392..ec111a2613ef4c 100644 --- a/ash/wm/workspace_controller.h +++ b/ash/wm/workspace_controller.h @@ -8,7 +8,7 @@ #include #include "ash/ash_export.h" -#include "ash/wm/common/workspace/workspace_types.h" +#include "ash/common/wm/workspace/workspace_types.h" #include "base/macros.h" namespace aura { diff --git a/ash/wm/workspace_controller_unittest.cc b/ash/wm/workspace_controller_unittest.cc index aa81adbdbb64c2..6d1dcae050f42f 100644 --- a/ash/wm/workspace_controller_unittest.cc +++ b/ash/wm/workspace_controller_unittest.cc @@ -6,6 +6,9 @@ #include +#include "ash/common/wm/panels/panel_layout_manager.h" +#include "ash/common/wm/window_state.h" +#include "ash/common/wm/workspace/workspace_window_resizer.h" #include "ash/root_window_controller.h" #include "ash/screen_util.h" #include "ash/shelf/shelf_layout_manager.h" @@ -17,9 +20,6 @@ #include "ash/test/shell_test_api.h" #include "ash/test/test_shelf_delegate.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/panels/panel_layout_manager.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/workspace/workspace_window_resizer.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "base/strings/string_number_conversions.h" diff --git a/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc b/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc index 670ab59f0e1e9e..fbc03aa6772c24 100644 --- a/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc +++ b/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc @@ -4,9 +4,9 @@ #include "chrome/browser/chromeos/background/ash_user_wallpaper_delegate.h" +#include "ash/common/wm/window_animation_types.h" #include "ash/desktop_background/user_wallpaper_delegate.h" #include "ash/shell.h" -#include "ash/wm/common/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/events/event_rewriter.cc b/chrome/browser/chromeos/events/event_rewriter.cc index 0581956315dc91..df91af3a4d3f0e 100644 --- a/chrome/browser/chromeos/events/event_rewriter.cc +++ b/chrome/browser/chromeos/events/event_rewriter.cc @@ -8,8 +8,8 @@ #include +#include "ash/common/wm/window_state.h" #include "ash/sticky_keys/sticky_keys_controller.h" -#include "ash/wm/common/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/events/event_rewriter_unittest.cc b/chrome/browser/chromeos/events/event_rewriter_unittest.cc index ab3c767d366d57..e6ab3224f13795 100644 --- a/chrome/browser/chromeos/events/event_rewriter_unittest.cc +++ b/chrome/browser/chromeos/events/event_rewriter_unittest.cc @@ -6,11 +6,11 @@ #include +#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/common/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 2523b82dd15955..62a1d75d8401b4 100644 --- a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc +++ b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc @@ -11,9 +11,9 @@ #include #include +#include "ash/common/wm/window_state.h" #include "ash/desktop_background/desktop_background_controller.h" #include "ash/shell.h" -#include "ash/wm/common/window_state.h" #include "ash/wm/mru_window_tracker.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc index 7045215ec8e026..d257d036c6cb10 100644 --- a/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc +++ b/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc @@ -6,11 +6,11 @@ #include +#include "ash/common/wm/window_state.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/test/test_session_state_delegate.h" #include "ash/test/test_shell_delegate.h" -#include "ash/wm/common/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/screen_locker.cc b/chrome/browser/chromeos/login/lock/screen_locker.cc index 866c04530c4a2b..def73a8572c005 100644 --- a/chrome/browser/chromeos/login/lock/screen_locker.cc +++ b/chrome/browser/chromeos/login/lock/screen_locker.cc @@ -9,10 +9,10 @@ #include "ash/ash_switches.h" #include "ash/audio/sounds.h" +#include "ash/common/wm/window_state.h" +#include "ash/common/wm/wm_event.h" #include "ash/desktop_background/desktop_background_controller.h" #include "ash/shell.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_event.h" #include "ash/wm/lock_state_controller.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" diff --git a/chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc b/chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc index 62ddbb7933a2e3..453939f4fbc82e 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 -#include "ash/wm/common/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/policy/force_maximize_on_first_run_chromeos_browsertest.cc b/chrome/browser/chromeos/policy/force_maximize_on_first_run_chromeos_browsertest.cc index b843d05fcc9990..6fc2bd930a336a 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,10 +4,10 @@ #include +#include "ash/common/wm/window_positioner.h" #include "ash/display/display_manager.h" #include "ash/shell.h" #include "ash/test/display_manager_test_api.h" -#include "ash/wm/common/window_positioner.h" #include "base/macros.h" #include "base/strings/string_number_conversions.h" #include "base/values.h" diff --git a/chrome/browser/notifications/fullscreen_notification_blocker.cc b/chrome/browser/notifications/fullscreen_notification_blocker.cc index ccf672ae8ff62c..c9831fc8b1a40e 100644 --- a/chrome/browser/notifications/fullscreen_notification_blocker.cc +++ b/chrome/browser/notifications/fullscreen_notification_blocker.cc @@ -10,10 +10,10 @@ #include "content/public/browser/notification_service.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/common/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/ui/ash/accelerator_commands_browsertest.cc b/chrome/browser/ui/ash/accelerator_commands_browsertest.cc index b4a66a9b1e40f1..4702227d3443fe 100644 --- a/chrome/browser/ui/ash/accelerator_commands_browsertest.cc +++ b/chrome/browser/ui/ash/accelerator_commands_browsertest.cc @@ -5,9 +5,9 @@ #include "ash/accelerators/accelerator_commands.h" #include "ash/ash_switches.h" +#include "ash/common/wm/window_state.h" #include "ash/shell.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/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 7c99adcf64088b..7323031f11fe2f 100644 --- a/chrome/browser/ui/ash/accelerator_controller_browsertest.cc +++ b/chrome/browser/ui/ash/accelerator_controller_browsertest.cc @@ -4,8 +4,8 @@ #include "ash/accelerators/accelerator_controller.h" +#include "ash/common/wm/window_state.h" #include "ash/shell.h" -#include "ash/wm/common/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/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc index b9c04854cc60a3..5d523cb8de7d5b 100644 --- a/chrome/browser/ui/ash/chrome_shell_delegate.cc +++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc @@ -9,11 +9,11 @@ #include "ash/accelerators/magnifier_key_scroller.h" #include "ash/accelerators/spoken_feedback_toggler.h" #include "ash/accessibility_delegate.h" +#include "ash/common/wm/window_state.h" #include "ash/container_delegate_aura.h" #include "ash/content/gpu_support_impl.h" #include "ash/pointer_watcher_delegate_aura.h" #include "ash/session/session_state_delegate.h" -#include "ash/wm/common/window_state.h" #include "ash/wm/mru_window_tracker.h" #include "ash/wm/window_util.h" #include "base/command_line.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 39774692a57ef1..562c0a7bf31769 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 @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h" +#include "ash/common/wm/window_state.h" #include "ash/shelf/shelf_util.h" -#include "ash/wm/common/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/chrome_launcher_controller_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc index 3768a6b0431475..7b15862376b967 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc @@ -7,6 +7,7 @@ #include #include "ash/ash_switches.h" +#include "ash/common/wm/window_state.h" #include "ash/shelf/shelf.h" #include "ash/shelf/shelf_button.h" #include "ash/shelf/shelf_constants.h" @@ -17,7 +18,6 @@ #include "ash/test/shelf_test_api.h" #include "ash/test/shelf_view_test_api.h" #include "ash/test/shell_test_api.h" -#include "ash/wm/common/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/extension_app_window_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.cc index dd4983da4f142f..eec6416a8cf616 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/common/window_state.h" +#include "ash/common/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.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 9a21e1dc99fee2..1fc083a0c45dd0 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 @@ -5,6 +5,7 @@ #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h" #include "ash/ash_switches.h" +#include "ash/common/wm/window_state.h" #include "ash/multi_profile_uma.h" #include "ash/root_window_controller.h" #include "ash/session/session_state_delegate.h" @@ -13,7 +14,6 @@ #include "ash/shell_delegate.h" #include "ash/shell_window_ids.h" #include "ash/system/tray/system_tray_notifier.h" -#include "ash/wm/common/window_state.h" #include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "ash/wm/window_state_aura.h" #include "base/auto_reset.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 9c83cb05be2bbf..c7cc11e6197480 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,6 +4,8 @@ #include +#include "ash/common/wm/window_state.h" +#include "ash/common/wm/wm_event.h" #include "ash/content/shell_content_state.h" #include "ash/shelf/shelf.h" #include "ash/shelf/shelf_widget.h" @@ -13,8 +15,6 @@ #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/common/window_state.h" -#include "ash/wm/common/wm_event.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" 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 df45d8b022c08c..ad704ca8bf9fe4 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,13 +4,13 @@ #include "chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.h" +#include "ash/common/wm/window_positioner.h" +#include "ash/common/wm/window_state.h" #include "ash/desktop_background/user_wallpaper_delegate.h" #include "ash/root_window_controller.h" #include "ash/shelf/shelf_layout_manager.h" #include "ash/shelf/shelf_widget.h" #include "ash/shell.h" -#include "ash/wm/common/window_positioner.h" -#include "ash/wm/common/window_state.h" #include "ash/wm/mru_window_tracker.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" diff --git a/chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.cc b/chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.cc index 43ff95a71f1762..c79784e6c2e266 100644 --- a/chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.cc +++ b/chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.cc @@ -4,10 +4,10 @@ #include "chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.h" +#include "ash/common/wm/window_animation_types.h" #include "ash/desktop_background/desktop_background_controller.h" #include "ash/desktop_background/user_wallpaper_delegate.h" #include "ash/shell.h" -#include "ash/wm/common/window_animation_types.h" #include "ash/wm/window_animations.h" #include "base/macros.h" #include "ui/gfx/image/image_skia.h" diff --git a/chrome/browser/ui/ash/window_positioner_unittest.cc b/chrome/browser/ui/ash/window_positioner_unittest.cc index 9e398be9d0e57d..78fd79505bd4d7 100644 --- a/chrome/browser/ui/ash/window_positioner_unittest.cc +++ b/chrome/browser/ui/ash/window_positioner_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/common/window_positioner.h" +#include "ash/common/wm/window_positioner.h" #include +#include "ash/common/wm/window_resizer.h" #include "ash/test/ash_test_base.h" #include "ash/test/test_shell_delegate.h" #include "ash/wm/aura/wm_globals_aura.h" -#include "ash/wm/common/window_resizer.h" #include "base/compiler_specific.h" #include "base/logging.h" #include "base/macros.h" 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 2a69c9d559d472..b7999597150284 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 @@ -6,14 +6,14 @@ #include "apps/ui/views/app_window_frame_view.h" #include "ash/ash_constants.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/frame/custom_frame_view_ash.h" #include "ash/screen_util.h" #include "ash/shell.h" #include "ash/shell_window_ids.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/window_state_delegate.h" -#include "ash/wm/common/window_state_observer.h" #include "ash/wm/immersive_fullscreen_controller.h" #include "ash/wm/panels/panel_frame_view.h" #include "ash/wm/window_properties.h" diff --git a/chrome/browser/ui/views/chrome_views_delegate.cc b/chrome/browser/ui/views/chrome_views_delegate.cc index e0c9f334689b7f..c643e6af723f13 100644 --- a/chrome/browser/ui/views/chrome_views_delegate.cc +++ b/chrome/browser/ui/views/chrome_views_delegate.cc @@ -58,8 +58,8 @@ #if defined(USE_ASH) #include "ash/accelerators/accelerator_controller.h" +#include "ash/common/wm/window_state.h" #include "ash/shell.h" -#include "ash/wm/common/window_state.h" #include "ash/wm/window_state_aura.h" #include "chrome/browser/ui/ash/ash_init.h" #endif diff --git a/chrome/browser/ui/views/frame/browser_frame_ash.cc b/chrome/browser/ui/views/frame/browser_frame_ash.cc index e38d9bd0e70a1b..906da991c61e8e 100644 --- a/chrome/browser/ui/views/frame/browser_frame_ash.cc +++ b/chrome/browser/ui/views/frame/browser_frame_ash.cc @@ -4,9 +4,9 @@ #include "chrome/browser/ui/views/frame/browser_frame_ash.h" +#include "ash/common/wm/window_state.h" +#include "ash/common/wm/window_state_delegate.h" #include "ash/shell.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/window_state_delegate.h" #include "ash/wm/window_properties.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_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 e7cd616d5049fd..8dd65166e65048 100644 --- a/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc +++ b/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc @@ -4,8 +4,8 @@ #include "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h" +#include "ash/common/wm/window_state.h" #include "ash/shell.h" -#include "ash/wm/common/window_state.h" #include "ash/wm/immersive_revealed_lock.h" #include "ash/wm/window_state_aura.h" #include "base/macros.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 545a869b726527..e2dad9a31535cf 100644 --- a/chrome/browser/ui/views/frame/immersive_mode_controller_ash.h +++ b/chrome/browser/ui/views/frame/immersive_mode_controller_ash.h @@ -7,7 +7,7 @@ #include -#include "ash/wm/common/window_state_observer.h" +#include "ash/common/wm/window_state_observer.h" #include "ash/wm/immersive_fullscreen_controller.h" #include "base/macros.h" #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" diff --git a/chrome/browser/ui/views/status_bubble_views.cc b/chrome/browser/ui/views/status_bubble_views.cc index e6386be55808b9..92c437decbe72b 100644 --- a/chrome/browser/ui/views/status_bubble_views.cc +++ b/chrome/browser/ui/views/status_bubble_views.cc @@ -39,7 +39,7 @@ #include "url/gurl.h" #if defined(USE_ASH) -#include "ash/wm/common/window_state.h" +#include "ash/common/wm/window_state.h" #include "ash/wm/window_state_aura.h" #endif diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.cc b/chrome/browser/ui/views/tabs/tab_drag_controller.cc index 2799ba073f59cc..bf110c33a8c652 100644 --- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc +++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc @@ -41,8 +41,8 @@ #if defined(USE_ASH) #include "ash/accelerators/accelerator_commands.h" +#include "ash/common/wm/window_state.h" #include "ash/shell.h" -#include "ash/wm/common/window_state.h" #include "ash/wm/maximize_mode/maximize_mode_controller.h" #include "ash/wm/window_state_aura.h" #include "ui/wm/core/coordinate_conversion.h" 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 bec924f538d655..0ddae0a9957412 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 @@ -55,12 +55,12 @@ #endif #if defined(USE_ASH) +#include "ash/common/wm/root_window_finder.h" +#include "ash/common/wm/window_state.h" #include "ash/display/display_manager.h" #include "ash/shell.h" #include "ash/test/cursor_manager_test_api.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/root_window_finder.h" -#include "ash/wm/common/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 e9d76f4e4ec11b..0abbc91dafe399 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/shell_window_ids.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/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/window_sizer/window_sizer.cc b/chrome/browser/ui/window_sizer/window_sizer.cc index 5180737027c8e7..f8fe0a0a8c3f88 100644 --- a/chrome/browser/ui/window_sizer/window_sizer.cc +++ b/chrome/browser/ui/window_sizer/window_sizer.cc @@ -23,8 +23,8 @@ #include "ui/display/screen.h" #if defined(USE_ASH) +#include "ash/common/wm/window_positioner.h" #include "ash/shell.h" -#include "ash/wm/common/window_positioner.h" #include "chrome/browser/ui/ash/ash_util.h" #endif diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash.cc b/chrome/browser/ui/window_sizer/window_sizer_ash.cc index 7d8dc10dfa0020..6d39dc816ed486 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/shell.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/window_positioner.h" -#include "ash/wm/common/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_unittest.cc b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc index 2c607c570ab400..67d005dfc020bb 100644 --- a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc +++ b/chrome/browser/ui/window_sizer/window_sizer_ash_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/common/wm/window_positioner.h" +#include "ash/common/wm/window_resizer.h" +#include "ash/common/wm/window_state.h" #include "ash/scoped_target_root_window.h" #include "ash/screen_util.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/test/test_shell_delegate.h" -#include "ash/wm/common/window_positioner.h" -#include "ash/wm/common/window_resizer.h" -#include "ash/wm/common/window_state.h" #include "ash/wm/window_state_aura.h" #include "base/compiler_specific.h" #include "base/memory/ptr_util.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 750752a969b417..9a53eb8f00b3e5 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 #include -#include "ash/wm/common/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/components/exo/display.cc b/components/exo/display.cc index cbe710ae9814e0..a5edfb13e55f91 100644 --- a/components/exo/display.cc +++ b/components/exo/display.cc @@ -7,7 +7,7 @@ #include #include -#include "ash/wm/common/wm_shell_window_ids.h" +#include "ash/common/wm/wm_shell_window_ids.h" #include "base/command_line.h" #include "base/memory/ptr_util.h" #include "base/trace_event/trace_event.h" diff --git a/components/exo/display_unittest.cc b/components/exo/display_unittest.cc index fe7376f77b3ae6..7842939803f92a 100644 --- a/components/exo/display_unittest.cc +++ b/components/exo/display_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/common/wm_shell_window_ids.h" +#include "ash/common/wm/wm_shell_window_ids.h" #include "components/exo/buffer.h" #include "components/exo/display.h" #include "components/exo/shared_memory.h" diff --git a/components/exo/pointer_unittest.cc b/components/exo/pointer_unittest.cc index e56856fff1e489..9b244ebbcec88b 100644 --- a/components/exo/pointer_unittest.cc +++ b/components/exo/pointer_unittest.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/wm/wm_shell_window_ids.h" #include "ash/shell.h" -#include "ash/wm/common/wm_shell_window_ids.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 5ab4a84a4c6bce..5bc52c17ad42b7 100644 --- a/components/exo/shell_surface.cc +++ b/components/exo/shell_surface.cc @@ -4,11 +4,11 @@ #include "components/exo/shell_surface.h" +#include "ash/common/wm/window_resizer.h" +#include "ash/common/wm/window_state.h" #include "ash/shell.h" #include "ash/shell_window_ids.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/common/window_resizer.h" -#include "ash/wm/common/window_state.h" #include "ash/wm/window_state_aura.h" #include "base/logging.h" #include "base/macros.h" diff --git a/components/exo/shell_surface.h b/components/exo/shell_surface.h index 8931ee1618fb81..1316c08ada0ad9 100644 --- a/components/exo/shell_surface.h +++ b/components/exo/shell_surface.h @@ -9,7 +9,7 @@ #include #include -#include "ash/wm/common/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" @@ -226,7 +226,7 @@ class ShellSurface : public SurfaceDelegate, const gfx::Rect initial_bounds_; const bool activatable_; const bool resizeable_; - // Container Window Id (see ash/wm/common/wm_shell_window_ids.h) + // Container Window Id (see ash/common/wm/wm_shell_window_ids.h) const int container_; base::string16 title_; std::string application_id_; diff --git a/components/exo/touch_unittest.cc b/components/exo/touch_unittest.cc index a4eb4c0ec09b60..9d6e5f5af0c16b 100644 --- a/components/exo/touch_unittest.cc +++ b/components/exo/touch_unittest.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/wm/window_positioner.h" #include "ash/shell.h" -#include "ash/wm/common/window_positioner.h" #include "ash/wm/window_util.h" #include "components/exo/buffer.h" #include "components/exo/shell_surface.h" diff --git a/components/exo/wayland/server.cc b/components/exo/wayland/server.cc index bca81c9d085219..e483fd36d75c0f 100644 --- a/components/exo/wayland/server.cc +++ b/components/exo/wayland/server.cc @@ -24,11 +24,11 @@ #include #include +#include "ash/common/wm/wm_shell_window_ids.h" #include "ash/display/display_info.h" #include "ash/display/display_manager.h" #include "ash/shell.h" #include "ash/shell_observer.h" -#include "ash/wm/common/wm_shell_window_ids.h" #include "base/bind.h" #include "base/cancelable_callback.h" #include "base/files/file_path.h" diff --git a/mash/wm/DEPS b/mash/wm/DEPS index 41456d7a940816..3c3ff52e412a0a 100644 --- a/mash/wm/DEPS +++ b/mash/wm/DEPS @@ -1,4 +1,4 @@ include_rules = [ - "+ash/wm/common", + "+ash/common", "+grit/mash_wm_resources.h", ] diff --git a/mash/wm/bridge/mus_layout_manager_adapter.cc b/mash/wm/bridge/mus_layout_manager_adapter.cc index b242c5d7e26581..35b0d3cfee9844 100644 --- a/mash/wm/bridge/mus_layout_manager_adapter.cc +++ b/mash/wm/bridge/mus_layout_manager_adapter.cc @@ -4,7 +4,7 @@ #include "mash/wm/bridge/mus_layout_manager_adapter.h" -#include "ash/wm/common/wm_layout_manager.h" +#include "ash/common/wm/wm_layout_manager.h" #include "components/mus/public/cpp/window.h" #include "mash/wm/bridge/wm_window_mus.h" diff --git a/mash/wm/bridge/wm_globals_mus.cc b/mash/wm/bridge/wm_globals_mus.cc index 1bce3e8204ead1..c4741c17b9d4d7 100644 --- a/mash/wm/bridge/wm_globals_mus.cc +++ b/mash/wm/bridge/wm_globals_mus.cc @@ -4,9 +4,9 @@ #include "mash/wm/bridge/wm_globals_mus.h" -#include "ash/wm/common/window_resizer.h" -#include "ash/wm/common/wm_activation_observer.h" -#include "ash/wm/common/wm_shell_window_ids.h" +#include "ash/common/wm/window_resizer.h" +#include "ash/common/wm/wm_activation_observer.h" +#include "ash/common/wm/wm_shell_window_ids.h" #include "base/memory/ptr_util.h" #include "components/mus/common/util.h" #include "components/mus/public/cpp/window.h" diff --git a/mash/wm/bridge/wm_globals_mus.h b/mash/wm/bridge/wm_globals_mus.h index 3724e08390465d..f1437f287ef70d 100644 --- a/mash/wm/bridge/wm_globals_mus.h +++ b/mash/wm/bridge/wm_globals_mus.h @@ -9,7 +9,7 @@ #include -#include "ash/wm/common/wm_globals.h" +#include "ash/common/wm/wm_globals.h" #include "base/macros.h" #include "base/observer_list.h" #include "components/mus/public/cpp/window_tree_client_observer.h" diff --git a/mash/wm/bridge/wm_lookup_mus.h b/mash/wm/bridge/wm_lookup_mus.h index 72a8e40dc41a94..e1b20906d8ee5e 100644 --- a/mash/wm/bridge/wm_lookup_mus.h +++ b/mash/wm/bridge/wm_lookup_mus.h @@ -7,7 +7,7 @@ #include -#include "ash/wm/common/wm_lookup.h" +#include "ash/common/wm/wm_lookup.h" #include "base/macros.h" namespace mash { diff --git a/mash/wm/bridge/wm_root_window_controller_mus.cc b/mash/wm/bridge/wm_root_window_controller_mus.cc index 63491e373b1938..06ff9abc02766f 100644 --- a/mash/wm/bridge/wm_root_window_controller_mus.cc +++ b/mash/wm/bridge/wm_root_window_controller_mus.cc @@ -4,7 +4,7 @@ #include "mash/wm/bridge/wm_root_window_controller_mus.h" -#include "ash/wm/common/wm_root_window_controller_observer.h" +#include "ash/common/wm/wm_root_window_controller_observer.h" #include "components/mus/public/cpp/window.h" #include "components/mus/public/cpp/window_property.h" #include "components/mus/public/cpp/window_tree_client.h" diff --git a/mash/wm/bridge/wm_root_window_controller_mus.h b/mash/wm/bridge/wm_root_window_controller_mus.h index 5810542f113ef6..2702686189e2df 100644 --- a/mash/wm/bridge/wm_root_window_controller_mus.h +++ b/mash/wm/bridge/wm_root_window_controller_mus.h @@ -5,7 +5,7 @@ #ifndef MASH_WM_BRIDGE_WM_ROOT_CONTROLLER_MUS_H_ #define MASH_WM_BRIDGE_WM_ROOT_CONTROLLER_MUS_H_ -#include "ash/wm/common/wm_root_window_controller.h" +#include "ash/common/wm/wm_root_window_controller.h" #include "base/macros.h" #include "base/observer_list.h" diff --git a/mash/wm/bridge/wm_shelf_mus.h b/mash/wm/bridge/wm_shelf_mus.h index dfc3bdcdff7474..62a34a35f68aa8 100644 --- a/mash/wm/bridge/wm_shelf_mus.h +++ b/mash/wm/bridge/wm_shelf_mus.h @@ -9,7 +9,7 @@ #include -#include "ash/wm/common/shelf/wm_shelf.h" +#include "ash/common/wm/shelf/wm_shelf.h" #include "base/macros.h" #include "base/observer_list.h" diff --git a/mash/wm/bridge/wm_window_mus.cc b/mash/wm/bridge/wm_window_mus.cc index 9868f9f802ac1a..8def7d1233bee7 100644 --- a/mash/wm/bridge/wm_window_mus.cc +++ b/mash/wm/bridge/wm_window_mus.cc @@ -4,11 +4,11 @@ #include "mash/wm/bridge/wm_window_mus.h" -#include "ash/wm/common/container_finder.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_layout_manager.h" -#include "ash/wm/common/wm_window_observer.h" -#include "ash/wm/common/wm_window_property.h" +#include "ash/common/wm/container_finder.h" +#include "ash/common/wm/window_state.h" +#include "ash/common/wm/wm_layout_manager.h" +#include "ash/common/wm/wm_window_observer.h" +#include "ash/common/wm/wm_window_property.h" #include "components/mus/public/cpp/property_type_converters.h" #include "components/mus/public/cpp/window.h" #include "components/mus/public/cpp/window_property.h" diff --git a/mash/wm/bridge/wm_window_mus.h b/mash/wm/bridge/wm_window_mus.h index 6bb0dbfc0f3095..6fb69f7f05cadc 100644 --- a/mash/wm/bridge/wm_window_mus.h +++ b/mash/wm/bridge/wm_window_mus.h @@ -7,7 +7,7 @@ #include -#include "ash/wm/common/wm_window.h" +#include "ash/common/wm/wm_window.h" #include "base/macros.h" #include "base/observer_list.h" #include "components/mus/public/cpp/window_observer.h" @@ -228,7 +228,7 @@ class WmWindowMus : public ash::wm::WmWindow, public mus::WindowObserver { mus::Window* window_; // The shell window id of this window. Shell window ids are defined in - // ash/wm/common/wm_shell_window_ids.h. + // ash/common/wm/wm_shell_window_ids.h. int shell_window_id_ = -1; std::unique_ptr window_state_; diff --git a/mash/wm/container_ids.cc b/mash/wm/container_ids.cc index a9440b643a38e8..7347c531530973 100644 --- a/mash/wm/container_ids.cc +++ b/mash/wm/container_ids.cc @@ -4,8 +4,8 @@ #include "mash/wm/container_ids.h" +#include "ash/common/wm/wm_shell_window_ids.h" #include "ash/public/interfaces/container.mojom.h" -#include "ash/wm/common/wm_shell_window_ids.h" using ash::mojom::Container; diff --git a/mash/wm/container_ids.h b/mash/wm/container_ids.h index 0fa215c80b591e..985d5a6bf62528 100644 --- a/mash/wm/container_ids.h +++ b/mash/wm/container_ids.h @@ -24,7 +24,7 @@ extern const ash::mojom::Container kActivationContainers[]; // Number of kActivationContainers. extern const size_t kNumActivationContainers; -// Converts window ids between ash (ash/wm/common/wm_shell_window_ids.h) and +// Converts window ids between ash (ash/common/wm/wm_shell_window_ids.h) and // mash. ash::mojom::Container AshContainerToMashContainer(int shell_window_id); int MashContainerToAshContainer(ash::mojom::Container container); diff --git a/mash/wm/drag_window_resizer.h b/mash/wm/drag_window_resizer.h index b33723cf639a77..f662949df94431 100644 --- a/mash/wm/drag_window_resizer.h +++ b/mash/wm/drag_window_resizer.h @@ -7,7 +7,7 @@ #include -#include "ash/wm/common/window_resizer.h" +#include "ash/common/wm/window_resizer.h" #include "base/macros.h" namespace mash { diff --git a/mash/wm/frame/move_event_handler.h b/mash/wm/frame/move_event_handler.h index f04d1534716bf1..a62f52be2feb94 100644 --- a/mash/wm/frame/move_event_handler.h +++ b/mash/wm/frame/move_event_handler.h @@ -7,7 +7,7 @@ #include -#include "ash/wm/common/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/mash/wm/root_window_controller.cc b/mash/wm/root_window_controller.cc index 458224621ba596..2f5e5d27c2856e 100644 --- a/mash/wm/root_window_controller.cc +++ b/mash/wm/root_window_controller.cc @@ -9,12 +9,12 @@ #include #include -#include "ash/wm/common/always_on_top_controller.h" -#include "ash/wm/common/dock/docked_window_layout_manager.h" -#include "ash/wm/common/panels/panel_layout_manager.h" -#include "ash/wm/common/wm_shell_window_ids.h" -#include "ash/wm/common/workspace/workspace_layout_manager.h" -#include "ash/wm/common/workspace/workspace_layout_manager_delegate.h" +#include "ash/common/wm/always_on_top_controller.h" +#include "ash/common/wm/dock/docked_window_layout_manager.h" +#include "ash/common/wm/panels/panel_layout_manager.h" +#include "ash/common/wm/wm_shell_window_ids.h" +#include "ash/common/wm/workspace/workspace_layout_manager.h" +#include "ash/common/wm/workspace/workspace_layout_manager_delegate.h" #include "base/bind.h" #include "base/command_line.h" #include "base/memory/ptr_util.h" diff --git a/mash/wm/window_manager.cc b/mash/wm/window_manager.cc index f51e0b078a22e1..3bc3c68eda75d1 100644 --- a/mash/wm/window_manager.cc +++ b/mash/wm/window_manager.cc @@ -8,8 +8,8 @@ #include +#include "ash/common/wm/container_finder.h" #include "ash/public/interfaces/container.mojom.h" -#include "ash/wm/common/container_finder.h" #include "components/mus/common/types.h" #include "components/mus/public/cpp/property_type_converters.h" #include "components/mus/public/cpp/window.h" diff --git a/mash/wm/workspace/workspace_layout_manager_unittest.cc b/mash/wm/workspace/workspace_layout_manager_unittest.cc index c60c5ab0031c49..fd00ebeb085a83 100644 --- a/mash/wm/workspace/workspace_layout_manager_unittest.cc +++ b/mash/wm/workspace/workspace_layout_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/wm/common/workspace/workspace_layout_manager.h" +#include "ash/common/wm/workspace/workspace_layout_manager.h" #include #include -#include "ash/wm/common/fullscreen_window_finder.h" -#include "ash/wm/common/window_state.h" -#include "ash/wm/common/wm_event.h" -#include "ash/wm/common/wm_root_window_controller_observer.h" -#include "ash/wm/common/wm_screen_util.h" +#include "ash/common/wm/fullscreen_window_finder.h" +#include "ash/common/wm/window_state.h" +#include "ash/common/wm/wm_event.h" +#include "ash/common/wm/wm_root_window_controller_observer.h" +#include "ash/common/wm/wm_screen_util.h" #include "components/mus/public/cpp/tests/test_window.h" #include "mash/wm/bridge/wm_root_window_controller_mus.h" #include "mash/wm/bridge/wm_window_mus.h"