Move more stuff down into ash.

http://crbug.com/108457
TEST=none
TBR=sky
Review URL: http://codereview.chromium.org/9030007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115739 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 50 insertions, 50 deletions

diff --git a/ui/aura_shell/aura_shell.gyp b/ui/aura_shell/aura_shell.gyp
index e820aa5..2a58545 100644
--- a/ui/aura_shell/aura_shell.gyp
+++ b/ui/aura_shell/aura_shell.gyp
@@ -35,55 +35,12 @@
         # All .cc, .h under views, except unittests
         'aura_shell_switches.cc',
         'aura_shell_switches.h',
-        'app_list/app_list.cc',
-        'app_list/app_list.h',
-        'app_list/app_list_groups_view.cc',
-        'app_list/app_list_groups_view.h',
-        'app_list/app_list_item_group_model.cc',
-        'app_list/app_list_item_group_model.h',
-        'app_list/app_list_item_group_view.cc',
-        'app_list/app_list_item_group_view.h',
-        'app_list/app_list_item_model.cc',
-        'app_list/app_list_item_model.h',
-        'app_list/app_list_item_model_observer.h',
-        'app_list/app_list_item_view.cc',
-        'app_list/app_list_item_view.h',
-        'app_list/app_list_item_view_listener.h',
-        'app_list/app_list_model.cc',
-        'app_list/app_list_model.h',
-        'app_list/app_list_view.cc',
-        'app_list/app_list_view.h',
-        'app_list/app_list_view_delegate.h',
-        'app_list/drop_shadow_label.cc',
-        'app_list/drop_shadow_label.h',
-        'compact_layout_manager.cc',
-        'compact_layout_manager.h',
-        'compact_status_area_layout_manager.cc',
-        'compact_status_area_layout_manager.h',
         'desktop_background_view.cc',
         'desktop_background_view.h',
         'drag_drop_controller.cc',
         'drag_drop_controller.h',
         'drag_image_view.cc',
         'drag_image_view.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',
-        'shelf_layout_manager.cc',
-        'shelf_layout_manager.h',
         'shell.cc',
         'shell.h',
         'shell_accelerator_controller.cc',
@@ -93,16 +50,55 @@
         'shell_delegate.h',
         'shell_factory.h',
         'shell_window_ids.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',
+        '../../ash/app_list/app_list.cc',
+        '../../ash/app_list/app_list.h',
+        '../../ash/app_list/app_list_groups_view.cc',
+        '../../ash/app_list/app_list_groups_view.h',
+        '../../ash/app_list/app_list_item_group_model.cc',
+        '../../ash/app_list/app_list_item_group_model.h',
+        '../../ash/app_list/app_list_item_group_view.cc',
+        '../../ash/app_list/app_list_item_group_view.h',
+        '../../ash/app_list/app_list_item_model.cc',
+        '../../ash/app_list/app_list_item_model.h',
+        '../../ash/app_list/app_list_item_model_observer.h',
+        '../../ash/app_list/app_list_item_view.cc',
+        '../../ash/app_list/app_list_item_view.h',
+        '../../ash/app_list/app_list_item_view_listener.h',
+        '../../ash/app_list/app_list_model.cc',
+        '../../ash/app_list/app_list_model.h',
+        '../../ash/app_list/app_list_view.cc',
+        '../../ash/app_list/app_list_view.h',
+        '../../ash/app_list/app_list_view_delegate.h',
+        '../../ash/app_list/drop_shadow_label.cc',
+        '../../ash/app_list/drop_shadow_label.h',
+        '../../ash/launcher/app_launcher_button.cc',
+        '../../ash/launcher/app_launcher_button.h',
+        '../../ash/launcher/launcher.cc',
+        '../../ash/launcher/launcher.h',
+        '../../ash/launcher/launcher_model.cc',
+        '../../ash/launcher/launcher_model.h',
+        '../../ash/launcher/launcher_model_observer.h',
+        '../../ash/launcher/launcher_types.h',
+        '../../ash/launcher/launcher_view.cc',
+        '../../ash/launcher/launcher_view.h',
+        '../../ash/launcher/tabbed_launcher_button.cc',
+        '../../ash/launcher/tabbed_launcher_button.h',
+        '../../ash/launcher/view_model.cc',
+        '../../ash/launcher/view_model.h',
+        '../../ash/launcher/view_model_utils.cc',
+        '../../ash/launcher/view_model_utils.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/compact_layout_manager.cc',
+        '../../ash/wm/compact_layout_manager.h',
+        '../../ash/wm/compact_status_area_layout_manager.cc',
+        '../../ash/wm/compact_status_area_layout_manager.h',
         '../../ash/wm/default_container_event_filter.cc',
         '../../ash/wm/default_container_event_filter.h',
         '../../ash/wm/default_container_layout_manager.cc',
@@ -126,10 +122,14 @@
         '../../ash/wm/shadow_controller.h',
         '../../ash/wm/shadow_types.cc',
         '../../ash/wm/shadow_types.h',
+        '../../ash/wm/shelf_layout_manager.cc',
+        '../../ash/wm/shelf_layout_manager.h',
         '../../ash/wm/show_state_controller.h',
         '../../ash/wm/show_state_controller.cc',
         '../../ash/wm/stacking_controller.cc',
         '../../ash/wm/stacking_controller.h',
+        '../../ash/wm/status_area_layout_manager.cc',
+        '../../ash/wm/status_area_layout_manager.h',
         '../../ash/wm/toplevel_frame_view.cc',
         '../../ash/wm/toplevel_frame_view.h',
         '../../ash/wm/toplevel_layout_manager.cc',
@@ -175,12 +175,7 @@
       ],
       'sources': [
         'drag_drop_controller_unittest.cc',
-        'launcher/launcher_model_unittest.cc',
-        'launcher/launcher_unittest.cc',
-        'launcher/view_model_unittest.cc',
-        'launcher/view_model_utils_unittest.cc',
         'run_all_unittests.cc',
-        'shelf_layout_manager_unittest.cc',
         'shell_accelerator_controller_unittest.cc',
         'shell_unittest.cc',
         'test_suite.cc',
@@ -192,12 +187,17 @@
         'test/test_shell_delegate.cc',
         'test/test_shell_delegate.h',
         'tooltip_controller_unittest.cc',
+        '../../ash/launcher/launcher_model_unittest.cc',
+        '../../ash/launcher/launcher_unittest.cc',
+        '../../ash/launcher/view_model_unittest.cc',
+        '../../ash/launcher/view_model_utils_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/shelf_layout_manager_unittest.cc',
         '../../ash/wm/toplevel_layout_manager_unittest.cc',
         '../../ash/wm/toplevel_window_event_filter_unittest.cc',
         '../../ash/wm/workspace_controller_unittest.cc',