Revert 226547 "Refactor LauncherItemController and LauncherItemD..."

trunk/src/chrome/browser/ui/ash/launcher/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_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"
 #include "base/memory/scoped_vector.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_types.h"
 #include "ui/events/event.h"
 
 class ChromeLauncherController;
 class ChromeLauncherAppMenuItem;
 
 typedef ScopedVector<ChromeLauncherAppMenuItem> ChromeLauncherAppMenuItems;
 
 namespace aura {
 class Window;
 }
 
 namespace content {
 class WebContents;
 }
 
 // LauncherItemController is used by ChromeLauncherController to track one
 // or more windows associated with a launcher item.
-class LauncherItemController : public ash::LauncherItemDelegate {
+class LauncherItemController {
  public:
   enum Type {
     TYPE_APP,
     TYPE_APP_PANEL,
     TYPE_SHORTCUT,
     TYPE_WINDOWED_APP
   };
 
   LauncherItemController(Type type,
                          const std::string& app_id,
@@ skipping 14 matching lines @@
     DCHECK(locked_);
     locked_--;
   }
   bool locked() { return locked_ > 0; }
 
   bool image_set_by_controller() const { return image_set_by_controller_; }
   void set_image_set_by_controller(bool image_set_by_controller) {
     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.
   virtual bool IsCurrentlyShownInWindow(aura::Window* window) const = 0;
 
   // Returns true if this item is open.
   virtual bool IsOpen() const = 0;
 
   // Returns true if this item is visible (e.g. not minimized).
   virtual bool IsVisible() const = 0;
 
   // Launches a new instance of the app associated with this item.
   virtual void Launch(ash::LaunchSource source, int event_flags) = 0;
 
   // Shows and activates the most-recently-active window associated with the
   // item, or launches the item if it is not currently open.
   virtual void Activate(ash::LaunchSource source) = 0;
 
   // 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;
 
   // Helper function to get the ash::LauncherItemType for the item type.
   ash::LauncherItemType GetLauncherItemType() const;
 
  protected:
   // Helper function to return the title associated with |app_id_|.
   // Returns an empty title if no matching extension can be found.
   string16 GetAppTitle() const;
@@ skipping 10 matching lines @@
   // applications.
   int locked_;
 
   // Set to true if the launcher item image has been set by the controller.
   bool image_set_by_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(LauncherItemController);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_LAUNCHER_ITEM_CONTROLLER_H_