ash: Rename more Launcher classes to Shelf*.

ash/shell/window_watcher_shelf_item_delegate.h

Index: ash/shell/window_watcher_shelf_item_delegate.h
diff --git a/ash/shell/window_watcher_launcher_item_delegate.h b/ash/shell/window_watcher_shelf_item_delegate.h
similarity index 39%
rename from ash/shell/window_watcher_launcher_item_delegate.h
rename to ash/shell/window_watcher_shelf_item_delegate.h
index 280f3b435ee7d813058e56bd34512574df4bd2a1..277a421d8b46bc1ea1b62b74c7a8f2129a0ca4ac 100644
--- a/ash/shell/window_watcher_launcher_item_delegate.h
+++ b/ash/shell/window_watcher_shelf_item_delegate.h
@@ -2,10 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_SHELL_WINDOW_WATCHER_LAUNCHER_ITEM_DELEGATE_
-#define ASH_SHELL_WINDOW_WATCHER_LAUNCHER_ITEM_DELEGATE_
+#ifndef ASH_SHELL_WINDOW_WATCHER_SHELF_ITEM_DELEGATE_H_
+#define ASH_SHELL_WINDOW_WATCHER_SHELF_ITEM_DELEGATE_H_
 
-#include "ash/launcher/launcher_item_delegate.h"
+#include "ash/launcher/launcher_types.h"
+#include "ash/shelf/shelf_item_delegate.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 
@@ -14,31 +15,28 @@ namespace shell {
 
 class WindowWatcher;
 
-// LauncherItemDelegate implementation used by WindowWatcher.
-class WindowWatcherLauncherItemDelegate : public ash::LauncherItemDelegate {
+// ShelfItemDelegate implementation used by WindowWatcher.
+class WindowWatcherShelfItemDelegate : public ShelfItemDelegate {
  public:
-  WindowWatcherLauncherItemDelegate(ash::LauncherID id,
-                                    ash::shell::WindowWatcher* watcher);
-  virtual ~WindowWatcherLauncherItemDelegate();
+  WindowWatcherShelfItemDelegate(LauncherID id, WindowWatcher* watcher);
+  virtual ~WindowWatcherShelfItemDelegate();
 
-  // ash::LauncherItemDelegate overrides:
+  // ash::ShelfItemDelegate overrides:
   virtual bool ItemSelected(const ui::Event& event) OVERRIDE;
   virtual base::string16 GetTitle() OVERRIDE;
-  virtual ui::MenuModel* CreateContextMenu(
-      aura::Window* root_window) OVERRIDE;
-  virtual ash::LauncherMenuModel* CreateApplicationMenu(
-      int event_flags) OVERRIDE;
+  virtual ui::MenuModel* CreateContextMenu(aura::Window* root_window) OVERRIDE;
+  virtual LauncherMenuModel* CreateApplicationMenu(int event_flags) OVERRIDE;
   virtual bool IsDraggable() OVERRIDE;
   virtual bool ShouldShowTooltip() OVERRIDE;
 
  private:
-  ash::LauncherID id_;
-  ash::shell::WindowWatcher* watcher_;
+  LauncherID id_;
+  WindowWatcher* watcher_;
 
-  DISALLOW_COPY_AND_ASSIGN(WindowWatcherLauncherItemDelegate);
+  DISALLOW_COPY_AND_ASSIGN(WindowWatcherShelfItemDelegate);
 };
 
 }  // namespace shell
 }  // namespace ash
 
-#endif  // ASH_SHELL_WINDOW_WATCHER_LAUNCHER_ITEM_DELEGATE_
+#endif  // ASH_SHELL_WINDOW_WATCHER_SHELF_ITEM_DELEGATE_H_