Update To 11.40.268.0

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

diff --git a/src/ash/shell/shell_delegate_impl.cc b/src/ash/shell/shell_delegate_impl.cc
index fb8f605..c9de885 100644 (file)
--- a/src/ash/shell/shell_delegate_impl.cc
+++ b/src/ash/shell/shell_delegate_impl.cc
@@ -33,22 +33,22 @@ namespace {
 class NewWindowDelegateImpl : public NewWindowDelegate {
  public:
   NewWindowDelegateImpl() {}
-  virtual ~NewWindowDelegateImpl() {}
+  ~NewWindowDelegateImpl() override {}
 
   // NewWindowDelegate:
-  virtual void NewTab() OVERRIDE {}
-  virtual void NewWindow(bool incognito) OVERRIDE {
+  void NewTab() override {}
+  void NewWindow(bool incognito) override {
     ash::shell::ToplevelWindow::CreateParams create_params;
     create_params.can_resize = true;
     create_params.can_maximize = true;
     ash::shell::ToplevelWindow::CreateToplevelWindow(create_params);
   }
-  virtual void OpenFileManager() OVERRIDE {}
-  virtual void OpenCrosh() OVERRIDE {}
-  virtual void RestoreTab() OVERRIDE {}
-  virtual void ShowKeyboardOverlay() OVERRIDE {}
-  virtual void ShowTaskManager() OVERRIDE {}
-  virtual void OpenFeedbackPage() OVERRIDE {}
+  void OpenFileManager() override {}
+  void OpenCrosh() override {}
+  void RestoreTab() override {}
+  void ShowKeyboardOverlay() override {}
+  void ShowTaskManager() override {}
+  void OpenFeedbackPage() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NewWindowDelegateImpl);
@@ -57,14 +57,14 @@ class NewWindowDelegateImpl : public NewWindowDelegate {
 class MediaDelegateImpl : public MediaDelegate {
  public:
   MediaDelegateImpl() {}
-  virtual ~MediaDelegateImpl() {}
+  ~MediaDelegateImpl() override {}
 
   // MediaDelegate:
-  virtual void HandleMediaNextTrack() OVERRIDE {}
-  virtual void HandleMediaPlayPause() OVERRIDE {}
-  virtual void HandleMediaPrevTrack() OVERRIDE {}
-  virtual MediaCaptureState GetMediaCaptureState(
-      content::BrowserContext* context) OVERRIDE {
+  void HandleMediaNextTrack() override {}
+  void HandleMediaPlayPause() override {}
+  void HandleMediaPrevTrack() override {}
+  MediaCaptureState GetMediaCaptureState(
+      content::BrowserContext* context) override {
     return MEDIA_CAPTURE_VIDEO;
   }
 
@@ -77,65 +77,62 @@ class SessionStateDelegateImpl : public SessionStateDelegate {
   SessionStateDelegateImpl()
       : screen_locked_(false), user_info_(new user_manager::UserInfoImpl()) {}
 
-  virtual ~SessionStateDelegateImpl() {}
+  ~SessionStateDelegateImpl() override {}
 
   // SessionStateDelegate:
-  virtual content::BrowserContext* GetBrowserContextByIndex(
-      MultiProfileIndex index) OVERRIDE {
+  content::BrowserContext* GetBrowserContextByIndex(
+      MultiProfileIndex index) override {
     return Shell::GetInstance()->delegate()->GetActiveBrowserContext();
   }
-  virtual content::BrowserContext* GetBrowserContextForWindow(
-      aura::Window* window) OVERRIDE {
+  content::BrowserContext* GetBrowserContextForWindow(
+      aura::Window* window) override {
     return Shell::GetInstance()->delegate()->GetActiveBrowserContext();
   }
-  virtual int GetMaximumNumberOfLoggedInUsers() const OVERRIDE { return 3; }
-  virtual int NumberOfLoggedInUsers() const OVERRIDE {
+  int GetMaximumNumberOfLoggedInUsers() const override { return 3; }
+  int NumberOfLoggedInUsers() const override {
     // ash_shell has 2 users.
     return 2;
   }
-  virtual bool IsActiveUserSessionStarted() const OVERRIDE { return true; }
-  virtual bool CanLockScreen() const OVERRIDE { return true; }
-  virtual bool IsScreenLocked() const OVERRIDE { return screen_locked_; }
-  virtual bool ShouldLockScreenBeforeSuspending() const OVERRIDE {
-    return false;
-  }
-  virtual void LockScreen() OVERRIDE {
+  bool IsActiveUserSessionStarted() const override { return true; }
+  bool CanLockScreen() const override { return true; }
+  bool IsScreenLocked() const override { return screen_locked_; }
+  bool ShouldLockScreenBeforeSuspending() const override { return false; }
+  void LockScreen() override {
     shell::CreateLockScreen();
     screen_locked_ = true;
     Shell::GetInstance()->UpdateShelfVisibility();
   }
-  virtual void UnlockScreen() OVERRIDE {
+  void UnlockScreen() override {
     screen_locked_ = false;
     Shell::GetInstance()->UpdateShelfVisibility();
   }
-  virtual bool IsUserSessionBlocked() const OVERRIDE {
+  bool IsUserSessionBlocked() const override {
     return !IsActiveUserSessionStarted() || IsScreenLocked();
   }
-  virtual SessionState GetSessionState() const OVERRIDE {
+  SessionState GetSessionState() const override {
     // Assume that if session is not active we're at login.
     return IsActiveUserSessionStarted() ? SESSION_STATE_ACTIVE
                                         : SESSION_STATE_LOGIN_PRIMARY;
   }
-  virtual const user_manager::UserInfo* GetUserInfo(
-      MultiProfileIndex index) const OVERRIDE {
+  const user_manager::UserInfo* GetUserInfo(
+      MultiProfileIndex index) const override {
     return user_info_.get();
   }
-  virtual const user_manager::UserInfo* GetUserInfo(
-      content::BrowserContext* context) const OVERRIDE {
+  const user_manager::UserInfo* GetUserInfo(
+      content::BrowserContext* context) const override {
     return user_info_.get();
   }
-  virtual bool ShouldShowAvatar(aura::Window* window) const OVERRIDE {
+  bool ShouldShowAvatar(aura::Window* window) const override {
     return !user_info_->GetImage().isNull();
   }
-  virtual void SwitchActiveUser(const std::string& user_id) OVERRIDE {}
-  virtual void CycleActiveUser(CycleUser cycle_user) OVERRIDE {}
-  virtual bool IsMultiProfileAllowedByPrimaryUserPolicy() const OVERRIDE {
+  void SwitchActiveUser(const std::string& user_id) override {}
+  void CycleActiveUser(CycleUser cycle_user) override {}
+  bool IsMultiProfileAllowedByPrimaryUserPolicy() const override {
     return true;
   }
-  virtual void AddSessionStateObserver(
-      ash::SessionStateObserver* observer) OVERRIDE {}
-  virtual void RemoveSessionStateObserver(
-      ash::SessionStateObserver* observer) OVERRIDE {}
+  void AddSessionStateObserver(ash::SessionStateObserver* observer) override {}
+  void RemoveSessionStateObserver(
+      ash::SessionStateObserver* observer) override {}
 
  private:
   bool screen_locked_;