Moves handful of files to ash/wm/common

These files are now ash and ui/aura/Window free.
Also adds DEPS file to make sure don't add dependencies back. I didn't
updated namespaces, will do that separately.

BUG=603369
TEST=covered by tests
R=jamescook@chromium.org
TBR=reveman@chromium.org

Review URL: https://codereview.chromium.org/1921353002

Cr-Commit-Position: refs/heads/master@{#389927}

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"

ash/accelerators/accelerator_commands_unittest.cc

@@ -7,7 +7,7 @@
 #include <memory>
 
 #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"
 

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"

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"

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"

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"

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"

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',

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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;

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"

ash/shelf/shelf_widget.h

@@ -8,9 +8,9 @@
 #include <memory>
 
 #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"
 

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"

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"

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"

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"

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"

ash/system/tray/tray_background_view.h

@@ -8,9 +8,9 @@
 #include <memory>
 
 #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"