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

Side by Side Diff: chrome/browser/ui/ash/system_tray_delegate_common.h

Issue 636853002: Common code from linux and windows implementations of SystemTrayDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_COMMON_H_
6 #define ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_ 6 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_COMMON_H_
7 7
8 #include "ash/ash_export.h" 8 #include <string>
9
9 #include "ash/system/tray/system_tray_delegate.h" 10 #include "ash/system/tray/system_tray_delegate.h"
10 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/i18n/time_formatting.h"
13 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "content/public/browser/notification_observer.h"
16 #include "content/public/browser/notification_registrar.h"
12 17
13 namespace ash { 18 namespace ash {
19 class SystemTrayNotifier;
20 }
14 21
15 class ASH_EXPORT DefaultSystemTrayDelegate : public SystemTrayDelegate { 22 // Common base class for platform-specific implementations.
23 class SystemTrayDelegateCommon : public ash::SystemTrayDelegate,
24 public content::NotificationObserver {
16 public: 25 public:
17 DefaultSystemTrayDelegate(); 26 SystemTrayDelegateCommon();
18 virtual ~DefaultSystemTrayDelegate();
19 27
20 // Overridden from SystemTrayDelegate: 28 virtual ~SystemTrayDelegateCommon();
29
30 // Overridden from ash::SystemTrayDelegate:
21 virtual void Initialize() override; 31 virtual void Initialize() override;
22 virtual void Shutdown() override; 32 virtual void Shutdown() override;
23 virtual bool GetTrayVisibilityOnStartup() override; 33 virtual bool GetTrayVisibilityOnStartup() override;
24 virtual user::LoginStatus GetUserLoginStatus() const override; 34 virtual ash::user::LoginStatus GetUserLoginStatus() const override;
25 virtual void ChangeProfilePicture() override; 35 virtual void ChangeProfilePicture() override;
26 virtual const std::string GetEnterpriseDomain() const override; 36 virtual const std::string GetEnterpriseDomain() const override;
27 virtual const base::string16 GetEnterpriseMessage() const override; 37 virtual const base::string16 GetEnterpriseMessage() const override;
28 virtual const std::string GetSupervisedUserManager() const override; 38 virtual const std::string GetSupervisedUserManager() const override;
29 virtual const base::string16 GetSupervisedUserManagerName() const override; 39 virtual const base::string16 GetSupervisedUserManagerName() const override;
30 virtual const base::string16 GetSupervisedUserMessage() const override; 40 virtual const base::string16 GetSupervisedUserMessage() const override;
31 virtual bool IsUserSupervised() const override; 41 virtual bool IsUserSupervised() const override;
32 virtual void GetSystemUpdateInfo(UpdateInfo* info) const override; 42 virtual void GetSystemUpdateInfo(ash::UpdateInfo* info) const override;
33 virtual base::HourClockType GetHourClockType() const override; 43 virtual base::HourClockType GetHourClockType() const override;
34 virtual void ShowSettings() override; 44 virtual void ShowSettings() override;
35 virtual bool ShouldShowSettings() override; 45 virtual bool ShouldShowSettings() override;
36 virtual void ShowDateSettings() override; 46 virtual void ShowDateSettings() override;
37 virtual void ShowSetTimeDialog() override; 47 virtual void ShowSetTimeDialog() override;
38 virtual void ShowNetworkSettings(const std::string& service_path) override; 48 virtual void ShowNetworkSettings(const std::string& service_path) override;
39 virtual void ShowBluetoothSettings() override; 49 virtual void ShowBluetoothSettings() override;
40 virtual void ShowDisplaySettings() override; 50 virtual void ShowDisplaySettings() override;
41 virtual void ShowChromeSlow() override; 51 virtual void ShowChromeSlow() override;
42 virtual bool ShouldShowDisplayNotification() override; 52 virtual bool ShouldShowDisplayNotification() override;
43 virtual void ShowIMESettings() override; 53 virtual void ShowIMESettings() override;
44 virtual void ShowHelp() override; 54 virtual void ShowHelp() override;
45 virtual void ShowAccessibilityHelp() override; 55 virtual void ShowAccessibilityHelp() override;
46 virtual void ShowAccessibilitySettings() override; 56 virtual void ShowAccessibilitySettings() override;
47 virtual void ShowPublicAccountInfo() override; 57 virtual void ShowPublicAccountInfo() override;
58 virtual void ShowSupervisedUserInfo() override;
48 virtual void ShowEnterpriseInfo() override; 59 virtual void ShowEnterpriseInfo() override;
49 virtual void ShowSupervisedUserInfo() override;
50 virtual void ShowUserLogin() override; 60 virtual void ShowUserLogin() override;
51 virtual bool ShowSpringChargerReplacementDialog() override; 61 virtual bool ShowSpringChargerReplacementDialog() override;
52 virtual bool IsSpringChargerReplacementDialogVisible() override; 62 virtual bool IsSpringChargerReplacementDialogVisible() override;
53 virtual bool HasUserConfirmedSafeSpringCharger() override; 63 virtual bool HasUserConfirmedSafeSpringCharger() override;
54 virtual void ShutDown() override; 64 virtual void ShutDown() override;
55 virtual void SignOut() override; 65 virtual void SignOut() override;
56 virtual void RequestLockScreen() override; 66 virtual void RequestLockScreen() override;
57 virtual void RequestRestartForUpdate() override; 67 virtual void RequestRestartForUpdate() override;
58 virtual void GetAvailableBluetoothDevices(BluetoothDeviceList* list) override; 68 virtual void GetAvailableBluetoothDevices(
69 ash::BluetoothDeviceList* list) override;
59 virtual void BluetoothStartDiscovering() override; 70 virtual void BluetoothStartDiscovering() override;
60 virtual void BluetoothStopDiscovering() override; 71 virtual void BluetoothStopDiscovering() override;
61 virtual void ConnectToBluetoothDevice(const std::string& address) override; 72 virtual void ConnectToBluetoothDevice(const std::string& address) override;
62 virtual void GetCurrentIME(IMEInfo* info) override; 73 virtual bool IsBluetoothDiscovering() override;
63 virtual void GetAvailableIMEList(IMEInfoList* list) override; 74 virtual void GetCurrentIME(ash::IMEInfo* info) override;
64 virtual void GetCurrentIMEProperties(IMEPropertyInfoList* list) override; 75 virtual void GetAvailableIMEList(ash::IMEInfoList* list) override;
76 virtual void GetCurrentIMEProperties(ash::IMEPropertyInfoList* list) override;
65 virtual void SwitchIME(const std::string& ime_id) override; 77 virtual void SwitchIME(const std::string& ime_id) override;
66 virtual void ActivateIMEProperty(const std::string& key) override; 78 virtual void ActivateIMEProperty(const std::string& key) override;
67 virtual void ShowNetworkConfigure(const std::string& network_id) override; 79 virtual void ShowNetworkConfigure(const std::string& network_id) override;
68 virtual bool EnrollNetwork(const std::string& network_id) override; 80 virtual bool EnrollNetwork(const std::string& network_id) override;
69 virtual void ManageBluetoothDevices() override; 81 virtual void ManageBluetoothDevices() override;
70 virtual void ToggleBluetooth() override; 82 virtual void ToggleBluetooth() override;
71 virtual bool IsBluetoothDiscovering() override;
72 virtual void ShowMobileSimDialog() override; 83 virtual void ShowMobileSimDialog() override;
73 virtual void ShowMobileSetupDialog(const std::string& service_path) override; 84 virtual void ShowMobileSetupDialog(const std::string& service_path) override;
74 virtual void ShowOtherNetworkDialog(const std::string& type) override; 85 virtual void ShowOtherNetworkDialog(const std::string& type) override;
75 virtual bool GetBluetoothAvailable() override; 86 virtual bool GetBluetoothAvailable() override;
76 virtual bool GetBluetoothEnabled() override; 87 virtual bool GetBluetoothEnabled() override;
77 virtual bool GetBluetoothDiscovering() override; 88 virtual bool GetBluetoothDiscovering() override;
78 virtual void ChangeProxySettings() override; 89 virtual void ChangeProxySettings() override;
79 virtual VolumeControlDelegate* GetVolumeControlDelegate() const override; 90 virtual ash::VolumeControlDelegate* GetVolumeControlDelegate() const override;
80 virtual void SetVolumeControlDelegate( 91 virtual void SetVolumeControlDelegate(
81 scoped_ptr<VolumeControlDelegate> delegate) override; 92 scoped_ptr<ash::VolumeControlDelegate> delegate) override;
82 virtual bool GetSessionStartTime( 93 virtual bool GetSessionStartTime(
83 base::TimeTicks* session_start_time) override; 94 base::TimeTicks* session_start_time) override;
84 virtual bool GetSessionLengthLimit( 95 virtual bool GetSessionLengthLimit(
85 base::TimeDelta* session_length_limit) override; 96 base::TimeDelta* session_length_limit) override;
86 virtual int GetSystemTrayMenuWidth() override; 97 virtual int GetSystemTrayMenuWidth() override;
87 virtual void ActiveUserWasChanged() override; 98 virtual void ActiveUserWasChanged() override;
88 virtual bool IsSearchKeyMappedToCapsLock() override; 99 virtual bool IsSearchKeyMappedToCapsLock() override;
89 virtual tray::UserAccountsDelegate* GetUserAccountsDelegate( 100 virtual ash::tray::UserAccountsDelegate* GetUserAccountsDelegate(
90 const std::string& user_id) override; 101 const std::string& user_id) override;
91 virtual void AddCustodianInfoTrayObserver( 102 virtual void AddCustodianInfoTrayObserver(
92 CustodianInfoTrayObserver* observer) override; 103 ash::CustodianInfoTrayObserver* observer) override;
93 virtual void RemoveCustodianInfoTrayObserver( 104 virtual void RemoveCustodianInfoTrayObserver(
94 CustodianInfoTrayObserver* observer) override; 105 ash::CustodianInfoTrayObserver* observer) override;
95 106
96 private: 107 private:
97 bool bluetooth_enabled_; 108 ash::SystemTrayNotifier* GetSystemTrayNotifier();
98 scoped_ptr<VolumeControlDelegate> volume_control_delegate_;
99 109
100 DISALLOW_COPY_AND_ASSIGN(DefaultSystemTrayDelegate); 110 void UpdateClockType();
111
112 // content::NotificationObserver implementation.
113 virtual void Observe(int type,
114 const content::NotificationSource& source,
115 const content::NotificationDetails& details) override;
116
117 scoped_ptr<content::NotificationRegistrar> registrar_;
118 base::HourClockType clock_type_;
119
120 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateCommon);
101 }; 121 };
102 122
103 } // namespace ash 123 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_COMMON_H_
104
105 #endif // ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate_views.cc ('k') | chrome/browser/ui/ash/system_tray_delegate_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698