Shuffles and renames ash/common/wm classes

ash/ash.gyp

Index: ash/ash.gyp
diff --git a/ash/ash.gyp b/ash/ash.gyp
index bacbea4bae0cca9d80a25cc55307410f0024b68a..7a9c9982e2b9e6276560acf4bed104915632e9bd 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -43,6 +43,18 @@
       'ash_touch_exploration_manager_chromeos.h',
       'audio/sounds.cc',
       'audio/sounds.h',
+      'aura/aura_layout_manager_adapter.cc',
+      'aura/aura_layout_manager_adapter.h',
+      'aura/wm_lookup_aura.cc',
+      'aura/wm_lookup_aura.h',
+      'aura/wm_root_window_controller_aura.cc',
+      'aura/wm_root_window_controller_aura.h',
+      'aura/wm_shelf_aura.cc',
+      'aura/wm_shelf_aura.h',
+      'aura/wm_shell_aura.cc',
+      'aura/wm_shell_aura.h',
+      'aura/wm_window_aura.cc',
+      'aura/wm_window_aura.h',
       'autoclick/autoclick_controller.cc',
       'autoclick/autoclick_controller.h',
       'cancel_mode.cc',
@@ -104,18 +116,8 @@
       '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',
@@ -125,10 +127,6 @@
       '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',
@@ -144,6 +142,20 @@
       'common/wm/workspace/workspace_types.h',
       'common/wm/workspace/workspace_window_resizer.cc',
       'common/wm/workspace/workspace_window_resizer.h',
+      'common/wm_activation_observer.h',
+      'common/wm_display_observer.h',
+      'common/wm_layout_manager.h',
+      'common/wm_lookup.cc',
+      'common/wm_lookup.h',
+      'common/wm_overview_mode_observer.h',
+      'common/wm_root_window_controller.h',
+      'common/wm_root_window_controller_observer.h',
+      'common/wm_shell.cc',
+      'common/wm_shell.h',
+      'common/wm_window.h',
+      'common/wm_window_observer.h',
+      'common/wm_window_property.h',
+      'common/wm_window_tracker.h',
       'container_delegate.h',
       'container_delegate_aura.cc',
       'container_delegate_aura.h',
@@ -624,18 +636,6 @@
       'wm/ash_focus_rules.h',
       'wm/ash_native_cursor_manager.cc',
       'wm/ash_native_cursor_manager.h',
-      'wm/aura/aura_layout_manager_adapter.cc',
-      'wm/aura/aura_layout_manager_adapter.h',
-      'wm/aura/wm_globals_aura.cc',
-      'wm/aura/wm_globals_aura.h',
-      'wm/aura/wm_lookup_aura.cc',
-      'wm/aura/wm_lookup_aura.h',
-      'wm/aura/wm_root_window_controller_aura.cc',
-      'wm/aura/wm_root_window_controller_aura.h',
-      'wm/aura/wm_shelf_aura.cc',
-      'wm/aura/wm_shelf_aura.h',
-      'wm/aura/wm_window_aura.cc',
-      'wm/aura/wm_window_aura.h',
       'wm/boot_splash_screen_chromeos.cc',
       'wm/boot_splash_screen_chromeos.h',
       'wm/cursor_manager_chromeos.cc',