OLD | NEW |
---|---|
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 <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
72 | 72 |
73 void InitializeOnAdapterReady( | 73 void InitializeOnAdapterReady( |
74 scoped_refptr<device::BluetoothAdapter> adapter); | 74 scoped_refptr<device::BluetoothAdapter> adapter); |
75 | 75 |
76 // Overridden from ash::SystemTrayDelegate: | 76 // Overridden from ash::SystemTrayDelegate: |
77 void Initialize() override; | 77 void Initialize() override; |
78 void Shutdown() override; | 78 void Shutdown() override; |
79 bool GetTrayVisibilityOnStartup() override; | 79 bool GetTrayVisibilityOnStartup() override; |
80 ash::user::LoginStatus GetUserLoginStatus() const override; | 80 ash::user::LoginStatus GetUserLoginStatus() const override; |
81 void ChangeProfilePicture() override; | 81 void ChangeProfilePicture() override; |
82 const std::string GetEnterpriseDomain() const override; | 82 const std::string& GetEnterpriseDomain() const override; |
stevenjb
2015/09/09 18:10:45
This shouldn't compile. GetEnterpriseDomain() is i
| |
83 const base::string16 GetEnterpriseMessage() const override; | 83 const base::string16 GetEnterpriseMessage() const override; |
84 const std::string GetSupervisedUserManager() const override; | 84 const std::string GetSupervisedUserManager() const override; |
85 const base::string16 GetSupervisedUserManagerName() const override; | 85 const base::string16 GetSupervisedUserManagerName() const override; |
86 const base::string16 GetSupervisedUserMessage() const override; | 86 const base::string16 GetSupervisedUserMessage() const override; |
87 bool IsUserSupervised() const override; | 87 bool IsUserSupervised() const override; |
88 bool IsUserChild() const override; | 88 bool IsUserChild() const override; |
89 void GetSystemUpdateInfo(ash::UpdateInfo* info) const override; | 89 void GetSystemUpdateInfo(ash::UpdateInfo* info) const override; |
90 base::HourClockType GetHourClockType() const override; | 90 base::HourClockType GetHourClockType() const override; |
91 void ShowSettings() override; | 91 void ShowSettings() override; |
92 bool ShouldShowSettings() override; | 92 bool ShouldShowSettings() override; |
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
315 | 315 |
316 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_; | 316 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_; |
317 | 317 |
318 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); | 318 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); |
319 }; | 319 }; |
320 | 320 |
321 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); | 321 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); |
322 | 322 |
323 } // namespace chromeos | 323 } // namespace chromeos |
324 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ | 324 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ |
OLD | NEW |