| 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 5f5b39ec6d463a0df405856bd0532aa1b89ac413..9fc7a7f21ccff8a71a0523698929702055b8757f 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
|
| @@ -34,20 +34,20 @@ 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 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;
|
| + 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;
|
| + 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;
|
|
|
| private:
|
| // Get the favicon for the browser list entry for |web_contents|.
|
|
|