Refactor LauncherItemController and LauncherItemDelegate

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_SHELL_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_SHELL_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_
 
 #include <list>
 #include <string>
 
@@ skipping 13 matching lines @@
 namespace gfx {
 class Image;
 }
 
 class ChromeLauncherController;
 
 // This is a ShellWindowItemLauncherController for shell windows. There is one
 // 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
 
 class ShellWindowLauncherItemController : public LauncherItemController,
                                           public aura::WindowObserver {
  public:
   ShellWindowLauncherItemController(Type type,
                                     const std::string& app_launcher_id,
                                     const std::string& app_id,
                                     ChromeLauncherController* controller);
 
   virtual ~ShellWindowLauncherItemController();
 
   void AddShellWindow(apps::ShellWindow* shell_window,
                       ash::LauncherItemStatus status);
 
   void RemoveShellWindowForWindow(aura::Window* window);
 
   void SetActiveWindow(aura::Window* window);
 
   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;
 
   // Get the number of running applications/incarnations of this.
   size_t shell_window_count() const { return shell_windows_.size(); }
 
   // Activates the window at position |index|.
   void ActivateIndexedApp(size_t index);
 
@@ skipping 16 matching lines @@
   // AppLauncherItemController for each |app_launcher_id_|.
   const std::string app_launcher_id_;
 
   // Scoped list of observed windows (for removal on destruction)
   ScopedObserver<aura::Window, aura::WindowObserver> observed_windows_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellWindowLauncherItemController);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_SHELL_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_