| 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 <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 ash::CustodianInfoTrayObserver* observer) override; | 145 ash::CustodianInfoTrayObserver* observer) override; |
| 146 void RemoveCustodianInfoTrayObserver( | 146 void RemoveCustodianInfoTrayObserver( |
| 147 ash::CustodianInfoTrayObserver* observer) override; | 147 ash::CustodianInfoTrayObserver* observer) override; |
| 148 void AddShutdownPolicyObserver( | 148 void AddShutdownPolicyObserver( |
| 149 ash::ShutdownPolicyObserver* observer) override; | 149 ash::ShutdownPolicyObserver* observer) override; |
| 150 void RemoveShutdownPolicyObserver( | 150 void RemoveShutdownPolicyObserver( |
| 151 ash::ShutdownPolicyObserver* observer) override; | 151 ash::ShutdownPolicyObserver* observer) override; |
| 152 void ShouldRebootOnShutdown( | 152 void ShouldRebootOnShutdown( |
| 153 const ash::RebootOnShutdownCallback& callback) override; | 153 const ash::RebootOnShutdownCallback& callback) override; |
| 154 ash::VPNDelegate* GetVPNDelegate() const override; | 154 ash::VPNDelegate* GetVPNDelegate() const override; |
| 155 std::unique_ptr<ash::SystemTrayItem> CreateDisplayTrayItem( | |
| 156 ash::SystemTray* tray) override; | |
| 157 std::unique_ptr<ash::SystemTrayItem> CreateRotationLockTrayItem( | 155 std::unique_ptr<ash::SystemTrayItem> CreateRotationLockTrayItem( |
| 158 ash::SystemTray* tray) override; | 156 ash::SystemTray* tray) override; |
| 159 | 157 |
| 160 // Overridden from user_manager::UserManager::UserSessionStateObserver: | 158 // Overridden from user_manager::UserManager::UserSessionStateObserver: |
| 161 void UserAddedToSession(const user_manager::User* active_user) override; | 159 void UserAddedToSession(const user_manager::User* active_user) override; |
| 162 void ActiveUserChanged(const user_manager::User* active_user) override; | 160 void ActiveUserChanged(const user_manager::User* active_user) override; |
| 163 | 161 |
| 164 void UserChangedChildStatus(user_manager::User* user) override; | 162 void UserChangedChildStatus(user_manager::User* user) override; |
| 165 | 163 |
| 166 // browser tests need to call ShouldUse24HourClock(). | 164 // browser tests need to call ShouldUse24HourClock(). |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 318 | 316 |
| 319 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_; | 317 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_; |
| 320 | 318 |
| 321 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); | 319 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); |
| 322 }; | 320 }; |
| 323 | 321 |
| 324 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); | 322 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); |
| 325 | 323 |
| 326 } // namespace chromeos | 324 } // namespace chromeos |
| 327 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ | 325 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ |
| OLD | NEW |