ash: Rename more Launcher classes to Shelf*.

ash/ash.gyp

Index: ash/ash.gyp
diff --git a/ash/ash.gyp b/ash/ash.gyp
index c68a2b9a5b86fe939da5536f9e3e5092e1623c57..75fe0fe870d73811172d85d37052ac9d68665569 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -157,9 +157,6 @@
         'launcher/launcher.cc',
         'launcher/launcher.h',
         'launcher/launcher_delegate.h',
-        'launcher/launcher_item_delegate_manager.cc',
-        'launcher/launcher_item_delegate_manager.h',
-        'launcher/launcher_item_delegate.h',
         'launcher/launcher_types.cc',
         'launcher/launcher_types.h',
         'magnifier/magnification_controller.cc',
@@ -211,9 +208,13 @@
         'shelf/shelf_button.h',
         'shelf/shelf_button_host.h',
         'shelf/shelf_icon_observer.h',
+        'shelf/shelf_item_delegate.h',
+        'shelf/shelf_item_delegate_manager.cc',
+        'shelf/shelf_item_delegate_manager.h',
         'shelf/shelf_layout_manager.cc',
         'shelf/shelf_layout_manager.h',
         'shelf/shelf_layout_manager_observer.h',
+        'shelf/shelf_menu_model.h',
         'shelf/shelf_model.cc',
         'shelf/shelf_model.h',
         'shelf/shelf_model_observer.h',
@@ -647,32 +648,30 @@
         'test/ash_test_helper.h',
         'test/cursor_manager_test_api.cc',
         'test/cursor_manager_test_api.h',
-        'test/launcher_test_api.cc',
-        'test/launcher_test_api.h',
-        'test/shelf_view_test_api.cc',
-        'test/shelf_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/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_view_test_api.cc',
+        'test/shelf_view_test_api.h',
         'test/shell_test_api.cc',
         'test/shell_test_api.h',
         'test/test_activation_delegate.cc',
         'test/test_activation_delegate.h',
-        'test/test_user_wallpaper_delegate.cc',
-        '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_shelf_item_delegate.cc',
+        'test/test_shelf_item_delegate.h',
         'test/test_shell_delegate.cc',
         'test/test_shell_delegate.h',
         'test/test_suite.cc',
@@ -681,6 +680,8 @@
         'test/test_suite_init.mm',
         'test/test_system_tray_delegate.cc',
         'test/test_system_tray_delegate.h',
+        'test/test_user_wallpaper_delegate.cc',
+        'test/test_user_wallpaper_delegate.h',
         'test/ui_controls_factory_ash.cc',
         'test/ui_controls_factory_ash.h',
       ],
@@ -798,8 +799,8 @@
         '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_shelf_item_delegate.cc',
+        'shell/window_watcher_shelf_item_delegate.h',
         'shell/window_watcher_unittest.cc',
         'shell_unittest.cc',
         'system/chromeos/managed/tray_locally_managed_user_unittest.cc',
@@ -971,8 +972,8 @@
         '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_shelf_item_delegate.cc',
+        'shell/window_watcher_shelf_item_delegate.h',
         '../content/app/startup_helper_win.cc',
         '../ui/views/test/test_views_delegate.cc',
       ],