Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(199)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: ash/system/tray/default_system_tray_delegate.h

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/system/tray/actionable_view.h ('k') | ash/system/tray/default_system_tray_delegate.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_ 5 #ifndef ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_
6 #define ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_ 6 #define ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/system/tray/system_tray_delegate.h" 9 #include "ash/system/tray/system_tray_delegate.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 12
13 namespace ash { 13 namespace ash {
14 14
15 class ASH_EXPORT DefaultSystemTrayDelegate : public SystemTrayDelegate { 15 class ASH_EXPORT DefaultSystemTrayDelegate : public SystemTrayDelegate {
16 public: 16 public:
17 DefaultSystemTrayDelegate(); 17 DefaultSystemTrayDelegate();
18 virtual ~DefaultSystemTrayDelegate(); 18 virtual ~DefaultSystemTrayDelegate();
19 19
20 // Overridden from SystemTrayDelegate: 20 // Overridden from SystemTrayDelegate:
21 virtual void Initialize() OVERRIDE; 21 virtual void Initialize() override;
22 virtual void Shutdown() OVERRIDE; 22 virtual void Shutdown() override;
23 virtual bool GetTrayVisibilityOnStartup() OVERRIDE; 23 virtual bool GetTrayVisibilityOnStartup() override;
24 virtual user::LoginStatus GetUserLoginStatus() const OVERRIDE; 24 virtual user::LoginStatus GetUserLoginStatus() const override;
25 virtual void ChangeProfilePicture() OVERRIDE; 25 virtual void ChangeProfilePicture() override;
26 virtual const std::string GetEnterpriseDomain() const OVERRIDE; 26 virtual const std::string GetEnterpriseDomain() const override;
27 virtual const base::string16 GetEnterpriseMessage() const OVERRIDE; 27 virtual const base::string16 GetEnterpriseMessage() const override;
28 virtual const std::string GetSupervisedUserManager() const OVERRIDE; 28 virtual const std::string GetSupervisedUserManager() const override;
29 virtual const base::string16 GetSupervisedUserManagerName() const 29 virtual const base::string16 GetSupervisedUserManagerName() const
30 OVERRIDE; 30 override;
31 virtual const base::string16 GetSupervisedUserMessage() const OVERRIDE; 31 virtual const base::string16 GetSupervisedUserMessage() const override;
32 virtual bool IsUserSupervised() const OVERRIDE; 32 virtual bool IsUserSupervised() const override;
33 virtual bool SystemShouldUpgrade() const OVERRIDE; 33 virtual bool SystemShouldUpgrade() const override;
34 virtual base::HourClockType GetHourClockType() const OVERRIDE; 34 virtual base::HourClockType GetHourClockType() const override;
35 virtual void ShowSettings() OVERRIDE; 35 virtual void ShowSettings() override;
36 virtual bool ShouldShowSettings() OVERRIDE; 36 virtual bool ShouldShowSettings() override;
37 virtual void ShowDateSettings() OVERRIDE; 37 virtual void ShowDateSettings() override;
38 virtual void ShowSetTimeDialog() OVERRIDE; 38 virtual void ShowSetTimeDialog() override;
39 virtual void ShowNetworkSettings(const std::string& service_path) OVERRIDE; 39 virtual void ShowNetworkSettings(const std::string& service_path) override;
40 virtual void ShowBluetoothSettings() OVERRIDE; 40 virtual void ShowBluetoothSettings() override;
41 virtual void ShowDisplaySettings() OVERRIDE; 41 virtual void ShowDisplaySettings() override;
42 virtual void ShowChromeSlow() OVERRIDE; 42 virtual void ShowChromeSlow() override;
43 virtual bool ShouldShowDisplayNotification() OVERRIDE; 43 virtual bool ShouldShowDisplayNotification() override;
44 virtual void ShowIMESettings() OVERRIDE; 44 virtual void ShowIMESettings() override;
45 virtual void ShowHelp() OVERRIDE; 45 virtual void ShowHelp() override;
46 virtual void ShowAccessibilityHelp() OVERRIDE; 46 virtual void ShowAccessibilityHelp() override;
47 virtual void ShowAccessibilitySettings() OVERRIDE; 47 virtual void ShowAccessibilitySettings() override;
48 virtual void ShowPublicAccountInfo() OVERRIDE; 48 virtual void ShowPublicAccountInfo() override;
49 virtual void ShowEnterpriseInfo() OVERRIDE; 49 virtual void ShowEnterpriseInfo() override;
50 virtual void ShowSupervisedUserInfo() OVERRIDE; 50 virtual void ShowSupervisedUserInfo() override;
51 virtual void ShowUserLogin() OVERRIDE; 51 virtual void ShowUserLogin() override;
52 virtual bool ShowSpringChargerReplacementDialog() OVERRIDE; 52 virtual bool ShowSpringChargerReplacementDialog() override;
53 virtual bool IsSpringChargerReplacementDialogVisible() OVERRIDE; 53 virtual bool IsSpringChargerReplacementDialogVisible() override;
54 virtual bool HasUserConfirmedSafeSpringCharger() OVERRIDE; 54 virtual bool HasUserConfirmedSafeSpringCharger() override;
55 virtual void ShutDown() OVERRIDE; 55 virtual void ShutDown() override;
56 virtual void SignOut() OVERRIDE; 56 virtual void SignOut() override;
57 virtual void RequestLockScreen() OVERRIDE; 57 virtual void RequestLockScreen() override;
58 virtual void RequestRestartForUpdate() OVERRIDE; 58 virtual void RequestRestartForUpdate() override;
59 virtual void GetAvailableBluetoothDevices(BluetoothDeviceList* list) OVERRIDE; 59 virtual void GetAvailableBluetoothDevices(BluetoothDeviceList* list) override;
60 virtual void BluetoothStartDiscovering() OVERRIDE; 60 virtual void BluetoothStartDiscovering() override;
61 virtual void BluetoothStopDiscovering() OVERRIDE; 61 virtual void BluetoothStopDiscovering() override;
62 virtual void ConnectToBluetoothDevice(const std::string& address) OVERRIDE; 62 virtual void ConnectToBluetoothDevice(const std::string& address) override;
63 virtual void GetCurrentIME(IMEInfo* info) OVERRIDE; 63 virtual void GetCurrentIME(IMEInfo* info) override;
64 virtual void GetAvailableIMEList(IMEInfoList* list) OVERRIDE; 64 virtual void GetAvailableIMEList(IMEInfoList* list) override;
65 virtual void GetCurrentIMEProperties(IMEPropertyInfoList* list) OVERRIDE; 65 virtual void GetCurrentIMEProperties(IMEPropertyInfoList* list) override;
66 virtual void SwitchIME(const std::string& ime_id) OVERRIDE; 66 virtual void SwitchIME(const std::string& ime_id) override;
67 virtual void ActivateIMEProperty(const std::string& key) OVERRIDE; 67 virtual void ActivateIMEProperty(const std::string& key) override;
68 virtual void ShowNetworkConfigure(const std::string& network_id) OVERRIDE; 68 virtual void ShowNetworkConfigure(const std::string& network_id) override;
69 virtual bool EnrollNetwork(const std::string& network_id) OVERRIDE; 69 virtual bool EnrollNetwork(const std::string& network_id) override;
70 virtual void ManageBluetoothDevices() OVERRIDE; 70 virtual void ManageBluetoothDevices() override;
71 virtual void ToggleBluetooth() OVERRIDE; 71 virtual void ToggleBluetooth() override;
72 virtual bool IsBluetoothDiscovering() OVERRIDE; 72 virtual bool IsBluetoothDiscovering() override;
73 virtual void ShowMobileSimDialog() OVERRIDE; 73 virtual void ShowMobileSimDialog() override;
74 virtual void ShowMobileSetupDialog(const std::string& service_path) OVERRIDE; 74 virtual void ShowMobileSetupDialog(const std::string& service_path) override;
75 virtual void ShowOtherNetworkDialog(const std::string& type) OVERRIDE; 75 virtual void ShowOtherNetworkDialog(const std::string& type) override;
76 virtual bool GetBluetoothAvailable() OVERRIDE; 76 virtual bool GetBluetoothAvailable() override;
77 virtual bool GetBluetoothEnabled() OVERRIDE; 77 virtual bool GetBluetoothEnabled() override;
78 virtual bool GetBluetoothDiscovering() OVERRIDE; 78 virtual bool GetBluetoothDiscovering() override;
79 virtual void ChangeProxySettings() OVERRIDE; 79 virtual void ChangeProxySettings() override;
80 virtual VolumeControlDelegate* GetVolumeControlDelegate() const OVERRIDE; 80 virtual VolumeControlDelegate* GetVolumeControlDelegate() const override;
81 virtual void SetVolumeControlDelegate( 81 virtual void SetVolumeControlDelegate(
82 scoped_ptr<VolumeControlDelegate> delegate) OVERRIDE; 82 scoped_ptr<VolumeControlDelegate> delegate) override;
83 virtual bool GetSessionStartTime( 83 virtual bool GetSessionStartTime(
84 base::TimeTicks* session_start_time) OVERRIDE; 84 base::TimeTicks* session_start_time) override;
85 virtual bool GetSessionLengthLimit( 85 virtual bool GetSessionLengthLimit(
86 base::TimeDelta* session_length_limit) OVERRIDE; 86 base::TimeDelta* session_length_limit) override;
87 virtual int GetSystemTrayMenuWidth() OVERRIDE; 87 virtual int GetSystemTrayMenuWidth() override;
88 virtual void ActiveUserWasChanged() OVERRIDE; 88 virtual void ActiveUserWasChanged() override;
89 virtual bool IsSearchKeyMappedToCapsLock() OVERRIDE; 89 virtual bool IsSearchKeyMappedToCapsLock() override;
90 virtual tray::UserAccountsDelegate* GetUserAccountsDelegate( 90 virtual tray::UserAccountsDelegate* GetUserAccountsDelegate(
91 const std::string& user_id) OVERRIDE; 91 const std::string& user_id) override;
92 92
93 private: 93 private:
94 bool bluetooth_enabled_; 94 bool bluetooth_enabled_;
95 scoped_ptr<VolumeControlDelegate> volume_control_delegate_; 95 scoped_ptr<VolumeControlDelegate> volume_control_delegate_;
96 96
97 DISALLOW_COPY_AND_ASSIGN(DefaultSystemTrayDelegate); 97 DISALLOW_COPY_AND_ASSIGN(DefaultSystemTrayDelegate);
98 }; 98 };
99 99
100 } // namespace ash 100 } // namespace ash
101 101
102 #endif // ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_ 102 #endif // ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/system/tray/actionable_view.h ('k') | ash/system/tray/default_system_tray_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698