Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / ash / launcher / browser_shortcut_launcher_item_controller.h

diff --git a/src/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h b/src/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h
index d4e64e5..5f5b39e 100644 (file)
--- a/src/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h
+++ b/src/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h
@@ -29,23 +29,25 @@ class BrowserShortcutLauncherItemController : public LauncherItemController {
   // Updates the activation state of the Broswer item.
   void UpdateBrowserItemState();
 
+  // Sets the shelf id for the browser window if the browser is represented.
+  void SetShelfIDForBrowserWindowContents(Browser* browser,
+                                          content::WebContents* web_contents);
+
   // 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 bool Activate(ash::LaunchSource source) OVERRIDE;
   virtual ChromeLauncherAppMenuItems GetApplicationList(
       int event_flags) OVERRIDE;
-  virtual void ItemSelected(const ui::Event& event) OVERRIDE;
+  virtual bool ItemSelected(const ui::Event& event) OVERRIDE;
   virtual base::string16 GetTitle() OVERRIDE;
   virtual ui::MenuModel* CreateContextMenu(
       aura::Window* root_window) OVERRIDE;
-  virtual ash::LauncherMenuModel* CreateApplicationMenu(
-      int event_flags) OVERRIDE;
+  virtual ash::ShelfMenuModel* CreateApplicationMenu(int event_flags) OVERRIDE;
   virtual bool IsDraggable() OVERRIDE;
   virtual bool ShouldShowTooltip() OVERRIDE;
+  virtual void Close() OVERRIDE;
 
  private:
   // Get the favicon for the browser list entry for |web_contents|.
@@ -54,7 +56,7 @@ class BrowserShortcutLauncherItemController : public LauncherItemController {
 
   // Get the title for the browser list entry for |web_contents|.
   // If |web_contents| has not loaded, returns "Net Tab".
-  string16 GetBrowserListTitle(content::WebContents* web_contents) const;
+  base::string16 GetBrowserListTitle(content::WebContents* web_contents) const;
 
   // Check if the given |web_contents| is in incognito mode.
   bool IsIncognito(content::WebContents* web_contents) const;