| Index: ash/ash.gyp
|
| diff --git a/ash/ash.gyp b/ash/ash.gyp
|
| index 3ef16eb568935d4962fe8ebb6caa233a79a1b1f9..be76e386fc0abdbced92fd64287f93a2b74fa641 100644
|
| --- a/ash/ash.gyp
|
| +++ b/ash/ash.gyp
|
| @@ -519,6 +519,8 @@
|
| 'volume_control_delegate.h',
|
| 'wm/always_on_top_controller.cc',
|
| 'wm/always_on_top_controller.h',
|
| + 'wm/app_list_controller.cc',
|
| + 'wm/app_list_controller.h',
|
| 'wm/ash_focus_rules.cc',
|
| 'wm/ash_focus_rules.h',
|
| 'wm/ash_native_cursor_manager.cc',
|
| @@ -700,6 +702,8 @@
|
| 'desktop_background/desktop_background_controller_test_api.h',
|
| 'shell/toplevel_window.cc',
|
| 'shell/toplevel_window.h',
|
| + 'test/app_list_controller_test_api.cc',
|
| + 'test/app_list_controller_test_api.h',
|
| 'test/ash_test_base.cc',
|
| 'test/ash_test_base.h',
|
| 'test/ash_test_helper.cc',
|
| @@ -814,7 +818,9 @@
|
| 'accelerators/accelerator_table_unittest.cc',
|
| 'accelerators/magnifier_key_scroller_unittest.cc',
|
| 'accelerators/spoken_feedback_toggler_unittest.cc',
|
| - 'app_list/app_list_shower_delegate_unittest.cc',
|
| + # TODO(mfomitchev): uncomment when ash::Shell is switched to using
|
| + # app_list::AppListShower instead of ash::AppListController.
|
| +# 'app_list/app_list_shower_delegate_unittest.cc',
|
| 'ash_touch_exploration_manager_chromeos_unittest.cc',
|
| 'autoclick/autoclick_unittest.cc',
|
| 'content/display/screen_orientation_controller_chromeos_unittest.cc',
|
| @@ -902,6 +908,7 @@
|
| 'utility/partial_screenshot_controller_unittest.cc',
|
| 'virtual_keyboard_controller_unittest.cc',
|
| 'wm/always_on_top_controller_unittest.cc',
|
| + 'wm/app_list_controller_unittest.cc',
|
| 'wm/ash_native_cursor_manager_unittest.cc',
|
| 'wm/ash_focus_rules_unittest.cc',
|
| 'wm/dock/docked_window_layout_manager_unittest.cc',
|
|
|