Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ash / shell / shell_delegate_impl.h

diff --git a/src/ash/shell/shell_delegate_impl.h b/src/ash/shell/shell_delegate_impl.h
index a995328..502161d 100644 (file)
--- a/src/ash/shell/shell_delegate_impl.h
+++ b/src/ash/shell/shell_delegate_impl.h
@@ -27,43 +27,41 @@ class WindowWatcher;
 class ShellDelegateImpl : public ash::ShellDelegate {
  public:
   ShellDelegateImpl();
-  virtual ~ShellDelegateImpl();
+  ~ShellDelegateImpl() override;
 
   void SetWatcher(WindowWatcher* watcher);
   void set_browser_context(content::BrowserContext* browser_context) {
     browser_context_ = browser_context;
   }
 
-  virtual bool IsFirstRunAfterBoot() const OVERRIDE;
-  virtual bool IsIncognitoAllowed() const OVERRIDE;
-  virtual bool IsMultiProfilesEnabled() const OVERRIDE;
-  virtual bool IsRunningInForcedAppMode() const OVERRIDE;
-  virtual bool IsMultiAccountEnabled() const OVERRIDE;
-  virtual void PreInit() OVERRIDE;
-  virtual void PreShutdown() OVERRIDE;
-  virtual void Exit() OVERRIDE;
-  virtual keyboard::KeyboardControllerProxy*
-      CreateKeyboardControllerProxy() OVERRIDE;
-  virtual void VirtualKeyboardActivated(bool activated) OVERRIDE;
-  virtual void AddVirtualKeyboardStateObserver(
-      VirtualKeyboardStateObserver* observer) OVERRIDE;
-  virtual void RemoveVirtualKeyboardStateObserver(
-      VirtualKeyboardStateObserver* observer) OVERRIDE;
-  virtual content::BrowserContext* GetActiveBrowserContext() OVERRIDE;
-  virtual app_list::AppListViewDelegate* GetAppListViewDelegate() OVERRIDE;
-  virtual ShelfDelegate* CreateShelfDelegate(ShelfModel* model) OVERRIDE;
-  virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE;
-  virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;
-  virtual ash::SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE;
-  virtual ash::AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE;
-  virtual ash::NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE;
-  virtual ash::MediaDelegate* CreateMediaDelegate() OVERRIDE;
-  virtual ui::MenuModel* CreateContextMenu(
-      aura::Window* root_window,
-      ash::ShelfItemDelegate* item_delegate,
-      ash::ShelfItem* item) OVERRIDE;
-  virtual GPUSupport* CreateGPUSupport() OVERRIDE;
-  virtual base::string16 GetProductName() const OVERRIDE;
+  bool IsFirstRunAfterBoot() const override;
+  bool IsIncognitoAllowed() const override;
+  bool IsMultiProfilesEnabled() const override;
+  bool IsRunningInForcedAppMode() const override;
+  bool IsMultiAccountEnabled() const override;
+  void PreInit() override;
+  void PreShutdown() override;
+  void Exit() override;
+  keyboard::KeyboardControllerProxy* CreateKeyboardControllerProxy() override;
+  void VirtualKeyboardActivated(bool activated) override;
+  void AddVirtualKeyboardStateObserver(
+      VirtualKeyboardStateObserver* observer) override;
+  void RemoveVirtualKeyboardStateObserver(
+      VirtualKeyboardStateObserver* observer) override;
+  content::BrowserContext* GetActiveBrowserContext() override;
+  app_list::AppListViewDelegate* GetAppListViewDelegate() override;
+  ShelfDelegate* CreateShelfDelegate(ShelfModel* model) override;
+  ash::SystemTrayDelegate* CreateSystemTrayDelegate() override;
+  ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override;
+  ash::SessionStateDelegate* CreateSessionStateDelegate() override;
+  ash::AccessibilityDelegate* CreateAccessibilityDelegate() override;
+  ash::NewWindowDelegate* CreateNewWindowDelegate() override;
+  ash::MediaDelegate* CreateMediaDelegate() override;
+  ui::MenuModel* CreateContextMenu(aura::Window* root_window,
+                                   ash::ShelfItemDelegate* item_delegate,
+                                   ash::ShelfItem* item) override;
+  GPUSupport* CreateGPUSupport() override;
+  base::string16 GetProductName() const override;
 
  private:
   // Used to update Launcher. Owned by main.