Revert 226547 "Refactor LauncherItemController and LauncherItemD..."

trunk/src/ash/shell/launcher_delegate_impl.h

Index: trunk/src/ash/shell/launcher_delegate_impl.h
===================================================================
--- trunk/src/ash/shell/launcher_delegate_impl.h	(revision 226578)
+++ trunk/src/ash/shell/launcher_delegate_impl.h	(working copy)
@@ -6,6 +6,7 @@
 #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 {
@@ -17,7 +18,8 @@
 
 class WindowWatcher;
 
-class LauncherDelegateImpl : public ash::LauncherDelegate {
+class LauncherDelegateImpl : public ash::LauncherDelegate,
+                             public ash::LauncherItemDelegate {
  public:
   explicit LauncherDelegateImpl(WindowWatcher* watcher);
   virtual ~LauncherDelegateImpl();
@@ -35,6 +37,19 @@
   virtual bool CanPin() const 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_;