Index: ash/ash.gyp |
=================================================================== |
--- ash/ash.gyp (revision 135932) |
+++ ash/ash.gyp (working copy) |
@@ -25,6 +25,7 @@ |
'../skia/skia.gyp:skia', |
'../third_party/icu/icu.gyp:icui18n', |
'../third_party/icu/icu.gyp:icuuc', |
+ '../ui/app_list/app_list.gyp:app_list', |
'../ui/aura/aura.gyp:aura', |
'../ui/base/strings/ui_strings.gyp:ui_strings', |
'../ui/compositor/compositor.gyp:compositor', |
@@ -51,31 +52,6 @@ |
'accelerators/focus_manager_factory.h', |
'accelerators/nested_dispatcher_controller.cc', |
'accelerators/nested_dispatcher_controller.h', |
- 'app_list/app_list.cc', |
- 'app_list/app_list.h', |
- 'app_list/app_list_bubble_border.cc', |
- 'app_list/app_list_bubble_border.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_model.cc', |
- 'app_list/app_list_model.h', |
- 'app_list/app_list_model_view.cc', |
- 'app_list/app_list_model_view.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', |
- 'app_list/icon_cache.cc', |
- 'app_list/icon_cache.h', |
- 'app_list/page_switcher.cc', |
- 'app_list/page_switcher.h', |
- 'app_list/pagination_model.cc', |
- 'app_list/pagination_model.h', |
- 'app_list/pagination_model_observer.h', |
'ash_switches.cc', |
'ash_switches.h', |
'caps_lock_delegate.h', |
@@ -198,6 +174,8 @@ |
'tooltips/tooltip_controller.cc', |
'tooltips/tooltip_controller.h', |
'volume_control_delegate.h', |
+ 'wm/app_list_controller.cc', |
+ 'wm/app_list_controller.h', |
'wm/activation_controller.cc', |
'wm/activation_controller.h', |
'wm/always_on_top_controller.cc', |
@@ -363,7 +341,6 @@ |
'accelerators/accelerator_filter_unittest.cc', |
'accelerators/accelerator_table_unittest.cc', |
'accelerators/nested_dispatcher_controller_unittest.cc', |
- 'app_list/app_list_unittest.cc', |
'dip_unittest.cc', |
'drag_drop/drag_drop_controller_unittest.cc', |
'focus_cycler_unittest.cc', |
@@ -467,6 +444,7 @@ |
'../skia/skia.gyp:skia', |
'../third_party/icu/icu.gyp:icui18n', |
'../third_party/icu/icu.gyp:icuuc', |
+ '../ui/app_list/app_list.gyp:app_list', |
'../ui/aura/aura.gyp:aura', |
'../ui/compositor/compositor.gyp:compositor', |
'../ui/compositor/compositor.gyp:compositor_test_support', |