Renames ash/wm/common into ash/common/wm

BUG=616265
TEST=none
R=jamescook@chromium.org
TBR=reveman@chromium.org

Review-Url: https://codereview.chromium.org/2030593002
Cr-Commit-Position: refs/heads/master@{#397173}

ash/DEPS

@@ -27,9 +27,9 @@ specific_include_rules = {
   "root_window_controller_common\.*": [
     "-ash",
     "+ash/ash_export.h",
+    "+ash/common",
     "+ash/root_window_controller_common.h",
     "+ash/shell_window_ids.h",
-    "+ash/wm/common",
     "-ui/aura",
   ],
   "shell.cc": [

ash/README.md

@@ -3,6 +3,6 @@ Mus+ash
 Ash is transitioning from using aura to using mus. During the
 transition period ash has support for both aura and mus. In order to
 work with both toolkits ash has a porting layer. This layer exists in
-ash/wm/common. As portions of ash are converted to the porting layer
-DEPS files are put in place to ensure aura specific dependencies are
-not added back.
+ash/common. As portions of ash are converted to the porting layer they
+should move to ash/common. DEPS files may also be used to ensure new
+dependencies do not get added.

ash/accelerators/accelerator_commands.cc

@@ -4,12 +4,12 @@
 
 #include "ash/accelerators/accelerator_commands.h"
 
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_event.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/display_util.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
-#include "ash/wm/common/window_state.h"
-#include "ash/wm/common/wm_event.h"
 #include "ash/wm/mru_window_tracker.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"

ash/accelerators/accelerator_commands_unittest.cc

@@ -6,8 +6,8 @@
 
 #include <memory>
 
+#include "ash/common/wm/window_state.h"
 #include "ash/test/ash_test_base.h"
-#include "ash/wm/common/window_state.h"
 #include "ash/wm/window_state_aura.h"
 #include "ui/aura/window.h"
 

ash/accelerators/accelerator_controller.cc

@@ -12,6 +12,8 @@
 #include "ash/accelerators/accelerator_commands.h"
 #include "ash/accelerators/debug_commands.h"
 #include "ash/ash_switches.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_event.h"
 #include "ash/debug.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/focus_cycler.h"
@@ -46,8 +48,6 @@
 #include "ash/touch/touch_hud_debug.h"
 #include "ash/utility/screenshot_controller.h"
 #include "ash/volume_control_delegate.h"
-#include "ash/wm/common/window_state.h"
-#include "ash/wm/common/wm_event.h"
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/wm/mru_window_tracker.h"
 #include "ash/wm/overview/window_selector_controller.h"

ash/accelerators/accelerator_controller_unittest.cc

@@ -7,6 +7,10 @@
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/accessibility_delegate.h"
 #include "ash/ash_switches.h"
+#include "ash/common/wm/panels/panel_layout_manager.h"
+#include "ash/common/wm/window_positioning_utils.h"
+#include "ash/common/wm/window_state.h"
+#include "ash/common/wm/wm_event.h"
 #include "ash/display/display_manager.h"
 #include "ash/ime_control_delegate.h"
 #include "ash/screen_util.h"
@@ -24,10 +28,6 @@
 #include "ash/test/test_volume_control_delegate.h"
 #include "ash/volume_control_delegate.h"
 #include "ash/wm/aura/wm_window_aura.h"
-#include "ash/wm/common/panels/panel_layout_manager.h"
-#include "ash/wm/common/window_positioning_utils.h"
-#include "ash/wm/common/window_state.h"
-#include "ash/wm/common/wm_event.h"
 #include "ash/wm/lock_state_controller.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"

ash/accelerators/accelerator_delegate.cc

@@ -5,8 +5,8 @@
 #include "ash/accelerators/accelerator_delegate.h"
 
 #include "ash/accelerators/accelerator_controller.h"
+#include "ash/common/wm/window_state.h"
 #include "ash/shell.h"
-#include "ash/wm/common/window_state.h"
 #include "ash/wm/window_state_aura.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/events/event.h"

ash/accelerators/accelerator_filter_unittest.cc

@@ -8,13 +8,13 @@
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_delegate.h"
+#include "ash/common/wm/window_state.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/ash_test_helper.h"
 #include "ash/test/test_screenshot_delegate.h"
 #include "ash/test/test_session_state_delegate.h"
-#include "ash/wm/common/window_state.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "testing/gtest/include/gtest/gtest.h"

ash/accelerators/accelerator_interactive_uitest_chromeos.cc

@@ -4,6 +4,7 @@
 
 #include "ash/accelerators/accelerator_controller.h"
 
+#include "ash/common/wm/window_state.h"
 #include "ash/shell.h"
 #include "ash/shell_observer.h"
 #include "ash/system/chromeos/network/network_observer.h"
@@ -12,7 +13,6 @@
 #include "ash/test/ash_interactive_ui_test_base.h"
 #include "ash/test/test_screenshot_delegate.h"
 #include "ash/test/test_volume_control_delegate.h"
-#include "ash/wm/common/window_state.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "base/run_loop.h"

ash/ash.gyp

@@ -49,6 +49,96 @@
       'cancel_mode.h',
       'cast_config_delegate.cc',
       'cast_config_delegate.h',
+      'common/wm/always_on_top_controller.cc',
+      'common/wm/always_on_top_controller.h',
+      'common/wm/background_animator.cc',
+      'common/wm/background_animator.h',
+      'common/wm/container_finder.cc',
+      'common/wm/container_finder.h',
+      'common/wm/default_state.cc',
+      'common/wm/default_state.h',
+      'common/wm/default_window_resizer.cc',
+      'common/wm/default_window_resizer.h',
+      'common/wm/dock/docked_window_layout_manager.cc',
+      'common/wm/dock/docked_window_layout_manager.h',
+      'common/wm/dock/docked_window_layout_manager_observer.h',
+      'common/wm/dock/docked_window_resizer.cc',
+      'common/wm/dock/docked_window_resizer.h',
+      'common/wm/drag_details.cc',
+      'common/wm/drag_details.h',
+      'common/wm/fullscreen_window_finder.cc',
+      'common/wm/fullscreen_window_finder.h',
+      'common/wm/panels/panel_layout_manager.cc',
+      'common/wm/panels/panel_layout_manager.h',
+      'common/wm/panels/panel_window_resizer.cc',
+      'common/wm/panels/panel_window_resizer.h',
+      'common/wm/root_window_finder.cc',
+      'common/wm/root_window_finder.h',
+      'common/wm/shelf/wm_shelf.h',
+      'common/wm/shelf/wm_shelf_constants.cc',
+      'common/wm/shelf/wm_shelf_constants.h',
+      'common/wm/shelf/wm_shelf_observer.h',
+      'common/wm/shelf/wm_shelf_types.h',
+      'common/wm/shelf/wm_shelf_util.cc',
+      'common/wm/shelf/wm_shelf_util.h',
+      'common/wm/switchable_windows.cc',
+      'common/wm/switchable_windows.h',
+      'common/wm/window_animation_types.h',
+      'common/wm/window_parenting_utils.cc',
+      'common/wm/window_parenting_utils.h',
+      'common/wm/window_positioner.cc',
+      'common/wm/window_positioner.h',
+      'common/wm/window_positioning_utils.cc',
+      'common/wm/window_positioning_utils.h',
+      'common/wm/window_resizer.cc',
+      'common/wm/window_resizer.h',
+      'common/wm/window_state.cc',
+      'common/wm/window_state.h',
+      'common/wm/window_state_delegate.cc',
+      'common/wm/window_state_delegate.h',
+      'common/wm/window_state_observer.h',
+      'common/wm/window_state_util.cc',
+      'common/wm/window_state_util.h',
+      'common/wm/wm_activation_observer.h',
+      'common/wm/wm_display_observer.h',
+      'common/wm/wm_event.cc',
+      'common/wm/wm_event.h',
+      'common/wm/wm_globals.cc',
+      'common/wm/wm_globals.h',
+      'common/wm/wm_layout_manager.h',
+      'common/wm/wm_lookup.cc',
+      'common/wm/wm_lookup.h',
+      'common/wm/wm_overview_mode_observer.h',
+      'common/wm/wm_root_window_controller.h',
+      'common/wm/wm_root_window_controller_observer.h',
+      'common/wm/wm_screen_util.cc',
+      'common/wm/wm_screen_util.h',
+      'common/wm/wm_snap_to_pixel_layout_manager.cc',
+      'common/wm/wm_snap_to_pixel_layout_manager.h',
+      'common/wm/wm_toplevel_window_event_handler.cc',
+      'common/wm/wm_toplevel_window_event_handler.h',
+      'common/wm/wm_types.cc',
+      'common/wm/wm_types.h',
+      'common/wm/wm_user_metrics_action.h',
+      'common/wm/wm_window.h',
+      'common/wm/wm_window_observer.h',
+      'common/wm/wm_window_property.h',
+      'common/wm/wm_window_tracker.h',
+      'common/wm/workspace/magnetism_matcher.cc',
+      'common/wm/workspace/magnetism_matcher.h',
+      'common/wm/workspace/multi_window_resize_controller.cc',
+      'common/wm/workspace/multi_window_resize_controller.h',
+      'common/wm/workspace/phantom_window_controller.cc',
+      'common/wm/workspace/phantom_window_controller.h',
+      'common/wm/workspace/two_step_edge_cycler.cc',
+      'common/wm/workspace/two_step_edge_cycler.h',
+      'common/wm/workspace/workspace_layout_manager.cc',
+      'common/wm/workspace/workspace_layout_manager.h',
+      'common/wm/workspace/workspace_layout_manager_backdrop_delegate.h',
+      'common/wm/workspace/workspace_layout_manager_delegate.h',
+      'common/wm/workspace/workspace_types.h',
+      'common/wm/workspace/workspace_window_resizer.cc',
+      'common/wm/workspace/workspace_window_resizer.h',
       'container_delegate.h',
       'container_delegate_aura.cc',
       'container_delegate_aura.h',
@@ -546,96 +636,6 @@
       'wm/aura/wm_window_aura.h',
       'wm/boot_splash_screen_chromeos.cc',
       'wm/boot_splash_screen_chromeos.h',
-      'wm/common/always_on_top_controller.cc',
-      'wm/common/always_on_top_controller.h',
-      'wm/common/background_animator.cc',
-      'wm/common/background_animator.h',
-      'wm/common/container_finder.cc',
-      'wm/common/container_finder.h',
-      'wm/common/default_state.cc',
-      'wm/common/default_state.h',
-      'wm/common/default_window_resizer.cc',
-      'wm/common/default_window_resizer.h',
-      'wm/common/dock/docked_window_layout_manager.cc',
-      'wm/common/dock/docked_window_layout_manager.h',
-      'wm/common/dock/docked_window_layout_manager_observer.h',
-      'wm/common/dock/docked_window_resizer.cc',
-      'wm/common/dock/docked_window_resizer.h',
-      'wm/common/drag_details.cc',
-      'wm/common/drag_details.h',
-      'wm/common/fullscreen_window_finder.cc',
-      'wm/common/fullscreen_window_finder.h',
-      'wm/common/panels/panel_layout_manager.cc',
-      'wm/common/panels/panel_layout_manager.h',
-      'wm/common/panels/panel_window_resizer.cc',
-      'wm/common/panels/panel_window_resizer.h',
-      'wm/common/root_window_finder.cc',
-      'wm/common/root_window_finder.h',
-      'wm/common/shelf/wm_shelf.h',
-      'wm/common/shelf/wm_shelf_constants.cc',
-      'wm/common/shelf/wm_shelf_constants.h',
-      'wm/common/shelf/wm_shelf_observer.h',
-      'wm/common/shelf/wm_shelf_types.h',
-      'wm/common/shelf/wm_shelf_util.cc',
-      'wm/common/shelf/wm_shelf_util.h',
-      'wm/common/switchable_windows.cc',
-      'wm/common/switchable_windows.h',
-      'wm/common/window_animation_types.h',
-      'wm/common/window_parenting_utils.cc',
-      'wm/common/window_parenting_utils.h',
-      'wm/common/window_positioner.cc',
-      'wm/common/window_positioner.h',
-      'wm/common/window_positioning_utils.cc',
-      'wm/common/window_positioning_utils.h',
-      'wm/common/window_resizer.cc',
-      'wm/common/window_resizer.h',
-      'wm/common/window_state.cc',
-      'wm/common/window_state.h',
-      'wm/common/window_state_delegate.cc',
-      'wm/common/window_state_delegate.h',
-      'wm/common/window_state_observer.h',
-      'wm/common/window_state_util.cc',
-      'wm/common/window_state_util.h',
-      'wm/common/wm_activation_observer.h',
-      'wm/common/wm_display_observer.h',
-      'wm/common/wm_event.cc',
-      'wm/common/wm_event.h',
-      'wm/common/wm_globals.cc',
-      'wm/common/wm_globals.h',
-      'wm/common/wm_layout_manager.h',
-      'wm/common/wm_lookup.cc',
-      'wm/common/wm_lookup.h',
-      'wm/common/wm_overview_mode_observer.h',
-      'wm/common/wm_root_window_controller.h',
-      'wm/common/wm_root_window_controller_observer.h',
-      'wm/common/wm_screen_util.cc',
-      'wm/common/wm_screen_util.h',
-      'wm/common/wm_snap_to_pixel_layout_manager.cc',
-      'wm/common/wm_snap_to_pixel_layout_manager.h',
-      'wm/common/wm_toplevel_window_event_handler.cc',
-      'wm/common/wm_toplevel_window_event_handler.h',
-      'wm/common/wm_types.cc',
-      'wm/common/wm_types.h',
-      'wm/common/wm_user_metrics_action.h',
-      'wm/common/wm_window.h',
-      'wm/common/wm_window_observer.h',
-      'wm/common/wm_window_property.h',
-      'wm/common/wm_window_tracker.h',
-      'wm/common/workspace/magnetism_matcher.cc',
-      'wm/common/workspace/magnetism_matcher.h',
-      'wm/common/workspace/multi_window_resize_controller.cc',
-      'wm/common/workspace/multi_window_resize_controller.h',
-      'wm/common/workspace/phantom_window_controller.cc',
-      'wm/common/workspace/phantom_window_controller.h',
-      'wm/common/workspace/two_step_edge_cycler.cc',
-      'wm/common/workspace/two_step_edge_cycler.h',
-      'wm/common/workspace/workspace_layout_manager.cc',
-      'wm/common/workspace/workspace_layout_manager.h',
-      'wm/common/workspace/workspace_layout_manager_backdrop_delegate.h',
-      'wm/common/workspace/workspace_layout_manager_delegate.h',
-      'wm/common/workspace/workspace_types.h',
-      'wm/common/workspace/workspace_window_resizer.cc',
-      'wm/common/workspace/workspace_window_resizer.h',
       'wm/cursor_manager_chromeos.cc',
       'wm/cursor_manager_chromeos.h',
       'wm/dim_window.cc',

ash/autoclick/autoclick_controller.cc

@@ -4,9 +4,9 @@
 
 #include "ash/autoclick/autoclick_controller.h"
 
+#include "ash/common/wm/root_window_finder.h"
 #include "ash/shell.h"
 #include "ash/wm/aura/wm_window_aura.h"
-#include "ash/wm/common/root_window_finder.h"
 #include "base/timer/timer.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_tree_host.h"

ash/wm/common/DEPS → ash/common/DEPS

@@ -1,7 +1,7 @@
 include_rules = [
   "-ash",
   "+ash/ash_export.h",
-  "+ash/wm/common",
+  "+ash/common",
   "+ui",
   "-ui/aura",
 ]

ash/wm/common/always_on_top_controller.cc → ash/common/wm/always_on_top_controller.cc

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/wm/common/always_on_top_controller.h"
+#include "ash/common/wm/always_on_top_controller.h"
 
-#include "ash/wm/common/wm_shell_window_ids.h"
-#include "ash/wm/common/wm_window.h"
-#include "ash/wm/common/wm_window_property.h"
-#include "ash/wm/common/workspace/workspace_layout_manager.h"
-#include "ash/wm/common/workspace/workspace_layout_manager_delegate.h"
+#include "ash/common/wm/wm_shell_window_ids.h"
+#include "ash/common/wm/wm_window.h"
+#include "ash/common/wm/wm_window_property.h"
+#include "ash/common/wm/workspace/workspace_layout_manager.h"
+#include "ash/common/wm/workspace/workspace_layout_manager_delegate.h"
 #include "base/memory/ptr_util.h"
 
 namespace ash {

ash/wm/common/always_on_top_controller.h → ash/common/wm/always_on_top_controller.h

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_WM_COMMON_ALWAYS_ON_TOP_CONTROLLER_H_
-#define ASH_WM_COMMON_ALWAYS_ON_TOP_CONTROLLER_H_
+#ifndef ASH_COMMON_WM_ALWAYS_ON_TOP_CONTROLLER_H_
+#define ASH_COMMON_WM_ALWAYS_ON_TOP_CONTROLLER_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
-#include "ash/wm/common/wm_window_observer.h"
+#include "ash/common/wm/wm_window_observer.h"
 #include "base/macros.h"
 
 namespace ash {
@@ -46,4 +46,4 @@ class ASH_EXPORT AlwaysOnTopController : public wm::WmWindowObserver {
 
 }  // namepsace ash
 
-#endif  // ASH_WM_COMMON_ALWAYS_ON_TOP_CONTROLLER_H_
+#endif  // ASH_COMMON_WM_ALWAYS_ON_TOP_CONTROLLER_H_

ash/wm/common/background_animator.cc → ash/common/wm/background_animator.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/wm/common/background_animator.h"
+#include "ash/common/wm/background_animator.h"
 
 namespace ash {
 namespace {