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

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

Issue 2829813002: cros: Move IsUserSupervised and IsUserChild off SystemTrayDelegate (Closed)
Patch Set: review comments Created 3 years, 8 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 <memory> 10 #include <memory>
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 ~SystemTrayDelegateChromeOS() override; 51 ~SystemTrayDelegateChromeOS() override;
52 52
53 // Overridden from ash::SystemTrayDelegate: 53 // Overridden from ash::SystemTrayDelegate:
54 void Initialize() override; 54 void Initialize() override;
55 ash::LoginStatus GetUserLoginStatus() const override; 55 ash::LoginStatus GetUserLoginStatus() const override;
56 std::string GetEnterpriseDomain() const override; 56 std::string GetEnterpriseDomain() const override;
57 base::string16 GetEnterpriseMessage() const override; 57 base::string16 GetEnterpriseMessage() const override;
58 std::string GetSupervisedUserManager() const override; 58 std::string GetSupervisedUserManager() const override;
59 base::string16 GetSupervisedUserManagerName() const override; 59 base::string16 GetSupervisedUserManagerName() const override;
60 base::string16 GetSupervisedUserMessage() const override; 60 base::string16 GetSupervisedUserMessage() const override;
61 bool IsUserSupervised() const override;
62 bool IsUserChild() const override;
63 void ShowEnterpriseInfo() override; 61 void ShowEnterpriseInfo() override;
64 void ShowUserLogin() override; 62 void ShowUserLogin() override;
65 void GetCurrentIME(ash::IMEInfo* info) override; 63 void GetCurrentIME(ash::IMEInfo* info) override;
66 void GetAvailableIMEList(ash::IMEInfoList* list) override; 64 void GetAvailableIMEList(ash::IMEInfoList* list) override;
67 void GetCurrentIMEProperties(ash::IMEPropertyInfoList* list) override; 65 void GetCurrentIMEProperties(ash::IMEPropertyInfoList* list) override;
68 base::string16 GetIMEManagedMessage() override; 66 base::string16 GetIMEManagedMessage() override;
69 void SwitchIME(const std::string& ime_id) override; 67 void SwitchIME(const std::string& ime_id) override;
70 void ActivateIMEProperty(const std::string& key) override; 68 void ActivateIMEProperty(const std::string& key) override;
71 ash::NetworkingConfigDelegate* GetNetworkingConfigDelegate() const override; 69 ash::NetworkingConfigDelegate* GetNetworkingConfigDelegate() const override;
72 bool GetSessionStartTime(base::TimeTicks* session_start_time) override; 70 bool GetSessionStartTime(base::TimeTicks* session_start_time) override;
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 custodian_info_changed_observers_; 172 custodian_info_changed_observers_;
175 173
176 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); 174 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
177 }; 175 };
178 176
179 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); 177 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
180 178
181 } // namespace chromeos 179 } // namespace chromeos
182 180
183 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 181 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
OLDNEW
« no previous file with comments | « ash/test/test_system_tray_delegate.cc ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698