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

ui/aura_shell/aura_shell.gyp

 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
 
   'targets': [
@@ skipping 15 matching lines @@
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
         '../ui.gyp:ui_resources_standard',
         '../views/views.gyp:views',
       ],
       'defines': [
         'AURA_SHELL_IMPLEMENTATION',
       ],
       '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',
         'aura_shell_switches.h',
         'compact_layout_manager.cc',
         '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',
         'drag_image_view.h',
-        'image_grid.cc',
-        'image_grid.h',
         'launcher/app_launcher_button.cc',
         'launcher/app_launcher_button.h',
         'launcher/launcher.cc',
         'launcher/launcher.h',
         'launcher/launcher_model.cc',
         'launcher/launcher_model.h',
         'launcher/launcher_model_observer.h',
         'launcher/launcher_types.h',
         'launcher/launcher_view.cc',
         'launcher/launcher_view.h',
         'launcher/tabbed_launcher_button.cc',
         'launcher/tabbed_launcher_button.h',
         'launcher/view_model.cc',
         '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',
         'shell.h',
         'shell_accelerator_controller.cc',
         'shell_accelerator_controller.h',
         'shell_accelerator_filter.cc',
         'shell_accelerator_filter.h',
         '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',
         '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/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',
       ],
     },
     {
       'target_name': 'aura_shell_unittests',
       'type': 'executable',
       'dependencies': [
         '../../base/base.gyp:base',
         '../../base/base.gyp:test_support_base',
         '../../chrome/chrome_resources.gyp:packed_resources',
         '../../build/temp_gyp/googleurl.gyp:googleurl',
         '../../skia/skia.gyp:skia',
         '../../testing/gtest.gyp:gtest',
         '../../third_party/icu/icu.gyp:icui18n',
         '../../third_party/icu/icu.gyp:icuuc',
         '../aura/aura.gyp:aura',
         '../aura/aura.gyp:test_support_aura',
         '../gfx/compositor/compositor.gyp:compositor_test_support',
         '../ui.gyp:gfx_resources',
         '../ui.gyp:ui',
         '../ui.gyp:ui_resources',
         '../ui.gyp:ui_resources_standard',
         '../views/views.gyp:views',
         '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',
         'test_suite.cc',
         'test_suite.h',
         'test/aura_shell_test_base.cc',
         'test/aura_shell_test_base.h',
         'test/test_activation_delegate.cc',
         'test/test_activation_delegate.h',
         '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/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',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',
       ],
       'conditions': [
         ['use_webkit_compositor==1', {
           'dependencies': [
             '../gfx/compositor/compositor.gyp:compositor',
           ],
@@ skipping 35 matching lines @@
         '../../ash/shell/widgets.cc',
         '../../ash/shell/window_type_launcher.cc',
         '../../ash/shell/window_type_launcher.h',
         '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',
       ],
     },
   ],
 }