diff --git a/ash/accelerators/accelerator_commands.cc b/ash/accelerators/accelerator_commands.cc index 1c3e7e92964e10..71acf98acd18ab 100644 --- a/ash/accelerators/accelerator_commands.cc +++ b/ash/accelerators/accelerator_commands.cc @@ -8,9 +8,9 @@ #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.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "base/metrics/user_metrics.h" diff --git a/ash/accelerators/accelerator_commands_unittest.cc b/ash/accelerators/accelerator_commands_unittest.cc index 86506e5f43e75a..61e9d8a904055a 100644 --- a/ash/accelerators/accelerator_commands_unittest.cc +++ b/ash/accelerators/accelerator_commands_unittest.cc @@ -7,7 +7,7 @@ #include #include "ash/test/ash_test_base.h" -#include "ash/wm/window_state.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 9ce54c7a5a461d..ab06d5c3edb825 100644 --- a/ash/accelerators/accelerator_controller.cc +++ b/ash/accelerators/accelerator_controller.cc @@ -46,13 +46,13 @@ #include "ash/touch/touch_hud_debug.h" #include "ash/utility/partial_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" #include "ash/wm/power_button_controller.h" #include "ash/wm/window_cycle_controller.h" -#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "base/bind.h" diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc index b7b9c7ad189bb8..fcb02b553c6cb7 100644 --- a/ash/accelerators/accelerator_controller_unittest.cc +++ b/ash/accelerators/accelerator_controller_unittest.cc @@ -25,10 +25,10 @@ #include "ash/volume_control_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/common/wm_event.h" #include "ash/wm/lock_state_controller.h" #include "ash/wm/panels/panel_layout_manager.h" -#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "base/command_line.h" diff --git a/ash/accelerators/accelerator_delegate.cc b/ash/accelerators/accelerator_delegate.cc index d74536c34a4a25..d831510056dd71 100644 --- a/ash/accelerators/accelerator_delegate.cc +++ b/ash/accelerators/accelerator_delegate.cc @@ -6,7 +6,7 @@ #include "ash/accelerators/accelerator_controller.h" #include "ash/shell.h" -#include "ash/wm/window_state.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 b9cef76f980c74..c60a86dd6aa76b 100644 --- a/ash/accelerators/accelerator_filter_unittest.cc +++ b/ash/accelerators/accelerator_filter_unittest.cc @@ -14,7 +14,7 @@ #include "ash/test/ash_test_helper.h" #include "ash/test/test_screenshot_delegate.h" #include "ash/test/test_session_state_delegate.h" -#include "ash/wm/window_state.h" +#include "ash/wm/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 a0fe1521c4425e..f9b59da9112a15 100644 --- a/ash/accelerators/accelerator_interactive_uitest_chromeos.cc +++ b/ash/accelerators/accelerator_interactive_uitest_chromeos.cc @@ -12,7 +12,7 @@ #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/window_state.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 5f7e95345ea4e8..fd1fd90778fb77 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -216,8 +216,6 @@ 'shelf/app_list_button.h', 'shelf/app_list_shelf_item_delegate.cc', 'shelf/app_list_shelf_item_delegate.h', - 'shelf/background_animator.cc', - 'shelf/background_animator.h', 'shelf/overflow_bubble.cc', 'shelf/overflow_bubble.h', 'shelf/overflow_bubble_view.cc', @@ -537,6 +535,15 @@ 'wm/aura/wm_window_aura.h', 'wm/boot_splash_screen_chromeos.cc', 'wm/boot_splash_screen_chromeos.h', + 'wm/common/background_animator.cc', + 'wm/common/background_animator.h', + 'wm/common/default_state.cc', + 'wm/common/default_state.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/drag_details.cc', + 'wm/common/drag_details.h', 'wm/common/root_window_finder.cc', 'wm/common/root_window_finder.h', 'wm/common/shelf/wm_shelf.h', @@ -549,6 +556,13 @@ 'wm/common/window_parenting_utils.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', @@ -574,19 +588,12 @@ 'wm/common/workspace/workspace_types.h', 'wm/cursor_manager_chromeos.cc', 'wm/cursor_manager_chromeos.h', - 'wm/default_state.cc', - 'wm/default_state.h', 'wm/default_window_resizer.cc', 'wm/default_window_resizer.h', 'wm/dim_window.cc', 'wm/dim_window.h', - 'wm/dock/docked_window_layout_manager.cc', - 'wm/dock/docked_window_layout_manager.h', - 'wm/dock/docked_window_layout_manager_observer.h', 'wm/dock/docked_window_resizer.cc', 'wm/dock/docked_window_resizer.h', - 'wm/drag_details.cc', - 'wm/drag_details.h', 'wm/drag_window_controller.cc', 'wm/drag_window_controller.h', 'wm/drag_window_resizer.cc', @@ -691,15 +698,8 @@ 'wm/window_positioner.h', 'wm/window_properties.cc', 'wm/window_properties.h', - 'wm/window_resizer.cc', - 'wm/window_resizer.h', - 'wm/window_state.cc', - 'wm/window_state.h', 'wm/window_state_aura.cc', 'wm/window_state_aura.h', - 'wm/window_state_delegate.cc', - 'wm/window_state_delegate.h', - 'wm/window_state_observer.h', 'wm/window_util.cc', 'wm/window_util.h', 'wm/workspace/magnetism_matcher.cc', diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc index 466a7bd47a84ff..03b6972b855ac9 100644 --- a/ash/display/display_manager_unittest.cc +++ b/ash/display/display_manager_unittest.cc @@ -16,7 +16,7 @@ #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/window_state.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_position_controller.cc b/ash/display/screen_position_controller.cc index 8467ea87d0fd27..4215f5df4212cc 100644 --- a/ash/display/screen_position_controller.cc +++ b/ash/display/screen_position_controller.cc @@ -8,9 +8,9 @@ #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 "ash/wm/window_state.h" #include "ui/aura/client/capture_client.h" #include "ui/aura/client/focus_client.h" #include "ui/aura/window.h" diff --git a/ash/display/window_tree_host_manager_unittest.cc b/ash/display/window_tree_host_manager_unittest.cc index cecbab6e5c63b1..b49709f84c08cd 100644 --- a/ash/display/window_tree_host_manager_unittest.cc +++ b/ash/display/window_tree_host_manager_unittest.cc @@ -20,8 +20,8 @@ #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.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/focus_cycler.cc b/ash/focus_cycler.cc index d6624f9a358d70..2ef8b7c3a493cf 100644 --- a/ash/focus_cycler.cc +++ b/ash/focus_cycler.cc @@ -5,8 +5,8 @@ #include "ash/focus_cycler.h" #include "ash/shell.h" +#include "ash/wm/common/window_state.h" #include "ash/wm/mru_window_tracker.h" -#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "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 756f87472e6b4e..b462d0655fb2b0 100644 --- a/ash/frame/caption_buttons/frame_size_button.cc +++ b/ash/frame/caption_buttons/frame_size_button.cc @@ -9,8 +9,8 @@ #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/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "ash/wm/workspace/phantom_window_controller.h" diff --git a/ash/frame/caption_buttons/frame_size_button_unittest.cc b/ash/frame/caption_buttons/frame_size_button_unittest.cc index fd8fc889426352..a1823cbcc33eda 100644 --- a/ash/frame/caption_buttons/frame_size_button_unittest.cc +++ b/ash/frame/caption_buttons/frame_size_button_unittest.cc @@ -9,7 +9,7 @@ #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/window_state.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 aa930da2f4b8cc..a0b4ebd6e841ae 100644 --- a/ash/frame/custom_frame_view_ash.cc +++ b/ash/frame/custom_frame_view_ash.cc @@ -16,11 +16,11 @@ #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.h" #include "ash/wm/window_state_aura.h" -#include "ash/wm/window_state_delegate.h" -#include "ash/wm/window_state_observer.h" #include "base/command_line.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/window.h" diff --git a/ash/frame/default_header_painter_unittest.cc b/ash/frame/default_header_painter_unittest.cc index c1b72c8ef2f826..a5a64f2f64d065 100644 --- a/ash/frame/default_header_painter_unittest.cc +++ b/ash/frame/default_header_painter_unittest.cc @@ -9,7 +9,7 @@ #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/window_state.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 0e6421152423f3..13bc6c09e69eb3 100644 --- a/ash/frame/frame_border_hit_test_controller.cc +++ b/ash/frame/frame_border_hit_test_controller.cc @@ -8,8 +8,8 @@ #include "ash/ash_constants.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 "ash/wm/window_state_observer.h" #include "ui/aura/env.h" #include "ui/aura/window.h" #include "ui/aura/window_observer.h" diff --git a/ash/metrics/user_metrics_recorder.cc b/ash/metrics/user_metrics_recorder.cc index 115192fc81b881..cadf710158ad7f 100644 --- a/ash/metrics/user_metrics_recorder.cc +++ b/ash/metrics/user_metrics_recorder.cc @@ -14,7 +14,7 @@ #include "ash/shell.h" #include "ash/shell_window_ids.h" #include "ash/system/tray/system_tray_delegate.h" -#include "ash/wm/window_state.h" +#include "ash/wm/common/window_state.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 69d95d2b53f352..6665d7f2905006 100644 --- a/ash/root_window_controller.cc +++ b/ash/root_window_controller.cc @@ -36,8 +36,9 @@ #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/dock/docked_window_layout_manager.h" +#include "ash/wm/common/window_state.h" #include "ash/wm/common/workspace/workspace_layout_manager_delegate.h" -#include "ash/wm/dock/docked_window_layout_manager.h" #include "ash/wm/lock_layout_manager.h" #include "ash/wm/panels/attached_panel_window_targeter.h" #include "ash/wm/panels/panel_layout_manager.h" @@ -48,7 +49,6 @@ #include "ash/wm/system_background_controller.h" #include "ash/wm/system_modal_container_layout_manager.h" #include "ash/wm/window_properties.h" -#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "ash/wm/workspace/workspace_layout_manager.h" diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc index 8b15efe7c8f19a..49ba6fe1b3333f 100644 --- a/ash/root_window_controller_unittest.cc +++ b/ash/root_window_controller_unittest.cc @@ -14,9 +14,9 @@ #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.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_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc index 9bc695ac525ae1..482fbb58141b87 100644 --- a/ash/shelf/shelf_layout_manager.cc +++ b/ash/shelf/shelf_layout_manager.cc @@ -24,11 +24,11 @@ #include "ash/shell.h" #include "ash/shell_window_ids.h" #include "ash/system/status_area_widget.h" +#include "ash/wm/common/window_state.h" #include "ash/wm/gestures/shelf_gesture_handler.h" #include "ash/wm/lock_state_controller.h" #include "ash/wm/mru_window_tracker.h" #include "ash/wm/window_animations.h" -#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "ash/wm/workspace_controller.h" diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h index 1de5f5672e7c9e..6480433755f1d2 100644 --- a/ash/shelf/shelf_layout_manager.h +++ b/ash/shelf/shelf_layout_manager.h @@ -10,14 +10,14 @@ #include "ash/ash_export.h" #include "ash/session/session_state_observer.h" -#include "ash/shelf/background_animator.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/dock/docked_window_layout_manager_observer.h" #include "ash/wm/lock_state_observer.h" #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" diff --git a/ash/shelf/shelf_layout_manager_observer.h b/ash/shelf/shelf_layout_manager_observer.h index 4fddcffb7a6a8d..bfb3005dfddc3b 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/shelf/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 ce98cd500993a9..375b4735cade06 100644 --- a/ash/shelf/shelf_layout_manager_unittest.cc +++ b/ash/shelf/shelf_layout_manager_unittest.cc @@ -25,7 +25,7 @@ #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/window_state.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_widget.h b/ash/shelf/shelf_widget.h index 0db944f962e2c4..2a63c8d240cee7 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/shelf/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 "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 ae95a51d7d6ee5..70e94c27121ff3 100644 --- a/ash/shelf/shelf_window_watcher.cc +++ b/ash/shelf/shelf_window_watcher.cc @@ -15,7 +15,7 @@ #include "ash/shelf/shelf_window_watcher_item_delegate.h" #include "ash/shell.h" #include "ash/shell_window_ids.h" -#include "ash/wm/window_state.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 f9d4d9f3050c32..74ce5462cc8f75 100644 --- a/ash/shelf/shelf_window_watcher_item_delegate.cc +++ b/ash/shelf/shelf_window_watcher_item_delegate.cc @@ -6,7 +6,7 @@ #include "ash/shelf/shelf_util.h" #include "ash/shell.h" -#include "ash/wm/window_state.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 b169f1f77a8727..f03a262fbce7b6 100644 --- a/ash/shelf/shelf_window_watcher_unittest.cc +++ b/ash/shelf/shelf_window_watcher_unittest.cc @@ -13,8 +13,8 @@ #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/window_resizer.h" -#include "ash/wm/window_state.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/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc index 0ebe950b939798..d1e6800093a4b0 100644 --- a/ash/shell/shell_delegate_impl.cc +++ b/ash/shell/shell_delegate_impl.cc @@ -20,7 +20,7 @@ #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/window_state.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 6af929e0e71244..2bcc6b5b367fc7 100644 --- a/ash/shell/toplevel_window.cc +++ b/ash/shell/toplevel_window.cc @@ -5,8 +5,8 @@ #include "ash/shell/toplevel_window.h" #include "ash/shell.h" +#include "ash/wm/common/window_state.h" #include "ash/wm/window_positioner.h" -#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "base/strings/utf_string_conversions.h" #include "ui/aura/window.h" diff --git a/ash/system/tray/tray_background_view.h b/ash/system/tray/tray_background_view.h index dc628a7ea77d1e..e908cb34f41f39 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/shelf/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/web_notification/web_notification_tray_unittest.cc b/ash/system/web_notification/web_notification_tray_unittest.cc index b6798511033ef9..02b9ed97b786b1 100644 --- a/ash/system/web_notification/web_notification_tray_unittest.cc +++ b/ash/system/web_notification/web_notification_tray_unittest.cc @@ -19,7 +19,7 @@ #include "ash/test/ash_test_base.h" #include "ash/test/status_area_widget_test_helper.h" #include "ash/test/test_system_tray_delegate.h" -#include "ash/wm/window_state.h" +#include "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/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc index 90100e34d539ad..1566a5892bbd68 100644 --- a/ash/test/test_shell_delegate.cc +++ b/ash/test/test_shell_delegate.cc @@ -21,7 +21,7 @@ #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/window_state.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/wm/ash_focus_rules.cc b/ash/wm/ash_focus_rules.cc index 4e97535f56acbe..1c3e1ccd381bc2 100644 --- a/ash/wm/ash_focus_rules.cc +++ b/ash/wm/ash_focus_rules.cc @@ -7,8 +7,8 @@ #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.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 1806565756a563..7034620945efce 100644 --- a/ash/wm/ash_focus_rules_unittest.cc +++ b/ash/wm/ash_focus_rules_unittest.cc @@ -9,8 +9,8 @@ #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.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "ui/aura/client/aura_constants.h" diff --git a/ash/wm/aura/wm_window_aura.cc b/ash/wm/aura/wm_window_aura.cc index a01ff13757c130..9f112025710bbe 100644 --- a/ash/wm/aura/wm_window_aura.cc +++ b/ash/wm/aura/wm_window_aura.cc @@ -9,12 +9,12 @@ #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/window_animations.h" #include "ash/wm/window_properties.h" -#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "ui/aura/client/aura_constants.h" diff --git a/ash/wm/common/DEPS b/ash/wm/common/DEPS new file mode 100644 index 00000000000000..759ae25aebd56f --- /dev/null +++ b/ash/wm/common/DEPS @@ -0,0 +1,8 @@ +include_rules = [ + "-ash", + "+ash/wm/common", + "+ui", + "-ui/aura", + # TODO(sky): nuke this. Temporary until introduce separate dll. + "+ash/ash_export.h", +] diff --git a/ash/shelf/background_animator.cc b/ash/wm/common/background_animator.cc similarity index 90% rename from ash/shelf/background_animator.cc rename to ash/wm/common/background_animator.cc index cac6d766cb1b42..ffdc7c964d1b38 100644 --- a/ash/shelf/background_animator.cc +++ b/ash/wm/common/background_animator.cc @@ -2,14 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/shelf/background_animator.h" +#include "ash/wm/common/background_animator.h" namespace ash { namespace { // Duration of the background animation. const int kBackgroundDurationMS = 1000; - } BackgroundAnimator::BackgroundAnimator(BackgroundAnimatorDelegate* delegate, @@ -24,15 +23,15 @@ BackgroundAnimator::BackgroundAnimator(BackgroundAnimatorDelegate* delegate, animation_.SetSlideDuration(kBackgroundDurationMS); } -BackgroundAnimator::~BackgroundAnimator() { -} +BackgroundAnimator::~BackgroundAnimator() {} void BackgroundAnimator::SetDuration(int time_in_ms) { animation_.SetSlideDuration(time_in_ms); } void BackgroundAnimator::SetPaintsBackground( - bool value, BackgroundAnimatorChangeType type) { + bool value, + BackgroundAnimatorChangeType type) { if (paints_background_ == value) return; paints_background_ = value; diff --git a/ash/shelf/background_animator.h b/ash/wm/common/background_animator.h similarity index 93% rename from ash/shelf/background_animator.h rename to ash/wm/common/background_animator.h index f97381af4aa240..53d2514464368a 100644 --- a/ash/shelf/background_animator.h +++ b/ash/wm/common/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_SHELF_BACKGROUND_ANIMATOR_H_ -#define ASH_SHELF_BACKGROUND_ANIMATOR_H_ +#ifndef ASH_WM_COMMON_BACKGROUND_ANIMATOR_H_ +#define ASH_WM_COMMON_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_SHELF_BACKGROUND_ANIMATOR_H_ +#endif // ASH_WM_COMMON_BACKGROUND_ANIMATOR_H_ diff --git a/ash/wm/default_state.cc b/ash/wm/common/default_state.cc similarity index 92% rename from ash/wm/default_state.cc rename to ash/wm/common/default_state.cc index 08a73bf939b034..3be0a9ec707d6e 100644 --- a/ash/wm/default_state.cc +++ b/ash/wm/common/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/default_state.h" +#include "ash/wm/common/default_state.h" -#include "ash/shell_window_ids.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/wm/dock/docked_window_layout_manager.h" -#include "ash/wm/window_state.h" -#include "ash/wm/window_state_delegate.h" #include "ui/gfx/display.h" #include "ui/gfx/screen.h" @@ -108,14 +108,15 @@ class ScopedDockedLayoutEventSourceResetter { void CycleSnapDock(WindowState* window_state, WMEventType event) { DockedWindowLayoutManager* dock_layout = GetDockedWindowLayoutManager(window_state->window()->GetGlobals()); - wm::WindowStateType desired_snap_state = event == - WM_EVENT_CYCLE_SNAP_DOCK_LEFT ? wm::WINDOW_STATE_TYPE_LEFT_SNAPPED : - wm::WINDOW_STATE_TYPE_RIGHT_SNAPPED; - DockedAlignment desired_dock_alignment = event == - WM_EVENT_CYCLE_SNAP_DOCK_LEFT ? - DOCKED_ALIGNMENT_LEFT : DOCKED_ALIGNMENT_RIGHT; - DockedAlignment current_dock_alignment = dock_layout ? - dock_layout->CalculateAlignment() : DOCKED_ALIGNMENT_NONE; + wm::WindowStateType desired_snap_state = + event == WM_EVENT_CYCLE_SNAP_DOCK_LEFT + ? wm::WINDOW_STATE_TYPE_LEFT_SNAPPED + : wm::WINDOW_STATE_TYPE_RIGHT_SNAPPED; + DockedAlignment desired_dock_alignment = + event == WM_EVENT_CYCLE_SNAP_DOCK_LEFT ? DOCKED_ALIGNMENT_LEFT + : DOCKED_ALIGNMENT_RIGHT; + DockedAlignment current_dock_alignment = + dock_layout ? dock_layout->CalculateAlignment() : DOCKED_ALIGNMENT_NONE; if (!window_state->IsDocked() || (current_dock_alignment != DOCKED_ALIGNMENT_NONE && @@ -124,8 +125,9 @@ void CycleSnapDock(WindowState* window_state, WMEventType event) { window_state->GetStateType() != desired_snap_state && window_state->window()->GetType() != ui::wm::WINDOW_TYPE_PANEL) { const wm::WMEvent event(desired_snap_state == - wm::WINDOW_STATE_TYPE_LEFT_SNAPPED ? - wm::WM_EVENT_SNAP_LEFT : wm::WM_EVENT_SNAP_RIGHT); + wm::WINDOW_STATE_TYPE_LEFT_SNAPPED + ? wm::WM_EVENT_SNAP_LEFT + : wm::WM_EVENT_SNAP_RIGHT); window_state->OnWMEvent(&event); return; } @@ -161,8 +163,7 @@ DefaultState::DefaultState(WindowStateType initial_state_type) : state_type_(initial_state_type), stored_window_state_(nullptr) {} DefaultState::~DefaultState() {} -void DefaultState::OnWMEvent(WindowState* window_state, - const WMEvent* event) { +void DefaultState::OnWMEvent(WindowState* window_state, const WMEvent* event) { if (ProcessWorkspaceEvents(window_state, event)) return; @@ -173,17 +174,17 @@ void DefaultState::OnWMEvent(WindowState* window_state, WindowStateType next_state_type = WINDOW_STATE_TYPE_NORMAL; switch (event->type()) { case WM_EVENT_NORMAL: - next_state_type = - current_state_type == WINDOW_STATE_TYPE_DOCKED_MINIMIZED ? - WINDOW_STATE_TYPE_DOCKED : WINDOW_STATE_TYPE_NORMAL; + next_state_type = current_state_type == WINDOW_STATE_TYPE_DOCKED_MINIMIZED + ? WINDOW_STATE_TYPE_DOCKED + : WINDOW_STATE_TYPE_NORMAL; break; case WM_EVENT_MAXIMIZE: next_state_type = WINDOW_STATE_TYPE_MAXIMIZED; break; case WM_EVENT_MINIMIZE: - next_state_type = - current_state_type == WINDOW_STATE_TYPE_DOCKED ? - WINDOW_STATE_TYPE_DOCKED_MINIMIZED : WINDOW_STATE_TYPE_MINIMIZED; + next_state_type = current_state_type == WINDOW_STATE_TYPE_DOCKED + ? WINDOW_STATE_TYPE_DOCKED_MINIMIZED + : WINDOW_STATE_TYPE_MINIMIZED; break; case WM_EVENT_FULLSCREEN: next_state_type = WINDOW_STATE_TYPE_FULLSCREEN; @@ -221,9 +222,11 @@ void DefaultState::OnWMEvent(WindowState* window_state, } if (next_state_type == current_state_type && window_state->IsSnapped()) { - gfx::Rect snapped_bounds = event->type() == WM_EVENT_SNAP_LEFT ? - GetDefaultLeftSnappedWindowBoundsInParent(window_state->window()) : - GetDefaultRightSnappedWindowBoundsInParent(window_state->window()); + gfx::Rect snapped_bounds = + event->type() == WM_EVENT_SNAP_LEFT + ? GetDefaultLeftSnappedWindowBoundsInParent(window_state->window()) + : GetDefaultRightSnappedWindowBoundsInParent( + window_state->window()); window_state->SetBoundsDirectAnimated(snapped_bounds); return; } @@ -235,9 +238,8 @@ WindowStateType DefaultState::GetType() const { return state_type_; } -void DefaultState::AttachState( - WindowState* window_state, - WindowState::State* state_in_previous_mode) { +void DefaultState::AttachState(WindowState* window_state, + WindowState::State* state_in_previous_mode) { DCHECK_EQ(stored_window_state_, window_state); ReenterToCurrentState(window_state, state_in_previous_mode); @@ -258,8 +260,9 @@ void DefaultState::AttachState( void DefaultState::DetachState(WindowState* window_state) { stored_window_state_ = window_state; stored_bounds_ = window_state->window()->GetBounds(); - stored_restore_bounds_ = window_state->HasRestoreBounds() ? - window_state->GetRestoreBoundsInParent() : gfx::Rect(); + stored_restore_bounds_ = window_state->HasRestoreBounds() + ? window_state->GetRestoreBoundsInParent() + : gfx::Rect(); // Remember the display state so that in case of the display change // while in the other mode, we can perform necessary action to // restore the window state to the proper state for the current @@ -536,8 +539,7 @@ void DefaultState::EnterToNextState(WindowState* window_state, if (!window_state->HasRestoreBounds() && (previous_state_type == WINDOW_STATE_TYPE_DEFAULT || previous_state_type == WINDOW_STATE_TYPE_NORMAL) && - !window_state->IsMinimized() && - !window_state->IsNormalStateType()) { + !window_state->IsMinimized() && !window_state->IsNormalStateType()) { window_state->SaveCurrentBoundsForRestore(); } @@ -547,8 +549,7 @@ void DefaultState::EnterToNextState(WindowState* window_state, // axis by double clicking the window border for example). gfx::Rect restore_bounds_in_screen; if (previous_state_type == WINDOW_STATE_TYPE_MINIMIZED && - window_state->IsNormalStateType() && - window_state->HasRestoreBounds() && + window_state->IsNormalStateType() && window_state->HasRestoreBounds() && !window_state->unminimize_to_restore_bounds()) { restore_bounds_in_screen = window_state->GetRestoreBoundsInScreen(); window_state->SaveCurrentBoundsForRestore(); diff --git a/ash/wm/default_state.h b/ash/wm/common/default_state.h similarity index 94% rename from ash/wm/default_state.h rename to ash/wm/common/default_state.h index 6d81d7e57add7d..8e5be013901075 100644 --- a/ash/wm/default_state.h +++ b/ash/wm/common/default_state.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_WM_DEFAULT_STATE_H_ -#define ASH_WM_DEFAULT_STATE_H_ +#ifndef ASH_WM_COMMON_DEFAULT_STATE_H_ +#define ASH_WM_COMMON_DEFAULT_STATE_H_ -#include "ash/wm/window_state.h" +#include "ash/wm/common/window_state.h" #include "base/macros.h" #include "ui/gfx/display.h" #include "ui/gfx/geometry/rect.h" @@ -79,4 +79,4 @@ class DefaultState : public WindowState::State { } // namespace wm } // namespace ash -#endif // ASH_WM_DEFAULT_STATE_H_ +#endif // ASH_WM_COMMON_DEFAULT_STATE_H_ diff --git a/ash/wm/dock/dock_types.h b/ash/wm/common/dock/dock_types.h similarity index 56% rename from ash/wm/dock/dock_types.h rename to ash/wm/common/dock/dock_types.h index 7db37c3742fe0c..93bdec3b26f9ed 100644 --- a/ash/wm/dock/dock_types.h +++ b/ash/wm/common/dock/dock_types.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_WM_DOCK_DOCK_TYPES_H_ -#define ASH_WM_DOCK_DOCK_TYPES_H_ +#ifndef ASH_WM_COMMON_DOCK_DOCK_TYPES_H_ +#define ASH_WM_COMMON_DOCK_DOCK_TYPES_H_ namespace ash { @@ -24,17 +24,17 @@ enum DockedAlignment { // User action recorded for use in UMA histograms. enum DockedAction { - DOCKED_ACTION_NONE, // Regular drag of undocked window. Not recorded. - DOCKED_ACTION_DOCK, // Dragged and docked a window. - DOCKED_ACTION_UNDOCK, // Dragged and undocked a window. - DOCKED_ACTION_RESIZE, // Resized a docked window. - DOCKED_ACTION_REORDER, // Possibly reordered docked windows. - DOCKED_ACTION_EVICT, // A docked window could not stay docked. - DOCKED_ACTION_MAXIMIZE, // Maximized a docked window. - DOCKED_ACTION_MINIMIZE, // Minimized a docked window. - DOCKED_ACTION_RESTORE, // Restored a docked window that was minimized. - DOCKED_ACTION_CLOSE, // Closed a window while it was docked. - DOCKED_ACTION_COUNT, // Maximum value of this enum for histograms use. + DOCKED_ACTION_NONE, // Regular drag of undocked window. Not recorded. + DOCKED_ACTION_DOCK, // Dragged and docked a window. + DOCKED_ACTION_UNDOCK, // Dragged and undocked a window. + DOCKED_ACTION_RESIZE, // Resized a docked window. + DOCKED_ACTION_REORDER, // Possibly reordered docked windows. + DOCKED_ACTION_EVICT, // A docked window could not stay docked. + DOCKED_ACTION_MAXIMIZE, // Maximized a docked window. + DOCKED_ACTION_MINIMIZE, // Minimized a docked window. + DOCKED_ACTION_RESTORE, // Restored a docked window that was minimized. + DOCKED_ACTION_CLOSE, // Closed a window while it was docked. + DOCKED_ACTION_COUNT, // Maximum value of this enum for histograms use. }; // Event source for the docking user action (when known). @@ -50,4 +50,4 @@ enum DockedActionSource { } // namespace ash -#endif // ASH_WM_DOCK_DOCK_TYPES_H_ +#endif // ASH_WM_COMMON_DOCK_DOCK_TYPES_H_ diff --git a/ash/wm/dock/docked_window_layout_manager.cc b/ash/wm/common/dock/docked_window_layout_manager.cc similarity index 95% rename from ash/wm/dock/docked_window_layout_manager.cc rename to ash/wm/common/dock/docked_window_layout_manager.cc index 343b6638d19c50..3e8ad79d01ee3a 100644 --- a/ash/wm/dock/docked_window_layout_manager.cc +++ b/ash/wm/common/dock/docked_window_layout_manager.cc @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/wm/dock/docked_window_layout_manager.h" +#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_root_window_controller.h" #include "ash/wm/common/wm_shell_window_ids.h" #include "ash/wm/common/wm_window.h" -#include "ash/wm/window_resizer.h" -#include "ash/wm/window_state.h" #include "base/auto_reset.h" #include "base/metrics/histogram.h" #include "grit/ash_resources.h" @@ -81,9 +81,9 @@ class DockedBackgroundWidget : public views::Widget, void OnNativeWidgetPaint(const ui::PaintContext& context) override { gfx::Rect local_window_bounds(GetWindowBoundsInScreen().size()); ui::PaintRecorder recorder(context, local_window_bounds.size()); - const gfx::ImageSkia& shelf_background( - alignment_ == DOCKED_ALIGNMENT_LEFT ? - shelf_background_left_ : shelf_background_right_); + const gfx::ImageSkia& shelf_background(alignment_ == DOCKED_ALIGNMENT_LEFT + ? shelf_background_left_ + : shelf_background_right_); SkPaint paint; paint.setAlpha(alpha_); recorder.canvas()->DrawImageInt( @@ -160,8 +160,9 @@ class DockedBackgroundWidget : public views::Widget, void UpdateBackground() { wm::ShelfBackgroundType background_type = IsVisible() ? visible_background_type_ : wm::SHELF_BACKGROUND_DEFAULT; - BackgroundAnimatorChangeType change_type = IsVisible() ? - visible_background_change_type_ : BACKGROUND_CHANGE_IMMEDIATE; + BackgroundAnimatorChangeType change_type = + IsVisible() ? visible_background_change_type_ + : BACKGROUND_CHANGE_IMMEDIATE; float target_opacity = (background_type == wm::SHELF_BACKGROUND_MAXIMIZED) ? 1.0f : 0.0f; @@ -247,9 +248,9 @@ int GetWindowWidthCloseTo(const wm::WmWindow* window, int target_width) { DockedWindowLayoutManager::kMaxDockWidth); return window->GetBounds().width(); } - int width = std::max(DockedWindowLayoutManager::kMinDockWidth, - std::min(target_width, - DockedWindowLayoutManager::kMaxDockWidth)); + int width = std::max( + DockedWindowLayoutManager::kMinDockWidth, + std::min(target_width, DockedWindowLayoutManager::kMaxDockWidth)); width = std::max(width, window->GetMinimumSize().width()); if (window->GetMaximumSize().width() != 0) width = std::min(width, window->GetMaximumSize().width()); @@ -360,8 +361,7 @@ struct DockedWindowLayoutManager::CompareWindowPos { class DockedWindowLayoutManager::ShelfWindowObserver : public wm::WmWindowObserver { public: - explicit ShelfWindowObserver( - DockedWindowLayoutManager* docked_layout_manager) + explicit ShelfWindowObserver(DockedWindowLayoutManager* docked_layout_manager) : docked_layout_manager_(docked_layout_manager) { DCHECK(docked_layout_manager_->shelf()->GetWindow()); docked_layout_manager_->shelf()->GetWindow()->AddObserver(this); @@ -467,10 +467,9 @@ void DockedWindowLayoutManager::StartDragging(wm::WmWindow* window) { if (dragged_window_->GetParent() != dock_container_) { dragged_window_->AddObserver(this); dragged_state->AddObserver(this); - } else if (!IsAnyWindowDocked() && - dragged_state->drag_details() && + } else if (!IsAnyWindowDocked() && dragged_state->drag_details() && !(dragged_state->drag_details()->bounds_change & - WindowResizer::kBoundsChange_Resizes)) { + WindowResizer::kBoundsChange_Resizes)) { // If there are no other docked windows clear alignment when a docked window // is moved (but not when it is resized or the window could get undocked // when resized away from the edge while docked). @@ -515,7 +514,7 @@ void DockedWindowLayoutManager::FinishDragging(DockedAction action, DCHECK(!IsPopupOrTransient(dragged_window_)); if (is_dragged_window_docked_) OnDraggedWindowUndocked(); - DCHECK (!is_dragged_window_docked_); + DCHECK(!is_dragged_window_docked_); // Stop observing a window unless it is docked container's child in which // case it needs to keep being observed after the drag completes. if (dragged_window_->GetParent() != dock_container_) { @@ -594,7 +593,8 @@ bool DockedWindowLayoutManager::CanDockWindow( // modal browser dialogs. Prevent docking of panels attached to shelf during // the drag. wm::WindowState* window_state = window->GetWindowState(); - bool should_attach_to_shelf = window_state->drag_details() && + bool should_attach_to_shelf = + window_state->drag_details() && window_state->drag_details()->should_attach_to_shelf; if (IsPopupOrTransient(window) || should_attach_to_shelf) return false; @@ -618,8 +618,7 @@ bool DockedWindowLayoutManager::CanDockWindow( // Cannot dock on the other size from an existing dock. const DockedAlignment alignment = CalculateAlignmentExcept(window); if (desired_alignment != DOCKED_ALIGNMENT_NONE && - alignment != DOCKED_ALIGNMENT_NONE && - alignment != desired_alignment) { + alignment != DOCKED_ALIGNMENT_NONE && alignment != desired_alignment) { return false; } // Do not allow docking on the same side as shelf. @@ -646,8 +645,7 @@ void DockedWindowLayoutManager::MaybeSetDesiredDockedAlignment( // dock or not. If the requested alignment is the same as the current // alignment return early as an optimization. if (alignment == DOCKED_ALIGNMENT_NONE || - alignment_ == DOCKED_ALIGNMENT_NONE || - alignment_ == alignment || + alignment_ == DOCKED_ALIGNMENT_NONE || alignment_ == alignment || !IsDockedAlignmentValid(alignment)) { return; } @@ -684,8 +682,9 @@ void DockedWindowLayoutManager::OnWindowAddedToLayout(wm::WmWindow* child) { // display via API or due to display configuration change, so the alignment // is set based on which edge is closer in the new display. if (alignment_ == DOCKED_ALIGNMENT_NONE) { - alignment_ = preferred_alignment_ != DOCKED_ALIGNMENT_NONE ? - preferred_alignment_ : GetEdgeNearestWindow(child); + alignment_ = preferred_alignment_ != DOCKED_ALIGNMENT_NONE + ? preferred_alignment_ + : GetEdgeNearestWindow(child); } MaybeMinimizeChildrenExcept(child); child->AddObserver(this); @@ -914,8 +913,8 @@ void DockedWindowLayoutManager::MaybeMinimizeChildrenExcept( wm::WmWindow* window(*iter); if (window == child || !IsWindowDocked(window)) continue; - int room_needed = GetWindowHeightCloseTo(window, 0) + - (gap_needed ? kMinDockGap : 0); + int room_needed = + GetWindowHeightCloseTo(window, 0) + (gap_needed ? kMinDockGap : 0); gap_needed = true; if (available_room > room_needed) { available_room -= room_needed; @@ -976,10 +975,8 @@ void DockedWindowLayoutManager::RecordUmaAction(DockedAction action, base::Time time_now = base::Time::Now(); base::TimeDelta time_between_use = time_now - last_action_time_; UMA_HISTOGRAM_CUSTOM_COUNTS("Ash.Dock.TimeBetweenUse", - time_between_use.InSeconds(), - 1, - base::TimeDelta::FromHours(10).InSeconds(), - 100); + time_between_use.InSeconds(), 1, + base::TimeDelta::FromHours(10).InSeconds(), 100); last_action_time_ = time_now; int docked_all_count = 0; int docked_visible_count = 0; @@ -1020,7 +1017,7 @@ void DockedWindowLayoutManager::OnDraggedWindowDocked(wm::WmWindow* window) { } void DockedWindowLayoutManager::OnDraggedWindowUndocked() { - DCHECK (is_dragged_window_docked_); + DCHECK(is_dragged_window_docked_); is_dragged_window_docked_ = false; } @@ -1081,12 +1078,10 @@ void DockedWindowLayoutManager::Relayout() { gfx::Rect work_area = dock_container_->GetDisplayNearestWindow().work_area(); if (shelf_observer_) work_area.Subtract(shelf_observer_->shelf_bounds_in_screen()); - int available_room = CalculateWindowHeightsAndRemainingRoom(work_area, - &visible_windows); - FanOutChildren(work_area, - CalculateIdealWidth(visible_windows), - available_room, - &visible_windows); + int available_room = + CalculateWindowHeightsAndRemainingRoom(work_area, &visible_windows); + FanOutChildren(work_area, CalculateIdealWidth(visible_windows), + available_room, &visible_windows); // After the first Relayout allow the windows to change their order easier // since we know they are docked. @@ -1111,7 +1106,7 @@ int DockedWindowLayoutManager::CalculateWindowHeightsAndRemainingRoom( // its proportional share of the remaining space. for (std::vector::reverse_iterator iter = visible_windows->rbegin(); - iter != visible_windows->rend(); ++iter) { + iter != visible_windows->rend(); ++iter) { iter->height = GetWindowHeightCloseTo( iter->window, (available_room + gap_height) / remaining_windows - gap_height); @@ -1142,8 +1137,8 @@ int DockedWindowLayoutManager::CalculateIdealWidth( largest_min_width = std::max(largest_min_width, min_window_width); smallest_max_width = std::min(smallest_max_width, max_window_width); } - int ideal_width = std::max(largest_min_width, - std::min(smallest_max_width, kIdealWidth)); + int ideal_width = + std::max(largest_min_width, std::min(smallest_max_width, kIdealWidth)); // Restrict docked area width regardless of window restrictions. ideal_width = std::max(std::min(ideal_width, kMaxDockWidth), kMinDockWidth); return ideal_width; @@ -1158,9 +1153,10 @@ void DockedWindowLayoutManager::FanOutChildren( // Calculate initial vertical offset and the gap or overlap between windows. const int num_windows = visible_windows->size(); - const float delta = static_cast(available_room) / - ((available_room > 0 || num_windows <= 1) ? - num_windows + 1 : num_windows - 1); + const float delta = + static_cast(available_room) / + ((available_room > 0 || num_windows <= 1) ? num_windows + 1 + : num_windows - 1); float y_pos = work_area.y() + ((delta > 0) ? delta : 0); // Docked area is shown only if there is at least one non-dragged visible @@ -1198,9 +1194,9 @@ void DockedWindowLayoutManager::FanOutChildren( // Fan out windows evenly distributing the overlap or remaining free space. bounds.set_height(iter->height); - bounds.set_y(std::max(work_area.y(), - std::min(work_area.bottom() - bounds.height(), - static_cast(y_pos + 0.5)))); + bounds.set_y( + std::max(work_area.y(), std::min(work_area.bottom() - bounds.height(), + static_cast(y_pos + 0.5)))); y_pos += bounds.height() + delta + kMinDockGap; // All docked windows other than the one currently dragged remain stuck @@ -1247,12 +1243,10 @@ void DockedWindowLayoutManager::UpdateDockBounds( ? dock_container_->GetBounds().right() - dock_inset : dock_container_->GetBounds().x(), dock_container_->GetBounds().y(), dock_inset, work_area.height()); - docked_bounds_ = bounds + - dock_container_->GetBoundsInScreen().OffsetFromOrigin(); - FOR_EACH_OBSERVER( - DockedWindowLayoutManagerObserver, - observer_list_, - OnDockBoundsChanging(bounds, reason)); + docked_bounds_ = + bounds + dock_container_->GetBoundsInScreen().OffsetFromOrigin(); + FOR_EACH_OBSERVER(DockedWindowLayoutManagerObserver, observer_list_, + OnDockBoundsChanging(bounds, reason)); // Show or hide background for docked area. gfx::Rect background_bounds(docked_bounds_); if (shelf_observer_) diff --git a/ash/wm/dock/docked_window_layout_manager.h b/ash/wm/common/dock/docked_window_layout_manager.h similarity index 97% rename from ash/wm/dock/docked_window_layout_manager.h rename to ash/wm/common/dock/docked_window_layout_manager.h index 6983ca4ab04804..f3760e172f3fae 100644 --- a/ash/wm/dock/docked_window_layout_manager.h +++ b/ash/wm/common/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_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_ -#define ASH_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_ +#ifndef ASH_WM_COMMON_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_ +#define ASH_WM_COMMON_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/wm/dock/dock_types.h" -#include "ash/wm/dock/docked_window_layout_manager_observer.h" -#include "ash/wm/window_state_observer.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "base/observer_list.h" @@ -120,7 +120,7 @@ class ASH_EXPORT DockedWindowLayoutManager const gfx::Rect& docked_bounds() const { return docked_bounds_; } // Returns last known coordinates of |dragged_window_| after Relayout. - const gfx::Rect dragged_bounds() const { return dragged_bounds_;} + const gfx::Rect dragged_bounds() const { return dragged_bounds_; } // Returns true if currently dragged window is docked at the screen edge. bool is_dragged_window_docked() const { return is_dragged_window_docked_; } @@ -312,4 +312,4 @@ class ASH_EXPORT DockedWindowLayoutManager } // namespace ash -#endif // ASH_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_ +#endif // ASH_WM_COMMON_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_ diff --git a/ash/wm/dock/docked_window_layout_manager_observer.h b/ash/wm/common/dock/docked_window_layout_manager_observer.h similarity index 82% rename from ash/wm/dock/docked_window_layout_manager_observer.h rename to ash/wm/common/dock/docked_window_layout_manager_observer.h index 69839d18895bdf..71b2a335837af8 100644 --- a/ash/wm/dock/docked_window_layout_manager_observer.h +++ b/ash/wm/common/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 UI_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_OBSERVER_H_ -#define UI_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_OBSERVER_H_ +#ifndef ASH_WM_COMMON_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_OBSERVER_H_ +#define ASH_WM_COMMON_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_OBSERVER_H_ #include "ash/ash_export.h" @@ -36,4 +36,4 @@ class ASH_EXPORT DockedWindowLayoutManagerObserver { } // namespace ash -#endif // UI_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_OBSERVER_H_ +#endif // ASH_WM_COMMON_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_OBSERVER_H_ diff --git a/ash/wm/drag_details.cc b/ash/wm/common/drag_details.cc similarity index 91% rename from ash/wm/drag_details.cc rename to ash/wm/common/drag_details.cc index 9c293bb4decbf1..1248b5cbfa9f75 100644 --- a/ash/wm/drag_details.cc +++ b/ash/wm/common/drag_details.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/drag_details.h" +#include "ash/wm/common/drag_details.h" +#include "ash/wm/common/window_resizer.h" #include "ash/wm/common/wm_window.h" -#include "ash/wm/window_resizer.h" -#include "ui/aura/window.h" #include "ui/base/hit_test.h" +#include "ui/compositor/layer.h" namespace ash { @@ -64,13 +64,11 @@ DragDetails::DragDetails(wm::WmWindow* window, window->GetWindowState()->panel_attached()) { wm::WindowState* window_state = window->GetWindowState(); if ((window_state->IsNormalOrSnapped() || window_state->IsDocked()) && - window_state->HasRestoreBounds() && - window_component == HTCAPTION) { + window_state->HasRestoreBounds() && window_component == HTCAPTION) { restore_bounds = window_state->GetRestoreBoundsInScreen(); } } -DragDetails::~DragDetails() { -} +DragDetails::~DragDetails() {} } // namespace ash diff --git a/ash/wm/drag_details.h b/ash/wm/common/drag_details.h similarity index 93% rename from ash/wm/drag_details.h rename to ash/wm/common/drag_details.h index eb52bd5ac9e807..95b7e04fbe5298 100644 --- a/ash/wm/drag_details.h +++ b/ash/wm/common/drag_details.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_DRAG_DETAILS_H_ -#define ASH_WM_DRAG_DETAILS_H_ +#ifndef ASH_WM_COMMON_DRAG_DETAILS_H_ +#define ASH_WM_COMMON_DRAG_DETAILS_H_ #include "ash/ash_export.h" #include "ash/wm/common/wm_types.h" @@ -68,4 +68,4 @@ struct ASH_EXPORT DragDetails { } // namespace ash -#endif // ASH_WM_DRAG_DETAILS_H_ +#endif // ASH_WM_COMMON_DRAG_DETAILS_H_ diff --git a/ash/wm/common/shelf/wm_shelf_observer.h b/ash/wm/common/shelf/wm_shelf_observer.h index 4aa1b4b30f8687..44d82773990d59 100644 --- a/ash/wm/common/shelf/wm_shelf_observer.h +++ b/ash/wm/common/shelf/wm_shelf_observer.h @@ -7,7 +7,7 @@ #include "ash/ash_export.h" // TODO(sky): refactor into common. -#include "ash/shelf/background_animator.h" +#include "ash/wm/common/background_animator.h" #include "ash/wm/common/shelf/wm_shelf_types.h" namespace ash { diff --git a/ash/wm/window_resizer.cc b/ash/wm/common/window_resizer.cc similarity index 86% rename from ash/wm/window_resizer.cc rename to ash/wm/common/window_resizer.cc index 70b4570976e11c..d1095a264e5cc9 100644 --- a/ash/wm/window_resizer.cc +++ b/ash/wm/common/window_resizer.cc @@ -2,14 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/wm/window_resizer.h" +#include "ash/wm/common/window_resizer.h" -#include "ash/shell_window_ids.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/wm/dock/docked_window_layout_manager.h" -#include "ash/wm/window_state.h" #include "ui/base/hit_test.h" #include "ui/base/ui_base_types.h" #include "ui/gfx/display.h" @@ -23,10 +22,8 @@ namespace { // Returns true for resize components along the right edge, where a drag in // positive x will make the window larger. bool IsRightEdge(int window_component) { - return window_component == HTTOPRIGHT || - window_component == HTRIGHT || - window_component == HTBOTTOMRIGHT || - window_component == HTGROWBOX; + return window_component == HTTOPRIGHT || window_component == HTRIGHT || + window_component == HTBOTTOMRIGHT || window_component == HTGROWBOX; } } // namespace @@ -50,8 +47,7 @@ WindowResizer::WindowResizer(wm::WindowState* window_state) DCHECK(window_state_->drag_details()); } -WindowResizer::~WindowResizer() { -} +WindowResizer::~WindowResizer() {} // static int WindowResizer::GetBoundsChangeForWindowComponent(int component) { @@ -63,7 +59,7 @@ int WindowResizer::GetBoundsChangeForWindowComponent(int component) { case HTLEFT: case HTBOTTOMLEFT: bounds_change |= WindowResizer::kBoundsChange_Repositions | - WindowResizer::kBoundsChange_Resizes; + WindowResizer::kBoundsChange_Resizes; break; case HTCAPTION: bounds_change |= WindowResizer::kBoundsChange_Repositions; @@ -89,9 +85,8 @@ int WindowResizer::GetPositionChangeDirectionForWindowComponent( case HTBOTTOMRIGHT: case HTGROWBOX: case HTCAPTION: - pos_change_direction |= - WindowResizer::kBoundsChangeDirection_Horizontal | - WindowResizer::kBoundsChangeDirection_Vertical; + pos_change_direction |= WindowResizer::kBoundsChangeDirection_Horizontal | + WindowResizer::kBoundsChangeDirection_Vertical; break; case HTTOP: case HTTOPRIGHT: @@ -164,8 +159,7 @@ gfx::Rect WindowResizer::CalculateBoundsForDrag( // Update bottom edge to stay in the work area when we are resizing // by dragging the bottom edge or corners. if (new_bounds.bottom() > work_area.bottom()) - new_bounds.Inset(0, 0, 0, - new_bounds.bottom() - work_area.bottom()); + new_bounds.Inset(0, 0, 0, new_bounds.bottom() - work_area.bottom()); } } if (details().bounds_change & kBoundsChange_Repositions && @@ -184,7 +178,7 @@ gfx::Rect WindowResizer::CalculateBoundsForDrag( // be still hit by the cursor. if (details().initial_location_in_parent.x() > details().initial_bounds_in_parent.x() + - details().restore_bounds.width()) + details().restore_bounds.width()) new_bounds.set_x(location.x() - details().restore_bounds.width() / 2); } @@ -208,10 +202,9 @@ gfx::Rect WindowResizer::CalculateBoundsForDrag( gfx::Rect new_bounds_in_screen = parent->ConvertRectToScreen(new_bounds); if (!screen_work_area.Intersects(new_bounds_in_screen)) { // Make sure that the x origin does not leave the current display. - new_bounds_in_screen.set_x( - std::max(screen_work_area.x() - new_bounds.width(), - std::min(screen_work_area.right(), - new_bounds_in_screen.x()))); + new_bounds_in_screen.set_x(std::max( + screen_work_area.x() - new_bounds.width(), + std::min(screen_work_area.right(), new_bounds_in_screen.x()))); new_bounds = parent->ConvertRectFromScreen(new_bounds_in_screen); } } @@ -221,10 +214,8 @@ gfx::Rect WindowResizer::CalculateBoundsForDrag( // static bool WindowResizer::IsBottomEdge(int window_component) { - return window_component == HTBOTTOMLEFT || - window_component == HTBOTTOM || - window_component == HTBOTTOMRIGHT || - window_component == HTGROWBOX; + return window_component == HTBOTTOMLEFT || window_component == HTBOTTOM || + window_component == HTBOTTOMRIGHT || window_component == HTGROWBOX; } void WindowResizer::AdjustDeltaForTouchResize(int* delta_x, int* delta_y) { @@ -235,19 +226,19 @@ void WindowResizer::AdjustDeltaForTouchResize(int* delta_x, int* delta_y) { if (details().size_change_direction & kBoundsChangeDirection_Horizontal) { if (IsRightEdge(details().window_component)) { *delta_x += details().initial_location_in_parent.x() - - details().initial_bounds_in_parent.right(); + details().initial_bounds_in_parent.right(); } else { *delta_x += details().initial_location_in_parent.x() - - details().initial_bounds_in_parent.x(); + details().initial_bounds_in_parent.x(); } } if (details().size_change_direction & kBoundsChangeDirection_Vertical) { if (IsBottomEdge(details().window_component)) { *delta_y += details().initial_location_in_parent.y() - - details().initial_bounds_in_parent.bottom(); + details().initial_bounds_in_parent.bottom(); } else { *delta_y += details().initial_location_in_parent.y() - - details().initial_bounds_in_parent.y(); + details().initial_bounds_in_parent.y(); } } } @@ -288,8 +279,8 @@ int WindowResizer::GetWidthForDrag(int min_width, int* delta_x) { // for the window origin computation. if (width < min_width) { width = min_width; - *delta_x = -x_multiplier * (details().initial_bounds_in_parent.width() - - min_width); + *delta_x = -x_multiplier * + (details().initial_bounds_in_parent.width() - min_width); } // And don't let the window go bigger than the display. @@ -299,8 +290,8 @@ int WindowResizer::GetWidthForDrag(int min_width, int* delta_x) { max_width = std::min(max_width, max_size.width()); if (width > max_width) { width = max_width; - *delta_x = -x_multiplier * (details().initial_bounds_in_parent.width() - - max_width); + *delta_x = -x_multiplier * + (details().initial_bounds_in_parent.width() - max_width); } } return width; @@ -317,8 +308,8 @@ int WindowResizer::GetHeightForDrag(int min_height, int* delta_y) { // for the window origin computation. if (height < min_height) { height = min_height; - *delta_y = -y_multiplier * (details().initial_bounds_in_parent.height() - - min_height); + *delta_y = -y_multiplier * + (details().initial_bounds_in_parent.height() - min_height); } // And don't let the window go bigger than the display. @@ -328,8 +319,8 @@ int WindowResizer::GetHeightForDrag(int min_height, int* delta_y) { max_height = std::min(max_height, max_size.height()); if (height > max_height) { height = max_height; - *delta_y = -y_multiplier * (details().initial_bounds_in_parent.height() - - max_height); + *delta_y = -y_multiplier * + (details().initial_bounds_in_parent.height() - max_height); } } return height; diff --git a/ash/wm/window_resizer.h b/ash/wm/common/window_resizer.h similarity index 94% rename from ash/wm/window_resizer.h rename to ash/wm/common/window_resizer.h index 45607958c473f0..34e71ef7d05569 100644 --- a/ash/wm/window_resizer.h +++ b/ash/wm/common/window_resizer.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_WM_WINDOW_RESIZER_H_ -#define ASH_WM_WINDOW_RESIZER_H_ +#ifndef ASH_WM_COMMON_WINDOW_RESIZER_H_ +#define ASH_WM_COMMON_WINDOW_RESIZER_H_ #include #include "ash/ash_export.h" -#include "ash/wm/drag_details.h" -#include "ash/wm/window_state.h" +#include "ash/wm/common/drag_details.h" +#include "ash/wm/common/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_WINDOW_RESIZER_H_ +#endif // ASH_WM_COMMON_WINDOW_RESIZER_H_ diff --git a/ash/wm/window_state.cc b/ash/wm/common/window_state.cc similarity index 95% rename from ash/wm/window_state.cc rename to ash/wm/common/window_state.cc index ed148b8bf575a7..81f069f9aba266 100644 --- a/ash/wm/window_state.cc +++ b/ash/wm/common/window_state.cc @@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/wm/window_state.h" +#include "ash/wm/common/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/wm/default_state.h" -#include "ash/wm/window_state_delegate.h" -#include "ash/wm/window_state_observer.h" #include "base/auto_reset.h" #include "ui/gfx/display.h" #include "ui/gfx/screen.h" @@ -46,8 +46,7 @@ WMEventType WMEventTypeFromShowState(ui::WindowShowState requested_show_state) { } // namespace -WindowState::~WindowState() { -} +WindowState::~WindowState() {} bool WindowState::HasDelegate() const { return !!delegate_; @@ -77,17 +76,17 @@ bool WindowState::IsFullscreen() const { bool WindowState::IsMaximizedOrFullscreen() const { return GetStateType() == WINDOW_STATE_TYPE_FULLSCREEN || - GetStateType() == WINDOW_STATE_TYPE_MAXIMIZED; + GetStateType() == WINDOW_STATE_TYPE_MAXIMIZED; } bool WindowState::IsSnapped() const { return GetStateType() == WINDOW_STATE_TYPE_LEFT_SNAPPED || - GetStateType() == WINDOW_STATE_TYPE_RIGHT_SNAPPED; + GetStateType() == WINDOW_STATE_TYPE_RIGHT_SNAPPED; } bool WindowState::IsNormalStateType() const { return GetStateType() == WINDOW_STATE_TYPE_NORMAL || - GetStateType() == WINDOW_STATE_TYPE_DEFAULT; + GetStateType() == WINDOW_STATE_TYPE_DEFAULT; } bool WindowState::IsNormalOrSnapped() const { @@ -246,8 +245,7 @@ std::unique_ptr WindowState::SetStateObject( return old_object; } -void WindowState::SetPreAutoManageWindowBounds( - const gfx::Rect& bounds) { +void WindowState::SetPreAutoManageWindowBounds(const gfx::Rect& bounds) { pre_auto_manage_window_bounds_.reset(new gfx::Rect(bounds)); } @@ -314,8 +312,7 @@ ui::WindowShowState WindowState::GetShowState() const { return window_->GetShowState(); } -void WindowState::SetBoundsInScreen( - const gfx::Rect& bounds_in_screen) { +void WindowState::SetBoundsInScreen(const gfx::Rect& bounds_in_screen) { gfx::Rect bounds_in_parent = window_->GetParent()->ConvertRectFromScreen(bounds_in_screen); window_->SetBounds(bounds_in_parent); diff --git a/ash/wm/window_state.h b/ash/wm/common/window_state.h similarity index 97% rename from ash/wm/window_state.h rename to ash/wm/common/window_state.h index 4841555f4f5003..0d33a7eef65cb2 100644 --- a/ash/wm/window_state.h +++ b/ash/wm/common/window_state.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_WM_WINDOW_STATE_H_ -#define ASH_WM_WINDOW_STATE_H_ +#ifndef ASH_WM_COMMON_WINDOW_STATE_H_ +#define ASH_WM_COMMON_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/wm/drag_details.h" #include "base/gtest_prod_util.h" #include "base/macros.h" #include "base/observer_list.h" @@ -46,7 +46,6 @@ class WmWindow; // accessing the window using |window()| is cheap. class ASH_EXPORT WindowState { public: - // A subclass of State class represents one of the window's states // that corresponds to WindowStateType in Ash environment, e.g. // maximized, minimized or side snapped, as subclass. @@ -203,17 +202,13 @@ class ASH_EXPORT WindowState { // when shown. // TODO(oshima): Consolidate this and window_position_managed // into single parameter to control the window placement. - bool minimum_visibility() const { - return minimum_visibility_; - } + bool minimum_visibility() const { return minimum_visibility_; } void set_minimum_visibility(bool minimum_visibility) { minimum_visibility_ = minimum_visibility; } // Specifies if the window can be dragged by the user via the caption or not. - bool can_be_dragged() const { - return can_be_dragged_; - } + bool can_be_dragged() const { return can_be_dragged_; } void set_can_be_dragged(bool can_be_dragged) { can_be_dragged_ = can_be_dragged; } @@ -245,9 +240,7 @@ class ASH_EXPORT WindowState { void set_bounds_changed_by_user(bool bounds_changed_by_user); // True if this window is an attached panel. - bool panel_attached() const { - return panel_attached_; - } + bool panel_attached() const { return panel_attached_; } void set_panel_attached(bool panel_attached) { panel_attached_ = panel_attached; } @@ -280,9 +273,7 @@ class ASH_EXPORT WindowState { // different from the normal fullscreen mode by allowing the user to reveal // the top portion of the window through a touch / mouse gesture. It might // also allow the shelf to be shown in some situations. - bool in_immersive_fullscreen() const { - return in_immersive_fullscreen_; - } + bool in_immersive_fullscreen() const { return in_immersive_fullscreen_; } void set_in_immersive_fullscreen(bool enable) { in_immersive_fullscreen_ = enable; } @@ -393,4 +384,4 @@ class ASH_EXPORT WindowState { } // namespace wm } // namespace ash -#endif // ASH_WM_WINDOW_STATE_H_ +#endif // ASH_WM_COMMON_WINDOW_STATE_H_ diff --git a/ash/wm/window_state_delegate.cc b/ash/wm/common/window_state_delegate.cc similarity index 74% rename from ash/wm/window_state_delegate.cc rename to ash/wm/common/window_state_delegate.cc index 71868d6da4887b..4286f61325c9bc 100644 --- a/ash/wm/window_state_delegate.cc +++ b/ash/wm/common/window_state_delegate.cc @@ -2,16 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/wm/window_state_delegate.h" +#include "ash/wm/common/window_state_delegate.h" namespace ash { namespace wm { -WindowStateDelegate::WindowStateDelegate() { -} +WindowStateDelegate::WindowStateDelegate() {} -WindowStateDelegate::~WindowStateDelegate() { -} +WindowStateDelegate::~WindowStateDelegate() {} bool WindowStateDelegate::ToggleFullscreen(WindowState* window_state) { return false; diff --git a/ash/wm/window_state_delegate.h b/ash/wm/common/window_state_delegate.h similarity index 89% rename from ash/wm/window_state_delegate.h rename to ash/wm/common/window_state_delegate.h index 7912efe8fe9a68..ee14d35db36257 100644 --- a/ash/wm/window_state_delegate.h +++ b/ash/wm/common/window_state_delegate.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_WM_WINDOW_STATE_DELEGATE_H_ -#define ASH_WM_WINDOW_STATE_DELEGATE_H_ +#ifndef ASH_WM_COMMON_WINDOW_STATE_DELEGATE_H_ +#define ASH_WM_COMMON_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_WINDOW_STATE_DELEGATE_H_ +#endif // ASH_WM_COMMON_WINDOW_STATE_DELEGATE_H_ diff --git a/ash/wm/window_state_observer.h b/ash/wm/common/window_state_observer.h similarity index 90% rename from ash/wm/window_state_observer.h rename to ash/wm/common/window_state_observer.h index e381a8cc1c8225..683773eae946fc 100644 --- a/ash/wm/window_state_observer.h +++ b/ash/wm/common/window_state_observer.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ASH_WM_WINDOW_STATE_OBSERVER_H_ -#define ASH_WM_WINDOW_STATE_OBSERVER_H_ +#ifndef ASH_WM_COMMON_WINDOW_STATE_OBSERVER_H_ +#define ASH_WM_COMMON_WINDOW_STATE_OBSERVER_H_ #include "ash/ash_export.h" #include "ash/wm/common/wm_types.h" @@ -37,4 +37,4 @@ class ASH_EXPORT WindowStateObserver { } // namespace wm } // namespace ash -#endif // ASH_WM_WINDOW_STATE_OBSERVER_H_ +#endif // ASH_WM_COMMON_WINDOW_STATE_OBSERVER_H_ diff --git a/ash/wm/common/window_state_util.cc b/ash/wm/common/window_state_util.cc index c146980b2f214d..b8f5841da0ed41 100644 --- a/ash/wm/common/window_state_util.cc +++ b/ash/wm/common/window_state_util.cc @@ -4,9 +4,9 @@ #include "ash/wm/common/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/wm/window_state.h" -#include "ash/wm/window_state_delegate.h" namespace ash { namespace wm { diff --git a/ash/wm/default_window_resizer.cc b/ash/wm/default_window_resizer.cc index cf4159522c8ebb..8e078839640c76 100644 --- a/ash/wm/default_window_resizer.cc +++ b/ash/wm/default_window_resizer.cc @@ -4,9 +4,9 @@ #include "ash/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/wm/window_state.h" namespace ash { diff --git a/ash/wm/default_window_resizer.h b/ash/wm/default_window_resizer.h index 737d705dfa2310..a302623fd701d9 100644 --- a/ash/wm/default_window_resizer.h +++ b/ash/wm/default_window_resizer.h @@ -5,7 +5,7 @@ #ifndef ASH_WM_DEFAULT_WINDOW_RESIZER_H_ #define ASH_WM_DEFAULT_WINDOW_RESIZER_H_ -#include "ash/wm/window_resizer.h" +#include "ash/wm/common/window_resizer.h" #include "base/compiler_specific.h" #include "base/macros.h" diff --git a/ash/wm/dock/docked_window_layout_manager_unittest.cc b/ash/wm/dock/docked_window_layout_manager_unittest.cc index 397b0f59195719..d71aeb24d9967e 100644 --- a/ash/wm/dock/docked_window_layout_manager_unittest.cc +++ b/ash/wm/dock/docked_window_layout_manager_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/dock/docked_window_layout_manager.h" +#include "ash/wm/common/dock/docked_window_layout_manager.h" #include "ash/ash_switches.h" #include "ash/display/display_manager.h" @@ -21,9 +21,9 @@ #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_resizer.h" +#include "ash/wm/common/window_state.h" #include "ash/wm/panels/panel_layout_manager.h" -#include "ash/wm/window_resizer.h" -#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "base/command_line.h" diff --git a/ash/wm/dock/docked_window_resizer.cc b/ash/wm/dock/docked_window_resizer.cc index e1d3d6e21f9b72..ca668d0d9d7d95 100644 --- a/ash/wm/dock/docked_window_resizer.cc +++ b/ash/wm/dock/docked_window_resizer.cc @@ -6,12 +6,12 @@ #include "ash/shell_window_ids.h" #include "ash/wm/aura/wm_window_aura.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_root_window_controller.h" #include "ash/wm/common/wm_window.h" -#include "ash/wm/dock/docked_window_layout_manager.h" -#include "ash/wm/window_state.h" #include "ash/wm/workspace/magnetism_matcher.h" #include "ui/base/hit_test.h" #include "ui/base/ui_base_types.h" diff --git a/ash/wm/dock/docked_window_resizer.h b/ash/wm/dock/docked_window_resizer.h index 8814bd79be435e..6ca599dff8bbd1 100644 --- a/ash/wm/dock/docked_window_resizer.h +++ b/ash/wm/dock/docked_window_resizer.h @@ -7,8 +7,8 @@ #include -#include "ash/wm/dock/dock_types.h" -#include "ash/wm/window_resizer.h" +#include "ash/wm/common/dock/dock_types.h" +#include "ash/wm/common/window_resizer.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "base/memory/weak_ptr.h" diff --git a/ash/wm/dock/docked_window_resizer_unittest.cc b/ash/wm/dock/docked_window_resizer_unittest.cc index 371b18f1e53958..1e8fce7c5141d5 100644 --- a/ash/wm/dock/docked_window_resizer_unittest.cc +++ b/ash/wm/dock/docked_window_resizer_unittest.cc @@ -20,11 +20,11 @@ #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/window_state.h" #include "ash/wm/common/wm_event.h" -#include "ash/wm/dock/docked_window_layout_manager.h" #include "ash/wm/drag_window_resizer.h" #include "ash/wm/panels/panel_layout_manager.h" -#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "base/command_line.h" diff --git a/ash/wm/drag_window_resizer.cc b/ash/wm/drag_window_resizer.cc index 12e7426701f17f..23a1bcd20a7e69 100644 --- a/ash/wm/drag_window_resizer.cc +++ b/ash/wm/drag_window_resizer.cc @@ -9,8 +9,8 @@ #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_state.h" #include "ash/wm/window_util.h" #include "base/memory/weak_ptr.h" #include "ui/aura/client/aura_constants.h" diff --git a/ash/wm/drag_window_resizer.h b/ash/wm/drag_window_resizer.h index 83b922b1ff549b..c69aa06f87e988 100644 --- a/ash/wm/drag_window_resizer.h +++ b/ash/wm/drag_window_resizer.h @@ -7,7 +7,7 @@ #include -#include "ash/wm/window_resizer.h" +#include "ash/wm/common/window_resizer.h" #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" #include "base/macros.h" diff --git a/ash/wm/gestures/shelf_gesture_handler.cc b/ash/wm/gestures/shelf_gesture_handler.cc index f8091357f46ed0..85e5117cd6316e 100644 --- a/ash/wm/gestures/shelf_gesture_handler.cc +++ b/ash/wm/gestures/shelf_gesture_handler.cc @@ -11,7 +11,7 @@ #include "ash/shelf/shelf_widget.h" #include "ash/shell.h" #include "ash/system/status_area_widget.h" -#include "ash/wm/window_state.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 cae365271e8755..3dd8b2310344e1 100644 --- a/ash/wm/immersive_fullscreen_controller.cc +++ b/ash/wm/immersive_fullscreen_controller.cc @@ -8,8 +8,8 @@ #include "ash/ash_constants.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.h" #include "ash/wm/window_state_aura.h" #include "base/metrics/histogram.h" #include "ui/aura/client/aura_constants.h" diff --git a/ash/wm/immersive_fullscreen_controller_unittest.cc b/ash/wm/immersive_fullscreen_controller_unittest.cc index 663eec257c5f8d..0d22cfb158b654 100644 --- a/ash/wm/immersive_fullscreen_controller_unittest.cc +++ b/ash/wm/immersive_fullscreen_controller_unittest.cc @@ -12,7 +12,7 @@ #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/test/display_manager_test_api.h" -#include "ash/wm/window_state.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 735d1f524497f0..520ed817d1fa44 100644 --- a/ash/wm/lock_layout_manager.cc +++ b/ash/wm/lock_layout_manager.cc @@ -6,9 +6,9 @@ #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.h" #include "ash/wm/window_state_aura.h" #include "ui/aura/window.h" #include "ui/aura/window_observer.h" diff --git a/ash/wm/lock_layout_manager_unittest.cc b/ash/wm/lock_layout_manager_unittest.cc index a92b61f33aa46c..97c6283d3e2651 100644 --- a/ash/wm/lock_layout_manager_unittest.cc +++ b/ash/wm/lock_layout_manager_unittest.cc @@ -8,7 +8,7 @@ #include "ash/shell.h" #include "ash/shell_window_ids.h" #include "ash/test/ash_test_base.h" -#include "ash/wm/window_state.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 9398d51177e81e..8f25465df8b1ba 100644 --- a/ash/wm/lock_window_state.cc +++ b/ash/wm/lock_window_state.cc @@ -11,13 +11,13 @@ #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.h" #include "ash/wm/window_state_aura.h" -#include "ash/wm/window_state_delegate.h" #include "ash/wm/window_util.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" diff --git a/ash/wm/lock_window_state.h b/ash/wm/lock_window_state.h index 71de81bd984fd2..00df2a92e1ca7a 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/window_state.h" +#include "ash/wm/common/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 5630a1f19c80f5..b85165a8bde09c 100644 --- a/ash/wm/maximize_mode/maximize_mode_window_manager.cc +++ b/ash/wm/maximize_mode/maximize_mode_window_manager.cc @@ -8,12 +8,12 @@ #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/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" #include "ash/wm/overview/window_selector_controller.h" -#include "ash/wm/window_state.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/maximize_mode/maximize_mode_window_manager.h b/ash/wm/maximize_mode/maximize_mode_window_manager.h index 49adced975e818..40202f40b45eec 100644 --- a/ash/wm/maximize_mode/maximize_mode_window_manager.h +++ b/ash/wm/maximize_mode/maximize_mode_window_manager.h @@ -12,7 +12,7 @@ #include "ash/ash_export.h" #include "ash/shell_observer.h" -#include "ash/wm/window_state.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 4fdc8e787aef89..173c003d279829 100644 --- a/ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc +++ b/ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc @@ -13,12 +13,12 @@ #include "ash/switchable_windows.h" #include "ash/test/ash_test_base.h" #include "ash/test/shell_test_api.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" #include "ash/wm/window_properties.h" -#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "base/strings/stringprintf.h" diff --git a/ash/wm/maximize_mode/maximize_mode_window_state.cc b/ash/wm/maximize_mode/maximize_mode_window_state.cc index c56f11e492ba8f..1d8f086ac1452f 100644 --- a/ash/wm/maximize_mode/maximize_mode_window_state.cc +++ b/ash/wm/maximize_mode/maximize_mode_window_state.cc @@ -11,6 +11,7 @@ #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" @@ -18,7 +19,6 @@ #include "ash/wm/window_animations.h" #include "ash/wm/window_properties.h" #include "ash/wm/window_state_aura.h" -#include "ash/wm/window_state_delegate.h" #include "ash/wm/window_util.h" #include "ash/wm/workspace/workspace_window_resizer.h" #include "ui/aura/client/aura_constants.h" diff --git a/ash/wm/maximize_mode/maximize_mode_window_state.h b/ash/wm/maximize_mode/maximize_mode_window_state.h index 6b7ee39fd61040..fe13c363561993 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/window_state.h" +#include "ash/wm/common/window_state.h" #include "base/macros.h" namespace ash { diff --git a/ash/wm/mru_window_tracker.cc b/ash/wm/mru_window_tracker.cc index 00e17733138842..02ce46f803ca56 100644 --- a/ash/wm/mru_window_tracker.cc +++ b/ash/wm/mru_window_tracker.cc @@ -11,7 +11,7 @@ #include "ash/shell_window_ids.h" #include "ash/switchable_windows.h" #include "ash/wm/ash_focus_rules.h" -#include "ash/wm/window_state.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 279a7f986a3939..3823b1acf8cbff 100644 --- a/ash/wm/mru_window_tracker_unittest.cc +++ b/ash/wm/mru_window_tracker_unittest.cc @@ -6,8 +6,8 @@ #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.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "base/compiler_specific.h" diff --git a/ash/wm/overview/scoped_transform_overview_window.cc b/ash/wm/overview/scoped_transform_overview_window.cc index da6000bbe642ad..f6beca616e4168 100644 --- a/ash/wm/overview/scoped_transform_overview_window.cc +++ b/ash/wm/overview/scoped_transform_overview_window.cc @@ -9,9 +9,9 @@ #include "ash/screen_util.h" #include "ash/shell_window_ids.h" +#include "ash/wm/common/window_state.h" #include "ash/wm/overview/scoped_overview_animation_settings.h" #include "ash/wm/overview/window_selector_item.h" -#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "base/macros.h" diff --git a/ash/wm/overview/window_grid.cc b/ash/wm/overview/window_grid.cc index 0058aa9e9a2a4c..f7928ed6ace2a2 100644 --- a/ash/wm/overview/window_grid.cc +++ b/ash/wm/overview/window_grid.cc @@ -14,10 +14,10 @@ #include "ash/screen_util.h" #include "ash/shell.h" #include "ash/shell_window_ids.h" +#include "ash/wm/common/window_state.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" -#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "base/command_line.h" #include "base/i18n/string_search.h" diff --git a/ash/wm/overview/window_selector.cc b/ash/wm/overview/window_selector.cc index ac6cf83b9b0d26..0883531b84f706 100644 --- a/ash/wm/overview/window_selector.cc +++ b/ash/wm/overview/window_selector.cc @@ -18,12 +18,12 @@ #include "ash/shell_window_ids.h" #include "ash/switchable_windows.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/overview/window_grid.h" #include "ash/wm/overview/window_selector_delegate.h" #include "ash/wm/overview/window_selector_item.h" #include "ash/wm/panels/panel_layout_manager.h" -#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "base/auto_reset.h" diff --git a/ash/wm/overview/window_selector_controller.cc b/ash/wm/overview/window_selector_controller.cc index 73b9c148146c11..b7d4ba9bcb8c46 100644 --- a/ash/wm/overview/window_selector_controller.cc +++ b/ash/wm/overview/window_selector_controller.cc @@ -11,9 +11,9 @@ #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/mru_window_tracker.h" #include "ash/wm/overview/window_selector.h" -#include "ash/wm/window_state.h" #include "ash/wm/window_util.h" #include "base/metrics/histogram.h" #include "ui/aura/window.h" diff --git a/ash/wm/overview/window_selector_item.cc b/ash/wm/overview/window_selector_item.cc index 394d02cc0fe5e5..1ef8651d8fd783 100644 --- a/ash/wm/overview/window_selector_item.cc +++ b/ash/wm/overview/window_selector_item.cc @@ -10,12 +10,12 @@ #include "ash/screen_util.h" #include "ash/shell.h" #include "ash/shell_window_ids.h" +#include "ash/wm/common/window_state.h" #include "ash/wm/overview/overview_animation_type.h" #include "ash/wm/overview/scoped_overview_animation_settings.h" #include "ash/wm/overview/scoped_transform_overview_window.h" #include "ash/wm/overview/window_selector.h" #include "ash/wm/overview/window_selector_controller.h" -#include "ash/wm/window_state.h" #include "base/auto_reset.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" diff --git a/ash/wm/overview/window_selector_unittest.cc b/ash/wm/overview/window_selector_unittest.cc index 714072df1b2472..3fcdad1e4df64e 100644 --- a/ash/wm/overview/window_selector_unittest.cc +++ b/ash/wm/overview/window_selector_unittest.cc @@ -21,6 +21,7 @@ #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/maximize_mode/maximize_mode_controller.h" #include "ash/wm/mru_window_tracker.h" @@ -29,7 +30,6 @@ #include "ash/wm/overview/window_selector_controller.h" #include "ash/wm/overview/window_selector_item.h" #include "ash/wm/panels/panel_layout_manager.h" -#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "base/command_line.h" diff --git a/ash/wm/panels/panel_layout_manager.cc b/ash/wm/panels/panel_layout_manager.cc index 47a4b9e259d928..5d18d250b382be 100644 --- a/ash/wm/panels/panel_layout_manager.cc +++ b/ash/wm/panels/panel_layout_manager.cc @@ -18,13 +18,13 @@ #include "ash/wm/aura/wm_window_aura.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_root_window_controller.h" #include "ash/wm/common/wm_window.h" #include "ash/wm/common/wm_window_property.h" #include "ash/wm/overview/window_selector_controller.h" #include "ash/wm/window_animations.h" -#include "ash/wm/window_state.h" #include "base/auto_reset.h" #include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkPaint.h" diff --git a/ash/wm/panels/panel_layout_manager.h b/ash/wm/panels/panel_layout_manager.h index 6c58551ae7d7cf..34ef96be559619 100644 --- a/ash/wm/panels/panel_layout_manager.h +++ b/ash/wm/panels/panel_layout_manager.h @@ -12,6 +12,7 @@ #include "ash/shelf/shelf_icon_observer.h" #include "ash/shelf/shelf_layout_manager_observer.h" #include "ash/shell_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" @@ -19,7 +20,6 @@ #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/wm/window_state_observer.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "base/memory/weak_ptr.h" diff --git a/ash/wm/panels/panel_layout_manager_unittest.cc b/ash/wm/panels/panel_layout_manager_unittest.cc index 70a8dcda7c45a4..7104a48b0b108f 100644 --- a/ash/wm/panels/panel_layout_manager_unittest.cc +++ b/ash/wm/panels/panel_layout_manager_unittest.cc @@ -22,8 +22,8 @@ #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.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "base/command_line.h" diff --git a/ash/wm/panels/panel_window_event_handler.cc b/ash/wm/panels/panel_window_event_handler.cc index d48dc3d24b5714..026b334348e27b 100644 --- a/ash/wm/panels/panel_window_event_handler.cc +++ b/ash/wm/panels/panel_window_event_handler.cc @@ -6,7 +6,7 @@ #include "ash/metrics/user_metrics_recorder.h" #include "ash/shell.h" -#include "ash/wm/window_state.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.cc b/ash/wm/panels/panel_window_resizer.cc index bf0fd3070a9878..8d5643a635acc1 100644 --- a/ash/wm/panels/panel_window_resizer.cc +++ b/ash/wm/panels/panel_window_resizer.cc @@ -10,10 +10,10 @@ #include "ash/shell_window_ids.h" #include "ash/wm/aura/wm_window_aura.h" #include "ash/wm/common/window_parenting_utils.h" +#include "ash/wm/common/window_state.h" #include "ash/wm/common/wm_root_window_controller.h" #include "ash/wm/common/wm_window.h" #include "ash/wm/panels/panel_layout_manager.h" -#include "ash/wm/window_state.h" #include "ui/base/hit_test.h" #include "ui/base/ui_base_types.h" #include "ui/gfx/screen.h" diff --git a/ash/wm/panels/panel_window_resizer.h b/ash/wm/panels/panel_window_resizer.h index 3ac49340c6bd58..9a6b167a862ac4 100644 --- a/ash/wm/panels/panel_window_resizer.h +++ b/ash/wm/panels/panel_window_resizer.h @@ -7,7 +7,7 @@ #include -#include "ash/wm/window_resizer.h" +#include "ash/wm/common/window_resizer.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "base/memory/weak_ptr.h" diff --git a/ash/wm/panels/panel_window_resizer_unittest.cc b/ash/wm/panels/panel_window_resizer_unittest.cc index bbc59e9977c949..d5d739126dc8cd 100644 --- a/ash/wm/panels/panel_window_resizer_unittest.cc +++ b/ash/wm/panels/panel_window_resizer_unittest.cc @@ -18,9 +18,9 @@ #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.h" #include "ash/wm/window_state_aura.h" #include "base/i18n/rtl.h" #include "base/win/windows_version.h" diff --git a/ash/wm/resize_handle_window_targeter.cc b/ash/wm/resize_handle_window_targeter.cc index a4e01d6c0cfce4..acb8244e7d1bc6 100644 --- a/ash/wm/resize_handle_window_targeter.cc +++ b/ash/wm/resize_handle_window_targeter.cc @@ -5,8 +5,8 @@ #include "ash/wm/resize_handle_window_targeter.h" #include "ash/ash_constants.h" +#include "ash/wm/common/window_state.h" #include "ash/wm/immersive_fullscreen_controller.h" -#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ui/aura/window.h" #include "ui/events/event.h" diff --git a/ash/wm/resize_handle_window_targeter.h b/ash/wm/resize_handle_window_targeter.h index eec693089f6332..2ddcd9b87702fb 100644 --- a/ash/wm/resize_handle_window_targeter.h +++ b/ash/wm/resize_handle_window_targeter.h @@ -5,7 +5,7 @@ #ifndef ASH_WM_RESIZE_HANDLE_WINDOW_TARGETER_H_ #define ASH_WM_RESIZE_HANDLE_WINDOW_TARGETER_H_ -#include "ash/wm/window_state_observer.h" +#include "ash/wm/common/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 8077ed0e2ad6a3..62a2419af10d23 100644 --- a/ash/wm/resize_shadow_and_cursor_unittest.cc +++ b/ash/wm/resize_shadow_and_cursor_unittest.cc @@ -7,9 +7,9 @@ #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.h" #include "ash/wm/window_state_aura.h" #include "base/bind.h" #include "ui/aura/window_event_dispatcher.h" diff --git a/ash/wm/stacking_controller.cc b/ash/wm/stacking_controller.cc index e5626944ebf7cd..9082da69abcbe2 100644 --- a/ash/wm/stacking_controller.cc +++ b/ash/wm/stacking_controller.cc @@ -11,7 +11,7 @@ #include "ash/wm/always_on_top_controller.h" #include "ash/wm/aura/wm_window_aura.h" #include "ash/wm/common/root_window_finder.h" -#include "ash/wm/window_state.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/window.h" diff --git a/ash/wm/system_gesture_event_filter_unittest.cc b/ash/wm/system_gesture_event_filter_unittest.cc index 76aaaebf13ac9e..ee331ad1d0a61d 100644 --- a/ash/wm/system_gesture_event_filter_unittest.cc +++ b/ash/wm/system_gesture_event_filter_unittest.cc @@ -18,7 +18,7 @@ #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/window_state.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.cc b/ash/wm/toplevel_window_event_handler.cc index aa66d736a51065..67267576230b70 100644 --- a/ash/wm/toplevel_window_event_handler.cc +++ b/ash/wm/toplevel_window_event_handler.cc @@ -6,13 +6,13 @@ #include "ash/shell.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/common/window_state_observer.h" #include "ash/wm/common/wm_event.h" #include "ash/wm/common/wm_window_observer.h" #include "ash/wm/resize_shadow_controller.h" -#include "ash/wm/window_resizer.h" -#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" -#include "ash/wm/window_state_observer.h" #include "ash/wm/window_util.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" diff --git a/ash/wm/toplevel_window_event_handler_unittest.cc b/ash/wm/toplevel_window_event_handler_unittest.cc index b2bb6112d17718..a4fc5ce2764198 100644 --- a/ash/wm/toplevel_window_event_handler_unittest.cc +++ b/ash/wm/toplevel_window_event_handler_unittest.cc @@ -8,9 +8,9 @@ #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.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/video_detector.cc b/ash/wm/video_detector.cc index a0ce20bf90ff60..2617f2ab36a382 100644 --- a/ash/wm/video_detector.cc +++ b/ash/wm/video_detector.cc @@ -6,7 +6,7 @@ #include "ash/shell.h" #include "ash/shell_window_ids.h" -#include "ash/wm/window_state.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 5ccfe9c1c2c6a3..b4523aa4871274 100644 --- a/ash/wm/video_detector_unittest.cc +++ b/ash/wm/video_detector_unittest.cc @@ -8,8 +8,8 @@ #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.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_unittest.cc b/ash/wm/window_animations_unittest.cc index 3af7aee4038b6c..5ec509a5a4f473 100644 --- a/ash/wm/window_animations_unittest.cc +++ b/ash/wm/window_animations_unittest.cc @@ -7,7 +7,7 @@ #include "ash/shell_window_ids.h" #include "ash/test/ash_test_base.h" #include "ash/wm/common/window_animation_types.h" -#include "ash/wm/window_state.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 d34115578fb022..ac3110df7acc6f 100644 --- a/ash/wm/window_cycle_controller_unittest.cc +++ b/ash/wm/window_cycle_controller_unittest.cc @@ -17,8 +17,8 @@ #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.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "ui/aura/client/aura_constants.h" diff --git a/ash/wm/window_cycle_list.cc b/ash/wm/window_cycle_list.cc index b5667bbe5d7d6b..6b10c449f8a50f 100644 --- a/ash/wm/window_cycle_list.cc +++ b/ash/wm/window_cycle_list.cc @@ -5,9 +5,9 @@ #include "ash/wm/window_cycle_list.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.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "ui/aura/window.h" diff --git a/ash/wm/window_positioner.cc b/ash/wm/window_positioner.cc index 1b295499a3670e..499fbf70a78ab0 100644 --- a/ash/wm/window_positioner.cc +++ b/ash/wm/window_positioner.cc @@ -5,10 +5,10 @@ #include "ash/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/wm/window_state.h" #include "ui/compositor/layer.h" #include "ui/gfx/geometry/insets.h" #include "ui/gfx/screen.h" diff --git a/ash/wm/window_positioner_unittest.cc b/ash/wm/window_positioner_unittest.cc index 705f011204e2f3..02bf201526e9e9 100644 --- a/ash/wm/window_positioner_unittest.cc +++ b/ash/wm/window_positioner_unittest.cc @@ -10,8 +10,8 @@ #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_state.h" #include "ash/wm/window_positioner.h" -#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "base/strings/string_number_conversions.h" #include "ui/aura/window_event_dispatcher.h" diff --git a/ash/wm/window_properties.cc b/ash/wm/window_properties.cc index f7c8b5666a3a15..f62734be9573b1 100644 --- a/ash/wm/window_properties.cc +++ b/ash/wm/window_properties.cc @@ -4,7 +4,7 @@ #include "ash/wm/window_properties.h" -#include "ash/wm/window_state.h" +#include "ash/wm/common/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 ce3e03f41285b0..9bd2b3a993cd4a 100644 --- a/ash/wm/window_state_aura.cc +++ b/ash/wm/window_state_aura.cc @@ -5,8 +5,8 @@ #include "ash/wm/window_state_aura.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_state.h" #include "ash/wm/window_util.h" #include "ui/aura/window.h" diff --git a/ash/wm/window_state_unittest.cc b/ash/wm/window_state_unittest.cc index 64898ed9852263..57656cc83c96d9 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/window_state.h" +#include "ash/wm/common/window_state.h" #include #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.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 c8e5f76041080b..99241a7d77a9a2 100644 --- a/ash/wm/window_util.cc +++ b/ash/wm/window_util.cc @@ -11,11 +11,11 @@ #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.h" #include "ash/wm/window_state_aura.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/window.h" diff --git a/ash/wm/window_util_unittest.cc b/ash/wm/window_util_unittest.cc index f4dc7ece1f8ad6..daf56edd8e40c6 100644 --- a/ash/wm/window_util_unittest.cc +++ b/ash/wm/window_util_unittest.cc @@ -7,7 +7,7 @@ #include "ash/screen_util.h" #include "ash/test/ash_test_base.h" #include "ash/wm/common/window_positioning_utils.h" -#include "ash/wm/window_state.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/workspace_event_handler.cc b/ash/wm/workspace/workspace_event_handler.cc index e6f98e1b336a69..508801cdf0de60 100644 --- a/ash/wm/workspace/workspace_event_handler.cc +++ b/ash/wm/workspace/workspace_event_handler.cc @@ -7,9 +7,9 @@ #include "ash/metrics/user_metrics_recorder.h" #include "ash/shell.h" #include "ash/touch/touch_uma.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.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_unittest.cc b/ash/wm/workspace/workspace_event_handler_unittest.cc index 2e12a085eb8506..419ee6ed378663 100644 --- a/ash/wm/workspace/workspace_event_handler_unittest.cc +++ b/ash/wm/workspace/workspace_event_handler_unittest.cc @@ -7,8 +7,8 @@ #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.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.cc b/ash/wm/workspace/workspace_layout_manager.cc index 3e4199cd57fca2..3f5c3db2abddf5 100644 --- a/ash/wm/workspace/workspace_layout_manager.cc +++ b/ash/wm/workspace/workspace_layout_manager.cc @@ -12,12 +12,12 @@ #include "ash/shell.h" #include "ash/wm/always_on_top_controller.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_layout_manager_delegate.h" #include "ash/wm/window_animations.h" #include "ash/wm/window_positioner.h" #include "ash/wm/window_properties.h" -#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "ash/wm/workspace/workspace_layout_manager_backdrop_delegate.h" diff --git a/ash/wm/workspace/workspace_layout_manager.h b/ash/wm/workspace/workspace_layout_manager.h index b5881a5f4e4a2e..ade263721bc930 100644 --- a/ash/wm/workspace/workspace_layout_manager.h +++ b/ash/wm/workspace/workspace_layout_manager.h @@ -10,8 +10,8 @@ #include "ash/ash_export.h" #include "ash/shell_observer.h" +#include "ash/wm/common/window_state_observer.h" #include "ash/wm/common/wm_types.h" -#include "ash/wm/window_state_observer.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "ui/aura/layout_manager.h" diff --git a/ash/wm/workspace/workspace_layout_manager_unittest.cc b/ash/wm/workspace/workspace_layout_manager_unittest.cc index 1e351d0d9bb687..b923e9a3f1810b 100644 --- a/ash/wm/workspace/workspace_layout_manager_unittest.cc +++ b/ash/wm/workspace/workspace_layout_manager_unittest.cc @@ -18,9 +18,9 @@ #include "ash/shell_window_ids.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/common/wm_event.h" #include "ash/wm/maximize_mode/workspace_backdrop_delegate.h" -#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "ash/wm/workspace/workspace_window_resizer.h" diff --git a/ash/wm/workspace/workspace_window_resizer.cc b/ash/wm/workspace/workspace_window_resizer.cc index 8297ff8d2e48fd..95d4bcbaab81a8 100644 --- a/ash/wm/workspace/workspace_window_resizer.cc +++ b/ash/wm/workspace/workspace_window_resizer.cc @@ -11,18 +11,18 @@ #include "ash/metrics/user_metrics_recorder.h" #include "ash/shell_window_ids.h" +#include "ash/wm/common/dock/docked_window_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/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/default_window_resizer.h" -#include "ash/wm/dock/docked_window_layout_manager.h" #include "ash/wm/dock/docked_window_resizer.h" #include "ash/wm/drag_window_resizer.h" #include "ash/wm/panels/panel_window_resizer.h" -#include "ash/wm/window_state.h" #include "ash/wm/workspace/phantom_window_controller.h" #include "ash/wm/workspace/two_step_edge_cycler.h" #include "base/memory/ptr_util.h" diff --git a/ash/wm/workspace/workspace_window_resizer.h b/ash/wm/workspace/workspace_window_resizer.h index a08a275d18d8af..9f0034413de85e 100644 --- a/ash/wm/workspace/workspace_window_resizer.h +++ b/ash/wm/workspace/workspace_window_resizer.h @@ -10,8 +10,8 @@ #include #include +#include "ash/wm/common/window_resizer.h" #include "ash/wm/common/wm_window_tracker.h" -#include "ash/wm/window_resizer.h" #include "ash/wm/workspace/magnetism_matcher.h" #include "base/compiler_specific.h" #include "base/macros.h" diff --git a/ash/wm/workspace/workspace_window_resizer_unittest.cc b/ash/wm/workspace/workspace_window_resizer_unittest.cc index 8b254b2fc0ae1c..10e002a3f421f4 100644 --- a/ash/wm/workspace/workspace_window_resizer_unittest.cc +++ b/ash/wm/workspace/workspace_window_resizer_unittest.cc @@ -14,8 +14,8 @@ #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/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "ash/wm/workspace/phantom_window_controller.h" diff --git a/ash/wm/workspace_controller.cc b/ash/wm/workspace_controller.cc index 7f8fc587c9777f..4bb8cc7e76a8d6 100644 --- a/ash/wm/workspace_controller.cc +++ b/ash/wm/workspace_controller.cc @@ -10,9 +10,9 @@ #include "ash/shelf/shelf_layout_manager.h" #include "ash/shell.h" #include "ash/shell_window_ids.h" +#include "ash/wm/common/window_state.h" #include "ash/wm/common/workspace/workspace_layout_manager_delegate.h" #include "ash/wm/window_animations.h" -#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "ash/wm/workspace/workspace_event_handler.h" diff --git a/ash/wm/workspace_controller_unittest.cc b/ash/wm/workspace_controller_unittest.cc index 8d38b19b9cc804..ee4af3aae28b05 100644 --- a/ash/wm/workspace_controller_unittest.cc +++ b/ash/wm/workspace_controller_unittest.cc @@ -17,8 +17,8 @@ #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/panels/panel_layout_manager.h" -#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "ash/wm/workspace/workspace_window_resizer.h" diff --git a/chrome/browser/chromeos/events/event_rewriter.cc b/chrome/browser/chromeos/events/event_rewriter.cc index a8f0d1e0f91366..f2ef9b2e0f9124 100644 --- a/chrome/browser/chromeos/events/event_rewriter.cc +++ b/chrome/browser/chromeos/events/event_rewriter.cc @@ -9,7 +9,7 @@ #include #include "ash/sticky_keys/sticky_keys_controller.h" -#include "ash/wm/window_state.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 263ff680e0554c..21942f7aa4af0b 100644 --- a/chrome/browser/chromeos/events/event_rewriter_unittest.cc +++ b/chrome/browser/chromeos/events/event_rewriter_unittest.cc @@ -10,7 +10,7 @@ #include "ash/sticky_keys/sticky_keys_controller.h" #include "ash/sticky_keys/sticky_keys_overlay.h" #include "ash/test/ash_test_base.h" -#include "ash/wm/window_state.h" +#include "ash/wm/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 6555895f05ac07..bd994d5b8b87be 100644 --- a/chrome/browser/chromeos/extensions/wallpaper_private_api.cc +++ b/chrome/browser/chromeos/extensions/wallpaper_private_api.cc @@ -13,8 +13,8 @@ #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.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "base/command_line.h" diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc index 0e41ca5aebf6f2..7045215ec8e026 100644 --- a/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc +++ b/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc @@ -10,7 +10,7 @@ #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/window_state.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 2bb5765e137b45..866c04530c4a2b 100644 --- a/chrome/browser/chromeos/login/lock/screen_locker.cc +++ b/chrome/browser/chromeos/login/lock/screen_locker.cc @@ -11,9 +11,9 @@ #include "ash/audio/sounds.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.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "base/bind.h" diff --git a/chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc b/chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc index 5f2c43cbfc0f24..62ddbb7933a2e3 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/window_state.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/notifications/fullscreen_notification_blocker.cc b/chrome/browser/notifications/fullscreen_notification_blocker.cc index 094e72f9d047b1..ccf672ae8ff62c 100644 --- a/chrome/browser/notifications/fullscreen_notification_blocker.cc +++ b/chrome/browser/notifications/fullscreen_notification_blocker.cc @@ -13,7 +13,7 @@ #include "ash/root_window_controller.h" #include "ash/shell.h" #include "ash/system/system_notifier.h" -#include "ash/wm/window_state.h" +#include "ash/wm/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 5ae2ede28c625a..32aca06930f7f6 100644 --- a/chrome/browser/ui/ash/accelerator_commands_browsertest.cc +++ b/chrome/browser/ui/ash/accelerator_commands_browsertest.cc @@ -7,7 +7,7 @@ #include "ash/ash_switches.h" #include "ash/shell.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/window_state.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 cec6463bbe210d..fcb920e984975b 100644 --- a/chrome/browser/ui/ash/accelerator_controller_browsertest.cc +++ b/chrome/browser/ui/ash/accelerator_controller_browsertest.cc @@ -5,7 +5,7 @@ #include "ash/accelerators/accelerator_controller.h" #include "ash/shell.h" -#include "ash/wm/window_state.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 6d60f3ebfd3668..7ea5b6089ac539 100644 --- a/chrome/browser/ui/ash/chrome_shell_delegate.cc +++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc @@ -8,7 +8,7 @@ #include "ash/content/gpu_support_impl.h" #include "ash/session/session_state_delegate.h" -#include "ash/wm/window_state.h" +#include "ash/wm/common/window_state.h" #include "ash/wm/window_util.h" #include "build/build_config.h" #include "chrome/browser/app_mode/app_mode_utils.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 af5321e305de91..057118dc8a2eac 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc @@ -17,7 +17,7 @@ #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/window_state.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 636fc209dbfbba..dd4983da4f142f 100644 --- a/chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.cc +++ b/chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.h" -#include "ash/wm/window_state.h" +#include "ash/wm/common/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 bbd86709c4b7c0..9a21e1dc99fee2 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 @@ -13,8 +13,8 @@ #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.h" #include "ash/wm/window_state_aura.h" #include "base/auto_reset.h" #include "base/macros.h" diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc index d430d25d15fe39..28950d576cc82d 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 @@ -13,11 +13,11 @@ #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" -#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "base/command_line.h" diff --git a/chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc b/chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc index d99771611e4306..098f82075a0ce3 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 @@ -9,9 +9,9 @@ #include "ash/shelf/shelf_layout_manager.h" #include "ash/shelf/shelf_widget.h" #include "ash/shell.h" +#include "ash/wm/common/window_state.h" #include "ash/wm/mru_window_tracker.h" #include "ash/wm/window_positioner.h" -#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ash/wm/window_util.h" #include "base/macros.h" diff --git a/chrome/browser/ui/ash/window_positioner_unittest.cc b/chrome/browser/ui/ash/window_positioner_unittest.cc index 1c00b0cd026556..d37bd8d4e23fcd 100644 --- a/chrome/browser/ui/ash/window_positioner_unittest.cc +++ b/chrome/browser/ui/ash/window_positioner_unittest.cc @@ -9,7 +9,7 @@ #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/window_resizer.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 fbf4a7bba48cc7..2a69c9d559d472 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 @@ -11,13 +11,13 @@ #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" -#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" -#include "ash/wm/window_state_delegate.h" -#include "ash/wm/window_state_observer.h" #include "chrome/browser/ui/ash/ash_util.h" #include "chrome/browser/ui/ash/multi_user/multi_user_context_menu.h" #include "ui/aura/client/aura_constants.h" diff --git a/chrome/browser/ui/views/chrome_views_delegate.cc b/chrome/browser/ui/views/chrome_views_delegate.cc index 8bc0f6edb9aabf..2c9a6a929c255d 100644 --- a/chrome/browser/ui/views/chrome_views_delegate.cc +++ b/chrome/browser/ui/views/chrome_views_delegate.cc @@ -58,7 +58,7 @@ #if defined(USE_ASH) #include "ash/accelerators/accelerator_controller.h" #include "ash/shell.h" -#include "ash/wm/window_state.h" +#include "ash/wm/common/window_state.h" #include "ash/wm/window_state_aura.h" #include "chrome/browser/ui/ash/ash_init.h" #include "chrome/browser/ui/ash/ash_util.h" diff --git a/chrome/browser/ui/views/frame/browser_frame_ash.cc b/chrome/browser/ui/views/frame/browser_frame_ash.cc index c940c57357787f..e38d9bd0e70a1b 100644 --- a/chrome/browser/ui/views/frame/browser_frame_ash.cc +++ b/chrome/browser/ui/views/frame/browser_frame_ash.cc @@ -5,10 +5,10 @@ #include "chrome/browser/ui/views/frame/browser_frame_ash.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.h" #include "ash/wm/window_state_aura.h" -#include "ash/wm/window_state_delegate.h" #include "ash/wm/window_util.h" #include "base/macros.h" #include "build/build_config.h" diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc b/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc index 7e24b71712ce7e..e7cd616d5049fd 100644 --- a/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc +++ b/chrome/browser/ui/views/frame/immersive_mode_controller_ash.cc @@ -5,8 +5,8 @@ #include "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h" #include "ash/shell.h" +#include "ash/wm/common/window_state.h" #include "ash/wm/immersive_revealed_lock.h" -#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "base/macros.h" #include "chrome/browser/chrome_notification_types.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 6ced3a6984570a..545a869b726527 100644 --- a/chrome/browser/ui/views/frame/immersive_mode_controller_ash.h +++ b/chrome/browser/ui/views/frame/immersive_mode_controller_ash.h @@ -7,8 +7,8 @@ #include +#include "ash/wm/common/window_state_observer.h" #include "ash/wm/immersive_fullscreen_controller.h" -#include "ash/wm/window_state_observer.h" #include "base/macros.h" #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/ui/views/status_bubble_views.cc b/chrome/browser/ui/views/status_bubble_views.cc index 2eded6301649ba..24504b15a1ec54 100644 --- a/chrome/browser/ui/views/status_bubble_views.cc +++ b/chrome/browser/ui/views/status_bubble_views.cc @@ -38,7 +38,7 @@ #include "url/gurl.h" #if defined(USE_ASH) -#include "ash/wm/window_state.h" +#include "ash/wm/common/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 e2d6d410bfc322..3c847896e7458e 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/shell.h" +#include "ash/wm/common/window_state.h" #include "ash/wm/maximize_mode/maximize_mode_controller.h" -#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "ui/wm/core/coordinate_conversion.h" #endif diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc index b720a775c0887a..fb85ed550f3eed 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 @@ -59,7 +59,7 @@ #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/window_state.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/window_sizer/window_sizer_ash.cc b/chrome/browser/ui/window_sizer/window_sizer_ash.cc index cfe292a08db461..be9211fa79b537 100644 --- a/chrome/browser/ui/window_sizer/window_sizer_ash.cc +++ b/chrome/browser/ui/window_sizer/window_sizer_ash.cc @@ -6,8 +6,8 @@ #include "ash/shell.h" #include "ash/wm/aura/wm_window_aura.h" +#include "ash/wm/common/window_state.h" #include "ash/wm/window_positioner.h" -#include "ash/wm/window_state.h" #include "chrome/browser/ui/ash/ash_util.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" diff --git a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc index 6ba5b8df026519..24790a8f49da73 100644 --- a/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc +++ b/chrome/browser/ui/window_sizer/window_sizer_ash_unittest.cc @@ -7,9 +7,9 @@ #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/test/test_shell_delegate.h" +#include "ash/wm/common/window_resizer.h" +#include "ash/wm/common/window_state.h" #include "ash/wm/window_positioner.h" -#include "ash/wm/window_resizer.h" -#include "ash/wm/window_state.h" #include "ash/wm/window_state_aura.h" #include "base/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 55fc10313905bc..960a5783c900a5 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/window_resizer.h" +#include "ash/wm/common/window_resizer.h" #include "base/compiler_specific.h" #include "base/macros.h" #include "build/build_config.h" diff --git a/components/exo/shell_surface.cc b/components/exo/shell_surface.cc index 80a7c119bcf53b..9859346329f536 100644 --- a/components/exo/shell_surface.cc +++ b/components/exo/shell_surface.cc @@ -7,8 +7,8 @@ #include "ash/shell.h" #include "ash/shell_window_ids.h" #include "ash/wm/aura/wm_window_aura.h" -#include "ash/wm/window_resizer.h" -#include "ash/wm/window_state.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 fd640718311bc2..6e19b69e0859e1 100644 --- a/components/exo/shell_surface.h +++ b/components/exo/shell_surface.h @@ -9,7 +9,7 @@ #include #include -#include "ash/wm/window_state_observer.h" +#include "ash/wm/common/window_state_observer.h" #include "base/macros.h" #include "base/strings/string16.h" #include "components/exo/surface_delegate.h"