| Index: ash/ash.gyp
|
| diff --git a/ash/ash.gyp b/ash/ash.gyp
|
| index fee27ca0269d4b5dc5b58c697c98f97cd34e8912..3f7ecc5995d1635a672f78ffd4e6882d0b7fdfeb 100644
|
| --- a/ash/ash.gyp
|
| +++ b/ash/ash.gyp
|
| @@ -520,6 +520,11 @@
|
| 'wm/always_on_top_controller.h',
|
| 'wm/app_list_controller.cc',
|
| 'wm/app_list_controller.h',
|
| + 'wm/app_list_shower_delegate.cc',
|
| + 'wm/app_list_shower_delegate.h',
|
| + 'wm/app_list_shower_delegate_factory.cc',
|
| + 'wm/app_list_shower_delegate_factory.h',
|
| + 'wm/app_list_view_delegate_factory.h',
|
| 'wm/ash_focus_rules.cc',
|
| 'wm/ash_focus_rules.h',
|
| 'wm/ash_native_cursor_manager.cc',
|
| @@ -906,6 +911,9 @@
|
| 'virtual_keyboard_controller_unittest.cc',
|
| 'wm/always_on_top_controller_unittest.cc',
|
| 'wm/app_list_controller_unittest.cc',
|
| + # TODO(mfomitchev): uncomment when ash::Shell is switched to using
|
| + # app_list::AppListShower instead of ash::AppListController.
|
| +# 'wm/app_list_shower_delegate_unittest.cc',
|
| 'wm/ash_native_cursor_manager_unittest.cc',
|
| 'wm/ash_focus_rules_unittest.cc',
|
| 'wm/dock/docked_window_layout_manager_unittest.cc',
|
| @@ -973,6 +981,7 @@
|
| '../third_party/icu/icu.gyp:icuuc',
|
| '../ui/accessibility/accessibility.gyp:accessibility',
|
| '../ui/app_list/app_list.gyp:app_list',
|
| + '../ui/app_list/shower/app_list_shower.gyp:app_list_shower',
|
| '../ui/aura/aura.gyp:aura',
|
| '../ui/base/ime/ui_base_ime.gyp:ui_base_ime',
|
| '../ui/base/ui_base.gyp:ui_base',
|
| @@ -1107,6 +1116,7 @@
|
| '../testing/gtest.gyp:gtest',
|
| '../ui/accessibility/accessibility.gyp:ax_gen',
|
| '../ui/app_list/app_list.gyp:app_list_test_support',
|
| + '../ui/app_list/shower/app_list_shower.gyp:app_list_shower',
|
| '../ui/events/devices/events_devices.gyp:events_devices',
|
| '../ui/views/views.gyp:views_test_support',
|
| 'ash',
|
| @@ -1169,6 +1179,7 @@
|
| '../third_party/icu/icu.gyp:icuuc',
|
| '../ui/accessibility/accessibility.gyp:accessibility',
|
| '../ui/app_list/app_list.gyp:app_list',
|
| + '../ui/app_list/shower/app_list_shower.gyp:app_list_shower',
|
| '../ui/aura/aura.gyp:aura',
|
| '../ui/aura/aura.gyp:aura_test_support',
|
| '../ui/base/ime/ui_base_ime.gyp:ui_base_ime',
|
| @@ -1268,6 +1279,7 @@
|
| '../third_party/icu/icu.gyp:icui18n',
|
| '../third_party/icu/icu.gyp:icuuc',
|
| '../ui/app_list/app_list.gyp:app_list',
|
| + '../ui/app_list/shower/app_list_shower.gyp:app_list_shower',
|
| '../ui/aura/aura.gyp:aura',
|
| '../ui/base/ime/ui_base_ime.gyp:ui_base_ime',
|
| '../ui/base/ui_base.gyp:ui_base',
|
|
|