Index: ash/ash.gyp |
diff --git a/ash/ash.gyp b/ash/ash.gyp |
index 2c4f36eb83eac5a73b03693a484dbecde128fb62..4d7cde1e550c40ee53498accfa25a10d608b46d0 100644 |
--- a/ash/ash.gyp |
+++ b/ash/ash.gyp |
@@ -157,8 +157,6 @@ |
'keyboard_overlay/keyboard_overlay_view.h', |
'keyboard_uma_event_filter.cc', |
'keyboard_uma_event_filter.h', |
- 'launcher/launcher.cc', |
- 'launcher/launcher.h', |
'launcher/launcher_types.cc', |
'launcher/launcher_types.h', |
'magnifier/magnification_controller.cc', |
@@ -203,6 +201,8 @@ |
'shelf/overflow_button.cc', |
'shelf/overflow_button.h', |
'shelf/scoped_observer_with_duplicated_sources.h', |
+ 'shelf/shelf.cc', |
+ 'shelf/shelf.h', |
'shelf/shelf_alignment_menu.cc', |
'shelf/shelf_alignment_menu.h', |
'shelf/shelf_bezel_event_filter.cc', |
@@ -649,10 +649,10 @@ |
'ash_resources', |
], |
'sources': [ |
- 'shell/toplevel_window.cc', |
- 'shell/toplevel_window.h', |
'shell/keyboard_controller_proxy_stub.cc', |
'shell/keyboard_controller_proxy_stub.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', |
@@ -663,14 +663,14 @@ |
'test/cursor_manager_test_api.h', |
'test/display_manager_test_api.cc', |
'test/display_manager_test_api.h', |
- 'test/launcher_test_api.cc', |
- 'test/launcher_test_api.h', |
'test/mirror_window_test_api.cc', |
'test/mirror_window_test_api.h', |
'test/overflow_bubble_view_test_api.cc', |
'test/overflow_bubble_view_test_api.h', |
'test/shelf_item_delegate_manager_test_api.cc', |
'test/shelf_item_delegate_manager_test_api.h', |
+ 'test/shelf_test_api.cc', |
+ 'test/shelf_test_api.h', |
'test/shelf_view_test_api.cc', |
'test/shelf_view_test_api.h', |
'test/shell_test_api.cc', |
@@ -783,7 +783,6 @@ |
'focus_cycler_unittest.cc', |
'keyboard_overlay/keyboard_overlay_delegate_unittest.cc', |
'keyboard_overlay/keyboard_overlay_view_unittest.cc', |
- 'launcher/launcher_unittest.cc', |
'magnifier/magnification_controller_unittest.cc', |
'root_window_controller_unittest.cc', |
'screen_ash_unittest.cc', |
@@ -795,6 +794,7 @@ |
'shelf/shelf_model_unittest.cc', |
'shelf/shelf_navigator_unittest.cc', |
'shelf/shelf_tooltip_manager_unittest.cc', |
+ 'shelf/shelf_unittest.cc', |
'shelf/shelf_view_unittest.cc', |
'shelf/shelf_widget_unittest.cc', |
'shelf/shelf_window_watcher_unittest.cc', |