Update To 11.40.268.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 5f5b39e..d1a6ec7 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
@@ -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|.