Revert 226547 "Refactor LauncherItemController and LauncherItemD..."

trunk/src/ash/ash.gyp

Index: trunk/src/ash/ash.gyp
===================================================================
--- trunk/src/ash/ash.gyp	(revision 226578)
+++ trunk/src/ash/ash.gyp	(working copy)
@@ -612,8 +612,6 @@
         'test/launcher_view_test_api.h',
         'test/display_manager_test_api.cc',
         'test/display_manager_test_api.h',
-        'test/launcher_item_delegate_manager_test_api.cc',
-        'test/launcher_item_delegate_manager_test_api.h',
         'test/mirror_window_test_api.cc',
         'test/mirror_window_test_api.h',
         'test/shell_test_api.cc',
@@ -624,12 +622,10 @@
         'test/test_user_wallpaper_delegate.h',
         'test/test_launcher_delegate.cc',
         'test/test_launcher_delegate.h',
-        'test/test_launcher_item_delegate.cc',
-        'test/test_launcher_item_delegate.h',
         'test/test_screenshot_delegate.cc',
         'test/test_screenshot_delegate.cc',
         'test/test_session_state_delegate.cc',
-        'test/test_session_state_delegate.h',
+        'test/test_session_state_delegate.cc',
         'test/test_shell_delegate.cc',
         'test/test_shell_delegate.h',
         'test/test_suite.cc',
@@ -742,21 +738,14 @@
         'shell/context_menu.cc',
         'shell/context_menu.h',
         'shell/launcher_delegate_impl.cc',
-        'shell/launcher_delegate_impl.h',
         'shell/lock_view.cc',
         'shell/panel_window.cc',
-        'shell/panel_window.h',
         'shell/shell_delegate_impl.cc',
         'shell/shell_delegate_impl.h',
         'shell/toplevel_window.cc',
-        'shell/toplevel_window.h',
         'shell/widgets.cc',
         'shell/window_type_launcher.cc',
-        'shell/window_type_launcher.h',
         'shell/window_watcher.cc',
-        'shell/window_watcher.h',
-        'shell/window_watcher_launcher_item_delegate.cc',
-        'shell/window_watcher_launcher_item_delegate.h',
         'shell/window_watcher_unittest.cc',
         'system/chromeos/managed/tray_locally_managed_user_unittest.cc',
         'system/chromeos/network/network_state_notifier_unittest.cc',
@@ -912,8 +901,6 @@
         'shell/window_type_launcher.h',
         'shell/window_watcher.cc',
         'shell/window_watcher.h',
-        'shell/window_watcher_launcher_item_delegate.cc',
-        'shell/window_watcher_launcher_item_delegate.h',
         '../content/app/startup_helper_win.cc',
         '../ui/views/test/test_views_delegate.cc',
       ],