Move some more WM functionality down into ash.

ui/aura_shell/aura_shell.gyp

Index: ui/aura_shell/aura_shell.gyp
===================================================================
--- ui/aura_shell/aura_shell.gyp	(revision 115655)
+++ ui/aura_shell/aura_shell.gyp	(working copy)
@@ -41,16 +41,8 @@
         'compact_layout_manager.h',
         'compact_status_area_layout_manager.cc',
         'compact_status_area_layout_manager.h',
-        'default_container_event_filter.cc',
-        'default_container_event_filter.h',
-        'default_container_layout_manager.cc',
-        'default_container_layout_manager.h',
         'desktop_background_view.cc',
         'desktop_background_view.h',
-        'root_window_event_filter.cc',
-        'root_window_event_filter.h',
-        'root_window_layout_manager.cc',
-        'root_window_layout_manager.h',
         'drag_drop_controller.cc',
         'drag_drop_controller.h',
         'drag_image_view.cc',
@@ -71,8 +63,6 @@
         'launcher/view_model.h',
         'launcher/view_model_utils.cc',
         'launcher/view_model_utils.h',
-        'property_util.cc',
-        'property_util.h',
         'shelf_layout_manager.cc',
         'shelf_layout_manager.h',
         'shell.cc',
@@ -90,29 +80,14 @@
         'status_area_view.h',
         'tooltip_controller.cc',
         'tooltip_controller.h',
-        'toplevel_frame_view.cc',
-        'toplevel_frame_view.h',
-        'toplevel_layout_manager.cc',
-        'toplevel_layout_manager.h',
-        'toplevel_window_event_filter.cc',
-        'toplevel_window_event_filter.h',
-        'window_frame.cc',
-        'window_frame.h',
-        'window_properties.cc',
-        'window_properties.h',
-        'window_util.cc',
-        'window_util.h',
-        'workspace_controller.cc',
-        'workspace_controller.h',
-        'workspace/workspace.cc',
-        'workspace/workspace.h',
-        '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/default_container_event_filter.cc',
+        '../../ash/wm/default_container_event_filter.h',
+        '../../ash/wm/default_container_layout_manager.cc',
+        '../../ash/wm/default_container_layout_manager.h',
         '../../ash/wm/image_grid.cc',
         '../../ash/wm/image_grid.h',
         '../../ash/wm/modal_container_layout_manager.cc',
@@ -120,6 +95,12 @@
         '../../ash/wm/modality_event_filter.cc',
         '../../ash/wm/modality_event_filter.h',
         '../../ash/wm/modality_event_filter_delegate.h',
+        '../../ash/wm/property_util.cc',
+        '../../ash/wm/property_util.h',
+        '../../ash/wm/root_window_event_filter.cc',
+        '../../ash/wm/root_window_event_filter.h',
+        '../../ash/wm/root_window_layout_manager.cc',
+        '../../ash/wm/root_window_layout_manager.h',
         '../../ash/wm/shadow.cc',
         '../../ash/wm/shadow.h',
         '../../ash/wm/shadow_controller.cc',
@@ -130,6 +111,25 @@
         '../../ash/wm/show_state_controller.cc',
         '../../ash/wm/stacking_controller.cc',
         '../../ash/wm/stacking_controller.h',
+        '../../ash/wm/toplevel_frame_view.cc',
+        '../../ash/wm/toplevel_frame_view.h',
+        '../../ash/wm/toplevel_layout_manager.cc',
+        '../../ash/wm/toplevel_layout_manager.h',
+        '../../ash/wm/toplevel_window_event_filter.cc',
+        '../../ash/wm/toplevel_window_event_filter.h',
+        '../../ash/wm/window_frame.cc',
+        '../../ash/wm/window_frame.h',
+        '../../ash/wm/window_properties.cc',
+        '../../ash/wm/window_properties.h',
+        '../../ash/wm/window_util.cc',
+        '../../ash/wm/window_util.h',
+        '../../ash/wm/workspace_controller.cc',
+        '../../ash/wm/workspace_controller.h',
+        '../../ash/wm/workspace/workspace.cc',
+        '../../ash/wm/workspace/workspace.h',
+        '../../ash/wm/workspace/workspace_manager.cc',
+        '../../ash/wm/workspace/workspace_manager.h',
+        '../../ash/wm/workspace/workspace_observer.h',
       ],
     },
     {
@@ -155,8 +155,6 @@
         'aura_shell',
       ],
       'sources': [
-        'default_container_layout_manager_unittest.cc',
-        'root_window_event_filter_unittest.cc',
         'drag_drop_controller_unittest.cc',
         'launcher/launcher_model_unittest.cc',
         'launcher/launcher_unittest.cc',
@@ -175,14 +173,16 @@
         'test/test_shell_delegate.cc',
         'test/test_shell_delegate.h',
         'tooltip_controller_unittest.cc',
-        'toplevel_layout_manager_unittest.cc',
-        'toplevel_window_event_filter_unittest.cc',
-        'workspace_controller_unittest.cc',
-        'workspace/workspace_manager_unittest.cc',
         '../../ash/wm/activation_controller_unittest.cc',
+        '../../ash/wm/default_container_layout_manager_unittest.cc',
         '../../ash/wm/image_grid_unittest.cc',
         '../../ash/wm/modal_container_layout_manager_unittest.cc',
+        '../../ash/wm/root_window_event_filter_unittest.cc',
         '../../ash/wm/shadow_controller_unittest.cc',
+        '../../ash/wm/toplevel_layout_manager_unittest.cc',
+        '../../ash/wm/toplevel_window_event_filter_unittest.cc',
+        '../../ash/wm/workspace_controller_unittest.cc',
+        '../../ash/wm/workspace/workspace_manager_unittest.cc',
 
         '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',