1 files changed, 66 insertions, 66 deletions
diff --git a/ash/system/tray/default_system_tray_delegate.h b/ash/system/tray/default_system_tray_delegate.h
index 359dca4..a1a5367 100644
--- a/ash/system/tray/default_system_tray_delegate.h
+++ b/ash/system/tray/default_system_tray_delegate.h
@@ -18,77 +18,77 @@ class ASH_EXPORT DefaultSystemTrayDelegate : public SystemTrayDelegate {
   virtual ~DefaultSystemTrayDelegate();
 
   // Overridden from SystemTrayDelegate:
-  virtual void Initialize() OVERRIDE;
-  virtual void Shutdown() OVERRIDE;
-  virtual bool GetTrayVisibilityOnStartup() OVERRIDE;
-  virtual user::LoginStatus GetUserLoginStatus() const OVERRIDE;
-  virtual void ChangeProfilePicture() OVERRIDE;
-  virtual const std::string GetEnterpriseDomain() const OVERRIDE;
-  virtual const base::string16 GetEnterpriseMessage() const OVERRIDE;
-  virtual const std::string GetSupervisedUserManager() const OVERRIDE;
+  virtual void Initialize() override;
+  virtual void Shutdown() override;
+  virtual bool GetTrayVisibilityOnStartup() override;
+  virtual user::LoginStatus GetUserLoginStatus() const override;
+  virtual void ChangeProfilePicture() override;
+  virtual const std::string GetEnterpriseDomain() const override;
+  virtual const base::string16 GetEnterpriseMessage() const override;
+  virtual const std::string GetSupervisedUserManager() const override;
   virtual const base::string16 GetSupervisedUserManagerName() const
-      OVERRIDE;
-  virtual const base::string16 GetSupervisedUserMessage() const OVERRIDE;
-  virtual bool IsUserSupervised() const OVERRIDE;
-  virtual bool SystemShouldUpgrade() const OVERRIDE;
-  virtual base::HourClockType GetHourClockType() const OVERRIDE;
-  virtual void ShowSettings() OVERRIDE;
-  virtual bool ShouldShowSettings() OVERRIDE;
-  virtual void ShowDateSettings() OVERRIDE;
-  virtual void ShowSetTimeDialog() OVERRIDE;
-  virtual void ShowNetworkSettings(const std::string& service_path) OVERRIDE;
-  virtual void ShowBluetoothSettings() OVERRIDE;
-  virtual void ShowDisplaySettings() OVERRIDE;
-  virtual void ShowChromeSlow() OVERRIDE;
-  virtual bool ShouldShowDisplayNotification() OVERRIDE;
-  virtual void ShowIMESettings() OVERRIDE;
-  virtual void ShowHelp() OVERRIDE;
-  virtual void ShowAccessibilityHelp() OVERRIDE;
-  virtual void ShowAccessibilitySettings() OVERRIDE;
-  virtual void ShowPublicAccountInfo() OVERRIDE;
-  virtual void ShowEnterpriseInfo() OVERRIDE;
-  virtual void ShowSupervisedUserInfo() OVERRIDE;
-  virtual void ShowUserLogin() OVERRIDE;
-  virtual bool ShowSpringChargerReplacementDialog() OVERRIDE;
-  virtual bool IsSpringChargerReplacementDialogVisible() OVERRIDE;
-  virtual bool HasUserConfirmedSafeSpringCharger() OVERRIDE;
-  virtual void ShutDown() OVERRIDE;
-  virtual void SignOut() OVERRIDE;
-  virtual void RequestLockScreen() OVERRIDE;
-  virtual void RequestRestartForUpdate() OVERRIDE;
-  virtual void GetAvailableBluetoothDevices(BluetoothDeviceList* list) OVERRIDE;
-  virtual void BluetoothStartDiscovering() OVERRIDE;
-  virtual void BluetoothStopDiscovering() OVERRIDE;
-  virtual void ConnectToBluetoothDevice(const std::string& address) OVERRIDE;
-  virtual void GetCurrentIME(IMEInfo* info) OVERRIDE;
-  virtual void GetAvailableIMEList(IMEInfoList* list) OVERRIDE;
-  virtual void GetCurrentIMEProperties(IMEPropertyInfoList* list) OVERRIDE;
-  virtual void SwitchIME(const std::string& ime_id) OVERRIDE;
-  virtual void ActivateIMEProperty(const std::string& key) OVERRIDE;
-  virtual void ShowNetworkConfigure(const std::string& network_id) OVERRIDE;
-  virtual bool EnrollNetwork(const std::string& network_id) OVERRIDE;
-  virtual void ManageBluetoothDevices() OVERRIDE;
-  virtual void ToggleBluetooth() OVERRIDE;
-  virtual bool IsBluetoothDiscovering() OVERRIDE;
-  virtual void ShowMobileSimDialog() OVERRIDE;
-  virtual void ShowMobileSetupDialog(const std::string& service_path) OVERRIDE;
-  virtual void ShowOtherNetworkDialog(const std::string& type) OVERRIDE;
-  virtual bool GetBluetoothAvailable() OVERRIDE;
-  virtual bool GetBluetoothEnabled() OVERRIDE;
-  virtual bool GetBluetoothDiscovering() OVERRIDE;
-  virtual void ChangeProxySettings() OVERRIDE;
-  virtual VolumeControlDelegate* GetVolumeControlDelegate() const OVERRIDE;
+      override;
+  virtual const base::string16 GetSupervisedUserMessage() const override;
+  virtual bool IsUserSupervised() const override;
+  virtual bool SystemShouldUpgrade() const override;
+  virtual base::HourClockType GetHourClockType() const override;
+  virtual void ShowSettings() override;
+  virtual bool ShouldShowSettings() override;
+  virtual void ShowDateSettings() override;
+  virtual void ShowSetTimeDialog() override;
+  virtual void ShowNetworkSettings(const std::string& service_path) override;
+  virtual void ShowBluetoothSettings() override;
+  virtual void ShowDisplaySettings() override;
+  virtual void ShowChromeSlow() override;
+  virtual bool ShouldShowDisplayNotification() override;
+  virtual void ShowIMESettings() override;
+  virtual void ShowHelp() override;
+  virtual void ShowAccessibilityHelp() override;
+  virtual void ShowAccessibilitySettings() override;
+  virtual void ShowPublicAccountInfo() override;
+  virtual void ShowEnterpriseInfo() override;
+  virtual void ShowSupervisedUserInfo() override;
+  virtual void ShowUserLogin() override;
+  virtual bool ShowSpringChargerReplacementDialog() override;
+  virtual bool IsSpringChargerReplacementDialogVisible() override;
+  virtual bool HasUserConfirmedSafeSpringCharger() override;
+  virtual void ShutDown() override;
+  virtual void SignOut() override;
+  virtual void RequestLockScreen() override;
+  virtual void RequestRestartForUpdate() override;
+  virtual void GetAvailableBluetoothDevices(BluetoothDeviceList* list) override;
+  virtual void BluetoothStartDiscovering() override;
+  virtual void BluetoothStopDiscovering() override;
+  virtual void ConnectToBluetoothDevice(const std::string& address) override;
+  virtual void GetCurrentIME(IMEInfo* info) override;
+  virtual void GetAvailableIMEList(IMEInfoList* list) override;
+  virtual void GetCurrentIMEProperties(IMEPropertyInfoList* list) override;
+  virtual void SwitchIME(const std::string& ime_id) override;
+  virtual void ActivateIMEProperty(const std::string& key) override;
+  virtual void ShowNetworkConfigure(const std::string& network_id) override;
+  virtual bool EnrollNetwork(const std::string& network_id) override;
+  virtual void ManageBluetoothDevices() override;
+  virtual void ToggleBluetooth() override;
+  virtual bool IsBluetoothDiscovering() override;
+  virtual void ShowMobileSimDialog() override;
+  virtual void ShowMobileSetupDialog(const std::string& service_path) override;
+  virtual void ShowOtherNetworkDialog(const std::string& type) override;
+  virtual bool GetBluetoothAvailable() override;
+  virtual bool GetBluetoothEnabled() override;
+  virtual bool GetBluetoothDiscovering() override;
+  virtual void ChangeProxySettings() override;
+  virtual VolumeControlDelegate* GetVolumeControlDelegate() const override;
   virtual void SetVolumeControlDelegate(
-      scoped_ptr<VolumeControlDelegate> delegate) OVERRIDE;
+      scoped_ptr<VolumeControlDelegate> delegate) override;
   virtual bool GetSessionStartTime(
-      base::TimeTicks* session_start_time) OVERRIDE;
+      base::TimeTicks* session_start_time) override;
   virtual bool GetSessionLengthLimit(
-      base::TimeDelta* session_length_limit) OVERRIDE;
-  virtual int GetSystemTrayMenuWidth() OVERRIDE;
-  virtual void ActiveUserWasChanged() OVERRIDE;
-  virtual bool IsSearchKeyMappedToCapsLock() OVERRIDE;
+      base::TimeDelta* session_length_limit) override;
+  virtual int GetSystemTrayMenuWidth() override;
+  virtual void ActiveUserWasChanged() override;
+  virtual bool IsSearchKeyMappedToCapsLock() override;
   virtual tray::UserAccountsDelegate* GetUserAccountsDelegate(
-      const std::string& user_id) OVERRIDE;
+      const std::string& user_id) override;
 
  private:
   bool bluetooth_enabled_;