Refactor LauncherItemController and LauncherItemDelegate

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

Index: chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.h
diff --git a/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.h b/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.h
index 63c14084c73768b5207b725b2823b92f841cc389..ea2226cfaa1aaa23731a0dde4bb5ec2947a444e6 100644
--- a/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.h
+++ b/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.h
@@ -31,7 +31,7 @@ class ChromeLauncherController;
 // instance per app, per launcher id.
 // For apps with multiple windows, each item controller keeps track of all
 // windows associated with the app and their activation order.
-// Instances are owned by ShellWindowLauncherController.
+// Instances are owned by ash::LauncherItemDelegateManager.
 //
 // Tests are in chrome_launcher_controller_browsertest.cc
 
@@ -54,20 +54,25 @@ class ShellWindowLauncherItemController : public LauncherItemController,
 
   const std::string& app_launcher_id() const { return app_launcher_id_; }
 
-  // LauncherItemController
-  virtual string16 GetTitle() OVERRIDE;
+  // LauncherItemController overrides:
   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;
+  virtual void ItemSelected(const ui::Event& eent) 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;
 
-  // aura::WindowObserver
+  // aura::WindowObserver overrides:
   virtual void OnWindowPropertyChanged(aura::Window* window,
                                        const void* key,
                                        intptr_t old) OVERRIDE;