| Index: chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h
|
| diff --git a/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h b/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h
|
| index 0565dd6ab4b426b294563551206bb9bd5940bfb4..7b40a9ced1d47234711dbc56c7261e47acda77b8 100644
|
| --- a/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h
|
| +++ b/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h
|
| @@ -30,18 +30,25 @@ class BrowserShortcutLauncherItemController : public LauncherItemController {
|
| // Updates the activation state of the Broswer item.
|
| void UpdateBrowserItemState();
|
|
|
| + // Retrieve the list of running applications.
|
| + ChromeLauncherAppMenuItems GetApplicationList(int event_flags);
|
| +
|
| // LauncherItemController overrides:
|
| - virtual string16 GetTitle() OVERRIDE;
|
| virtual bool IsCurrentlyShownInWindow(aura::Window* window) const OVERRIDE;
|
| virtual bool IsOpen() const OVERRIDE;
|
| virtual bool IsVisible() const OVERRIDE;
|
| virtual void Launch(int event_flags) OVERRIDE;
|
| virtual void Activate() OVERRIDE;
|
| virtual void Close() OVERRIDE;
|
| - virtual void Clicked(const ui::Event& event) OVERRIDE;
|
| virtual void OnRemoved() OVERRIDE;
|
| - virtual ChromeLauncherAppMenuItems GetApplicationList(
|
| + virtual void ItemSelected(const ui::Event& event) 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;
|
|
|
| private:
|
| // Get the favicon for the browser list entry for |web_contents|.
|
|
|