| 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 9fc7a7f21ccff8a71a0523698929702055b8757f..d1a6ec716148b88d10150f1c4b558c6bd1d0ce27 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
|
| @@ -24,7 +24,7 @@ class BrowserShortcutLauncherItemController : public LauncherItemController {
|
| explicit BrowserShortcutLauncherItemController(
|
| ChromeLauncherController* controller);
|
|
|
| - virtual ~BrowserShortcutLauncherItemController();
|
| + ~BrowserShortcutLauncherItemController() override;
|
|
|
| // Updates the activation state of the Broswer item.
|
| void UpdateBrowserItemState();
|
| @@ -34,20 +34,18 @@ class BrowserShortcutLauncherItemController : public LauncherItemController {
|
| content::WebContents* web_contents);
|
|
|
| // LauncherItemController overrides:
|
| - virtual bool IsOpen() const override;
|
| - virtual bool IsVisible() const override;
|
| - virtual void Launch(ash::LaunchSource source, int event_flags) override;
|
| - virtual bool Activate(ash::LaunchSource source) override;
|
| - virtual ChromeLauncherAppMenuItems GetApplicationList(
|
| - int event_flags) 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::ShelfMenuModel* CreateApplicationMenu(int event_flags) override;
|
| - virtual bool IsDraggable() override;
|
| - virtual bool ShouldShowTooltip() override;
|
| - virtual void Close() override;
|
| + bool IsOpen() const override;
|
| + bool IsVisible() const override;
|
| + void Launch(ash::LaunchSource source, int event_flags) override;
|
| + bool Activate(ash::LaunchSource source) override;
|
| + ChromeLauncherAppMenuItems GetApplicationList(int event_flags) override;
|
| + bool ItemSelected(const ui::Event& event) override;
|
| + base::string16 GetTitle() override;
|
| + ui::MenuModel* CreateContextMenu(aura::Window* root_window) override;
|
| + ash::ShelfMenuModel* CreateApplicationMenu(int event_flags) override;
|
| + bool IsDraggable() override;
|
| + bool ShouldShowTooltip() override;
|
| + void Close() override;
|
|
|
| private:
|
| // Get the favicon for the browser list entry for |web_contents|.
|
|
|