Index: chrome/browser/ui/ash/system_tray_delegate_common.h |
diff --git a/chrome/browser/ui/ash/system_tray_delegate_common.h b/chrome/browser/ui/ash/system_tray_delegate_common.h |
index 42a79acd201edcb1512c7bec13dca6991b337b50..f8fb432135af241c0bd2500da32099c05ec092cd 100644 |
--- a/chrome/browser/ui/ash/system_tray_delegate_common.h |
+++ b/chrome/browser/ui/ash/system_tray_delegate_common.h |
@@ -25,83 +25,76 @@ class SystemTrayDelegateCommon : public ash::SystemTrayDelegate, |
public: |
SystemTrayDelegateCommon(); |
- virtual ~SystemTrayDelegateCommon(); |
+ ~SystemTrayDelegateCommon() override; |
// Overridden from ash::SystemTrayDelegate: |
- virtual void Initialize() override; |
- virtual void Shutdown() override; |
- virtual bool GetTrayVisibilityOnStartup() override; |
- virtual ash::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 void GetSystemUpdateInfo(ash::UpdateInfo* info) 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 ShowSupervisedUserInfo() override; |
- virtual void ShowEnterpriseInfo() 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( |
- ash::BluetoothDeviceList* list) override; |
- virtual void BluetoothStartDiscovering() override; |
- virtual void BluetoothStopDiscovering() override; |
- virtual void ConnectToBluetoothDevice(const std::string& address) override; |
- virtual bool IsBluetoothDiscovering() override; |
- virtual void GetCurrentIME(ash::IMEInfo* info) override; |
- virtual void GetAvailableIMEList(ash::IMEInfoList* list) override; |
- virtual void GetCurrentIMEProperties(ash::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 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 ash::VolumeControlDelegate* GetVolumeControlDelegate() const override; |
- virtual void SetVolumeControlDelegate( |
+ void Initialize() override; |
+ void Shutdown() override; |
+ bool GetTrayVisibilityOnStartup() override; |
+ ash::user::LoginStatus GetUserLoginStatus() const override; |
+ void ChangeProfilePicture() override; |
+ const std::string GetEnterpriseDomain() const override; |
+ const base::string16 GetEnterpriseMessage() const override; |
+ const std::string GetSupervisedUserManager() const override; |
+ const base::string16 GetSupervisedUserManagerName() const override; |
+ const base::string16 GetSupervisedUserMessage() const override; |
+ bool IsUserSupervised() const override; |
+ void GetSystemUpdateInfo(ash::UpdateInfo* info) const override; |
+ base::HourClockType GetHourClockType() const override; |
+ void ShowSettings() override; |
+ bool ShouldShowSettings() override; |
+ void ShowDateSettings() override; |
+ void ShowSetTimeDialog() override; |
+ void ShowNetworkSettings(const std::string& service_path) override; |
+ void ShowBluetoothSettings() override; |
+ void ShowDisplaySettings() override; |
+ void ShowChromeSlow() override; |
+ bool ShouldShowDisplayNotification() override; |
+ void ShowIMESettings() override; |
+ void ShowHelp() override; |
+ void ShowAccessibilityHelp() override; |
+ void ShowAccessibilitySettings() override; |
+ void ShowPublicAccountInfo() override; |
+ void ShowSupervisedUserInfo() override; |
+ void ShowEnterpriseInfo() override; |
+ void ShowUserLogin() override; |
+ bool ShowSpringChargerReplacementDialog() override; |
+ bool IsSpringChargerReplacementDialogVisible() override; |
+ bool HasUserConfirmedSafeSpringCharger() override; |
+ void ShutDown() override; |
+ void SignOut() override; |
+ void RequestLockScreen() override; |
+ void RequestRestartForUpdate() override; |
+ void GetAvailableBluetoothDevices(ash::BluetoothDeviceList* list) override; |
+ void BluetoothStartDiscovering() override; |
+ void BluetoothStopDiscovering() override; |
+ void ConnectToBluetoothDevice(const std::string& address) override; |
+ bool IsBluetoothDiscovering() override; |
+ void GetCurrentIME(ash::IMEInfo* info) override; |
+ void GetAvailableIMEList(ash::IMEInfoList* list) override; |
+ void GetCurrentIMEProperties(ash::IMEPropertyInfoList* list) override; |
+ void SwitchIME(const std::string& ime_id) override; |
+ void ActivateIMEProperty(const std::string& key) override; |
+ void ManageBluetoothDevices() override; |
+ void ToggleBluetooth() override; |
+ void ShowOtherNetworkDialog(const std::string& type) override; |
+ bool GetBluetoothAvailable() override; |
+ bool GetBluetoothEnabled() override; |
+ bool GetBluetoothDiscovering() override; |
+ void ChangeProxySettings() override; |
+ ash::VolumeControlDelegate* GetVolumeControlDelegate() const override; |
+ void SetVolumeControlDelegate( |
scoped_ptr<ash::VolumeControlDelegate> delegate) override; |
- virtual bool GetSessionStartTime( |
- 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; |
- virtual ash::tray::UserAccountsDelegate* GetUserAccountsDelegate( |
+ bool GetSessionStartTime(base::TimeTicks* session_start_time) override; |
+ bool GetSessionLengthLimit(base::TimeDelta* session_length_limit) override; |
+ int GetSystemTrayMenuWidth() override; |
+ void ActiveUserWasChanged() override; |
+ bool IsSearchKeyMappedToCapsLock() override; |
+ ash::tray::UserAccountsDelegate* GetUserAccountsDelegate( |
const std::string& user_id) override; |
- virtual void AddCustodianInfoTrayObserver( |
+ void AddCustodianInfoTrayObserver( |
ash::CustodianInfoTrayObserver* observer) override; |
- virtual void RemoveCustodianInfoTrayObserver( |
+ void RemoveCustodianInfoTrayObserver( |
ash::CustodianInfoTrayObserver* observer) override; |
private: |
@@ -110,9 +103,9 @@ class SystemTrayDelegateCommon : public ash::SystemTrayDelegate, |
void UpdateClockType(); |
// content::NotificationObserver implementation. |
- virtual void Observe(int type, |
- const content::NotificationSource& source, |
- const content::NotificationDetails& details) override; |
+ void Observe(int type, |
+ const content::NotificationSource& source, |
+ const content::NotificationDetails& details) override; |
scoped_ptr<content::NotificationRegistrar> registrar_; |
base::HourClockType clock_type_; |