Refactor LauncherItemController and LauncherItemDelegate

ash/shell/launcher_delegate_impl.h

Index: ash/shell/launcher_delegate_impl.h
diff --git a/ash/shell/launcher_delegate_impl.h b/ash/shell/launcher_delegate_impl.h
index d6945d7c0217cbf4f36d37e3367de965e0a6e0e4..afc17dc52f92f94433110171e0d859e1fe54054e 100644
--- a/ash/shell/launcher_delegate_impl.h
+++ b/ash/shell/launcher_delegate_impl.h
@@ -6,7 +6,6 @@
 #define ASH_SHELL_LAUNCHER_DELEGATE_IMPL_H_
 
 #include "ash/launcher/launcher_delegate.h"
-#include "ash/launcher/launcher_item_delegate.h"
 #include "base/compiler_specific.h"
 
 namespace aura {
@@ -18,8 +17,7 @@ namespace shell {
 
 class WindowWatcher;
 
-class LauncherDelegateImpl : public ash::LauncherDelegate,
-                             public ash::LauncherItemDelegate {
+class LauncherDelegateImpl : public ash::LauncherDelegate {
  public:
   explicit LauncherDelegateImpl(WindowWatcher* watcher);
   virtual ~LauncherDelegateImpl();
@@ -36,19 +34,6 @@ class LauncherDelegateImpl : public ash::LauncherDelegate,
   virtual bool IsAppPinned(const std::string& app_id) OVERRIDE;
   virtual void UnpinAppWithID(const std::string& app_id) OVERRIDE;
 
-  // LauncherItemDelegate overrides:
-  virtual void ItemSelected(const ash::LauncherItem& item,
-                           const ui::Event& event) OVERRIDE;
-  virtual base::string16 GetTitle(const ash::LauncherItem& item) OVERRIDE;
-  virtual ui::MenuModel* CreateContextMenu(
-      const ash::LauncherItem& item,
-      aura::RootWindow* root) OVERRIDE;
-  virtual ash::LauncherMenuModel* CreateApplicationMenu(
-      const ash::LauncherItem&,
-      int event_flags) OVERRIDE;
-  virtual bool IsDraggable(const ash::LauncherItem& item) OVERRIDE;
-  virtual bool ShouldShowTooltip(const LauncherItem& item) OVERRIDE;
-
  private:
   // Used to update Launcher. Owned by main.
   WindowWatcher* watcher_;