Refactor LauncherItemController and LauncherItemDelegate

chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h

Index: chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h
diff --git a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h
index 2ba1c247af0208b60f40fe7a4cad107b175d223a..3dc672681c788d182dbcdd186d5eab4c71f0e30b 100644
--- a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h
+++ b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h
@@ -33,19 +33,25 @@ class AppShortcutLauncherItemController : public LauncherItemController {
 
   virtual ~AppShortcutLauncherItemController();
 
+  std::vector<content::WebContents*> GetRunningApplications();
+
   // LauncherItemController overrides:
-  virtual string16 GetTitle() OVERRIDE;
   virtual bool IsCurrentlyShownInWindow(aura::Window* window) const OVERRIDE;
   virtual bool IsOpen() const OVERRIDE;
   virtual bool IsVisible() const OVERRIDE;
   virtual void Launch(ash::LaunchSource source, int event_flags) OVERRIDE;
   virtual void Activate(ash::LaunchSource source) OVERRIDE;
   virtual void Close() OVERRIDE;
-  virtual void Clicked(const ui::Event& event) OVERRIDE;
-  virtual void OnRemoved() OVERRIDE;
   virtual ChromeLauncherAppMenuItems GetApplicationList(
       int event_flags) OVERRIDE;
-  std::vector<content::WebContents*> GetRunningApplications();
+  virtual void ItemSelected(const ui::Event& event) OVERRIDE;
+  virtual base::string16 GetTitle() OVERRIDE;
+  virtual ui::MenuModel* CreateContextMenu(
+      aura::RootWindow* root_window) OVERRIDE;
+  virtual ash::LauncherMenuModel* CreateApplicationMenu(
+      int event_flags) OVERRIDE;
+  virtual bool IsDraggable() OVERRIDE;
+  virtual bool ShouldShowTooltip() OVERRIDE;
 
   // Get the refocus url pattern, which can be used to identify this application
   // from a URL link.