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 21 matching lines...) Expand all Loading... |
32 #include "components/policy/core/common/cloud/cloud_policy_store.h" | 32 #include "components/policy/core/common/cloud/cloud_policy_store.h" |
33 #include "components/user_manager/user_manager.h" | 33 #include "components/user_manager/user_manager.h" |
34 #include "content/public/browser/notification_observer.h" | 34 #include "content/public/browser/notification_observer.h" |
35 #include "content/public/browser/notification_registrar.h" | 35 #include "content/public/browser/notification_registrar.h" |
36 #include "device/bluetooth/bluetooth_adapter.h" | 36 #include "device/bluetooth/bluetooth_adapter.h" |
37 #include "device/bluetooth/bluetooth_discovery_session.h" | 37 #include "device/bluetooth/bluetooth_discovery_session.h" |
38 #include "extensions/browser/app_window/app_window_registry.h" | 38 #include "extensions/browser/app_window/app_window_registry.h" |
39 #include "ui/base/ime/chromeos/input_method_manager.h" | 39 #include "ui/base/ime/chromeos/input_method_manager.h" |
40 #include "ui/chromeos/ime/input_method_menu_manager.h" | 40 #include "ui/chromeos/ime/input_method_menu_manager.h" |
41 | 41 |
| 42 namespace ash { |
| 43 class VPNDelegate; |
| 44 } |
| 45 |
42 namespace user_manager { | 46 namespace user_manager { |
43 class User; | 47 class User; |
44 } | 48 } |
45 | 49 |
46 namespace chromeos { | 50 namespace chromeos { |
47 | 51 |
48 class SystemTrayDelegateChromeOS | 52 class SystemTrayDelegateChromeOS |
49 : public ui::ime::InputMethodMenuManager::Observer, | 53 : public ui::ime::InputMethodMenuManager::Observer, |
50 public ash::SystemTrayDelegate, | 54 public ash::SystemTrayDelegate, |
51 public SessionManagerClient::Observer, | 55 public SessionManagerClient::Observer, |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
135 void AddCustodianInfoTrayObserver( | 139 void AddCustodianInfoTrayObserver( |
136 ash::CustodianInfoTrayObserver* observer) override; | 140 ash::CustodianInfoTrayObserver* observer) override; |
137 void RemoveCustodianInfoTrayObserver( | 141 void RemoveCustodianInfoTrayObserver( |
138 ash::CustodianInfoTrayObserver* observer) override; | 142 ash::CustodianInfoTrayObserver* observer) override; |
139 void AddShutdownPolicyObserver( | 143 void AddShutdownPolicyObserver( |
140 ash::ShutdownPolicyObserver* observer) override; | 144 ash::ShutdownPolicyObserver* observer) override; |
141 void RemoveShutdownPolicyObserver( | 145 void RemoveShutdownPolicyObserver( |
142 ash::ShutdownPolicyObserver* observer) override; | 146 ash::ShutdownPolicyObserver* observer) override; |
143 void ShouldRebootOnShutdown( | 147 void ShouldRebootOnShutdown( |
144 const ash::RebootOnShutdownCallback& callback) override; | 148 const ash::RebootOnShutdownCallback& callback) override; |
| 149 ash::VPNDelegate* GetVPNDelegate() const override; |
145 | 150 |
146 // Overridden from user_manager::UserManager::UserSessionStateObserver: | 151 // Overridden from user_manager::UserManager::UserSessionStateObserver: |
147 void UserAddedToSession(const user_manager::User* active_user) override; | 152 void UserAddedToSession(const user_manager::User* active_user) override; |
148 void ActiveUserChanged(const user_manager::User* active_user) override; | 153 void ActiveUserChanged(const user_manager::User* active_user) override; |
149 | 154 |
150 void UserChangedChildStatus(user_manager::User* user) override; | 155 void UserChangedChildStatus(user_manager::User* user) override; |
151 | 156 |
152 // browser tests need to call ShouldUse24HourClock(). | 157 // browser tests need to call ShouldUse24HourClock(). |
153 bool GetShouldUse24HourClockForTesting() const; | 158 bool GetShouldUse24HourClockForTesting() const; |
154 | 159 |
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
286 | 291 |
287 scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_; | 292 scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_; |
288 scoped_ptr<device::BluetoothDiscoverySession> bluetooth_discovery_session_; | 293 scoped_ptr<device::BluetoothDiscoverySession> bluetooth_discovery_session_; |
289 scoped_ptr<ash::NetworkingConfigDelegate> networking_config_delegate_; | 294 scoped_ptr<ash::NetworkingConfigDelegate> networking_config_delegate_; |
290 scoped_ptr<ash::VolumeControlDelegate> volume_control_delegate_; | 295 scoped_ptr<ash::VolumeControlDelegate> volume_control_delegate_; |
291 scoped_ptr<CrosSettingsObserverSubscription> device_settings_observer_; | 296 scoped_ptr<CrosSettingsObserverSubscription> device_settings_observer_; |
292 scoped_ptr<AccessibilityStatusSubscription> accessibility_subscription_; | 297 scoped_ptr<AccessibilityStatusSubscription> accessibility_subscription_; |
293 base::ScopedPtrHashMap<std::string, ash::tray::UserAccountsDelegate> | 298 base::ScopedPtrHashMap<std::string, ash::tray::UserAccountsDelegate> |
294 accounts_delegates_; | 299 accounts_delegates_; |
295 scoped_ptr<ShutdownPolicyHandler> shutdown_policy_handler_; | 300 scoped_ptr<ShutdownPolicyHandler> shutdown_policy_handler_; |
| 301 scoped_ptr<ash::VPNDelegate> vpn_delegate_; |
296 | 302 |
297 ObserverList<ash::CustodianInfoTrayObserver> | 303 ObserverList<ash::CustodianInfoTrayObserver> |
298 custodian_info_changed_observers_; | 304 custodian_info_changed_observers_; |
299 | 305 |
300 ObserverList<ash::ShutdownPolicyObserver> shutdown_policy_observers_; | 306 ObserverList<ash::ShutdownPolicyObserver> shutdown_policy_observers_; |
301 | 307 |
302 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_; | 308 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_; |
303 | 309 |
304 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); | 310 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); |
305 }; | 311 }; |
306 | 312 |
307 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); | 313 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); |
308 | 314 |
309 } // namespace chromeos | 315 } // namespace chromeos |
310 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ | 316 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ |
OLD | NEW |