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

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

Issue 2381753002: Use mojo SystemTray interfaces for both mash and classic ash (Closed)
Patch Set: cleanup Created 4 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 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 CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
6 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 6 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 public input_method::InputMethodManager::Observer, 63 public input_method::InputMethodManager::Observer,
64 public chromeos::CrasAudioHandler::AudioObserver, 64 public chromeos::CrasAudioHandler::AudioObserver,
65 public device::BluetoothAdapter::Observer, 65 public device::BluetoothAdapter::Observer,
66 public policy::CloudPolicyStore::Observer, 66 public policy::CloudPolicyStore::Observer,
67 public ash::SessionStateObserver, 67 public ash::SessionStateObserver,
68 public chrome::BrowserListObserver, 68 public chrome::BrowserListObserver,
69 public extensions::AppWindowRegistry::Observer, 69 public extensions::AppWindowRegistry::Observer,
70 public user_manager::UserManager::UserSessionStateObserver, 70 public user_manager::UserManager::UserSessionStateObserver,
71 public SupervisedUserServiceObserver, 71 public SupervisedUserServiceObserver,
72 public ShutdownPolicyHandler::Delegate, 72 public ShutdownPolicyHandler::Delegate,
73 public system::SystemClockObserver,
74 public input_method::InputMethodManager::ImeMenuObserver { 73 public input_method::InputMethodManager::ImeMenuObserver {
75 public: 74 public:
76 SystemTrayDelegateChromeOS(); 75 SystemTrayDelegateChromeOS();
77 76
78 ~SystemTrayDelegateChromeOS() override; 77 ~SystemTrayDelegateChromeOS() override;
79 78
80 void InitializeOnAdapterReady( 79 void InitializeOnAdapterReady(
81 scoped_refptr<device::BluetoothAdapter> adapter); 80 scoped_refptr<device::BluetoothAdapter> adapter);
82 81
83 // Overridden from ash::SystemTrayDelegate: 82 // Overridden from ash::SystemTrayDelegate:
84 void Initialize() override; 83 void Initialize() override;
85 bool GetTrayVisibilityOnStartup() override; 84 bool GetTrayVisibilityOnStartup() override;
86 ash::LoginStatus GetUserLoginStatus() const override; 85 ash::LoginStatus GetUserLoginStatus() const override;
87 std::string GetEnterpriseDomain() const override; 86 std::string GetEnterpriseDomain() const override;
88 base::string16 GetEnterpriseMessage() const override; 87 base::string16 GetEnterpriseMessage() const override;
89 std::string GetSupervisedUserManager() const override; 88 std::string GetSupervisedUserManager() const override;
90 base::string16 GetSupervisedUserManagerName() const override; 89 base::string16 GetSupervisedUserManagerName() const override;
91 base::string16 GetSupervisedUserMessage() const override; 90 base::string16 GetSupervisedUserMessage() const override;
92 bool IsUserSupervised() const override; 91 bool IsUserSupervised() const override;
93 bool IsUserChild() const override; 92 bool IsUserChild() const override;
94 void GetSystemUpdateInfo(ash::UpdateInfo* info) const override; 93 void GetSystemUpdateInfo(ash::UpdateInfo* info) const override;
95 base::HourClockType GetHourClockType() const override;
96 void ShowSettings() override; 94 void ShowSettings() override;
97 bool ShouldShowSettings() override; 95 bool ShouldShowSettings() override;
98 void ShowDateSettings() override;
99 void ShowSetTimeDialog() override; 96 void ShowSetTimeDialog() override;
100 void ShowNetworkSettingsForGuid(const std::string& guid) override; 97 void ShowNetworkSettingsForGuid(const std::string& guid) override;
101 void ShowDisplaySettings() override; 98 void ShowDisplaySettings() override;
102 void ShowPowerSettings() override; 99 void ShowPowerSettings() override;
103 void ShowChromeSlow() override; 100 void ShowChromeSlow() override;
104 bool ShouldShowDisplayNotification() override; 101 bool ShouldShowDisplayNotification() override;
105 void ShowIMESettings() override; 102 void ShowIMESettings() override;
106 void ShowHelp() override; 103 void ShowHelp() override;
107 void ShowAccessibilityHelp() override; 104 void ShowAccessibilityHelp() override;
108 void ShowAccessibilitySettings() override; 105 void ShowAccessibilitySettings() override;
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 154
158 // Overridden from user_manager::UserManager::UserSessionStateObserver: 155 // Overridden from user_manager::UserManager::UserSessionStateObserver:
159 void UserAddedToSession(const user_manager::User* active_user) override; 156 void UserAddedToSession(const user_manager::User* active_user) override;
160 void ActiveUserChanged(const user_manager::User* active_user) override; 157 void ActiveUserChanged(const user_manager::User* active_user) override;
161 158
162 void UserChangedChildStatus(user_manager::User* user) override; 159 void UserChangedChildStatus(user_manager::User* user) override;
163 160
164 // browser tests need to call ShouldUse24HourClock(). 161 // browser tests need to call ShouldUse24HourClock().
165 bool GetShouldUse24HourClockForTesting() const; 162 bool GetShouldUse24HourClockForTesting() const;
166 163
167 // chromeos::system::SystemClockObserver implementation.
168 void OnSystemClockChanged(system::SystemClock*) override;
169
170 private: 164 private:
171 ash::SystemTray* GetPrimarySystemTray(); 165 ash::SystemTray* GetPrimarySystemTray();
172 166
173 ash::SystemTrayNotifier* GetSystemTrayNotifier(); 167 ash::SystemTrayNotifier* GetSystemTrayNotifier();
174 168
175 void SetProfile(Profile* profile); 169 void SetProfile(Profile* profile);
176 170
177 bool UnsetProfile(Profile* profile); 171 bool UnsetProfile(Profile* profile);
178 172
179 bool ShouldUse24HourClock() const; 173 bool ShouldUse24HourClock() const;
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 310
317 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_; 311 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_;
318 312
319 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); 313 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
320 }; 314 };
321 315
322 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); 316 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
323 317
324 } // namespace chromeos 318 } // namespace chromeos
325 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 319 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698