Move some more files into ash... this time seed the window manager dir.

ui/aura_shell/aura_shell.gyp

Index: ui/aura_shell/aura_shell.gyp
===================================================================
--- ui/aura_shell/aura_shell.gyp	(revision 115643)
+++ ui/aura_shell/aura_shell.gyp	(working copy)
@@ -33,10 +33,6 @@
       ],
       'sources': [
         # All .cc, .h under views, except unittests
-        'activation_controller.cc',
-        'activation_controller.h',
-        'always_on_top_controller.cc',
-        'always_on_top_controller.h',
         'app_list.cc',
         'app_list.h',
         'aura_shell_switches.cc',
@@ -59,8 +55,6 @@
         'drag_drop_controller.h',
         'drag_image_view.cc',
         'drag_image_view.h',
-        'image_grid.cc',
-        'image_grid.h',
         'launcher/app_launcher_button.cc',
         'launcher/app_launcher_button.h',
         'launcher/launcher.cc',
@@ -77,19 +71,8 @@
         'launcher/view_model.h',
         'launcher/view_model_utils.cc',
         'launcher/view_model_utils.h',
-        'modal_container_layout_manager.cc',
-        'modal_container_layout_manager.h',
-        'modality_event_filter.cc',
-        'modality_event_filter.h',
-        'modality_event_filter_delegate.h',
         'property_util.cc',
         'property_util.h',
-        'shadow.cc',
-        'shadow.h',
-        'shadow_controller.cc',
-        'shadow_controller.h',
-        'shadow_types.cc',
-        'shadow_types.h',
         'shelf_layout_manager.cc',
         'shelf_layout_manager.h',
         'shell.cc',
@@ -101,10 +84,6 @@
         'shell_delegate.h',
         'shell_factory.h',
         'shell_window_ids.h',
-        'show_state_controller.h',
-        'show_state_controller.cc',
-        'stacking_controller.cc',
-        'stacking_controller.h',
         'status_area_layout_manager.cc',
         'status_area_layout_manager.h',
         'status_area_view.cc',
@@ -130,6 +109,27 @@
         'workspace/workspace_manager.cc',
         'workspace/workspace_manager.h',
         'workspace/workspace_observer.h',
+        '../../ash/wm/activation_controller.cc',
+        '../../ash/wm/activation_controller.h',
+        '../../ash/wm/always_on_top_controller.cc',
+        '../../ash/wm/always_on_top_controller.h',
+        '../../ash/wm/image_grid.cc',
+        '../../ash/wm/image_grid.h',
+        '../../ash/wm/modal_container_layout_manager.cc',
+        '../../ash/wm/modal_container_layout_manager.h',
+        '../../ash/wm/modality_event_filter.cc',
+        '../../ash/wm/modality_event_filter.h',
+        '../../ash/wm/modality_event_filter_delegate.h',
+        '../../ash/wm/shadow.cc',
+        '../../ash/wm/shadow.h',
+        '../../ash/wm/shadow_controller.cc',
+        '../../ash/wm/shadow_controller.h',
+        '../../ash/wm/shadow_types.cc',
+        '../../ash/wm/shadow_types.h',
+        '../../ash/wm/show_state_controller.h',
+        '../../ash/wm/show_state_controller.cc',
+        '../../ash/wm/stacking_controller.cc',
+        '../../ash/wm/stacking_controller.h',
       ],
     },
     {
@@ -155,18 +155,14 @@
         'aura_shell',
       ],
       'sources': [
-        'activation_controller_unittest.cc',
         'default_container_layout_manager_unittest.cc',
         'root_window_event_filter_unittest.cc',
         'drag_drop_controller_unittest.cc',
-        'image_grid_unittest.cc',
         'launcher/launcher_model_unittest.cc',
         'launcher/launcher_unittest.cc',
         'launcher/view_model_unittest.cc',
         'launcher/view_model_utils_unittest.cc',
-        'modal_container_layout_manager_unittest.cc',
         'run_all_unittests.cc',
-        'shadow_controller_unittest.cc',
         'shelf_layout_manager_unittest.cc',
         'shell_accelerator_controller_unittest.cc',
         'shell_unittest.cc',
@@ -183,6 +179,10 @@
         'toplevel_window_event_filter_unittest.cc',
         'workspace_controller_unittest.cc',
         'workspace/workspace_manager_unittest.cc',
+        '../../ash/wm/activation_controller_unittest.cc',
+        '../../ash/wm/image_grid_unittest.cc',
+        '../../ash/wm/modal_container_layout_manager_unittest.cc',
+        '../../ash/wm/shadow_controller_unittest.cc',
 
         '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',