Refactor LauncherItemController and LauncherItemDelegate

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

Index: chrome/browser/ui/ash/launcher/launcher_item_controller.h
diff --git a/chrome/browser/ui/ash/launcher/launcher_item_controller.h b/chrome/browser/ui/ash/launcher/launcher_item_controller.h
index df14b78630b39a40dc1422d5874944f99a7d1fba..6398e97614e905510dc75eca6d04976993bea16e 100644
--- a/chrome/browser/ui/ash/launcher/launcher_item_controller.h
+++ b/chrome/browser/ui/ash/launcher/launcher_item_controller.h
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_ITEM_CONTROLLER_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_ITEM_CONTROLLER_H_
 
+#include "ash/launcher/launcher_item_delegate.h"
 #include "ash/launcher/launcher_types.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ -28,7 +29,7 @@ class WebContents;
 
 // LauncherItemController is used by ChromeLauncherController to track one
 // or more windows associated with a launcher item.
-class LauncherItemController {
+class LauncherItemController : public ash::LauncherItemDelegate {
  public:
   enum Type {
     TYPE_APP,
@@ -63,9 +64,6 @@ class LauncherItemController {
     image_set_by_controller_ = image_set_by_controller;
   }
 
-  // Returns the title for this item.
-  virtual string16 GetTitle() = 0;
-
   // Returns true if this item controls |window|.
   // When this |window| has multiple applications/tabs, it only returns true
   // it controls the currently visible app/tab.
@@ -87,17 +85,6 @@ class LauncherItemController {
   // Closes all windows associated with this item.
   virtual void Close() = 0;
 
-  // Called when the item is clicked. The behavior varies by the number of
-  // windows associated with the item:
-  // * One window: toggles the minimize state.
-  // * Multiple windows: cycles the active window.
-  // The |event| is dispatched by a view, therefore the type of the
-  // event's target is |views::View|.
-  virtual void Clicked(const ui::Event& event) = 0;
-
-  // Called when the controlled item is removed from the launcher.
-  virtual void OnRemoved() = 0;
-
   // Called to retrieve the list of running applications.
   virtual ChromeLauncherAppMenuItems GetApplicationList(int event_flags) = 0;