| Index: chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h
|
| diff --git a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h
|
| index 68a64f47e590cc808d23615b63cbf2fd1f81e594..f51f0c4ad45e4f1e0d8646c6b6f2e662a47ea37c 100644
|
| --- a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h
|
| +++ b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h
|
| @@ -32,25 +32,23 @@ class AppShortcutLauncherItemController : public LauncherItemController {
|
| AppShortcutLauncherItemController(const std::string& app_id,
|
| ChromeLauncherController* controller);
|
|
|
| - virtual ~AppShortcutLauncherItemController();
|
| + ~AppShortcutLauncherItemController() override;
|
|
|
| std::vector<content::WebContents*> GetRunningApplications();
|
|
|
| // 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;
|
|
|
| // Get the refocus url pattern, which can be used to identify this application
|
| // from a URL link.
|
|
|