| 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 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 288 std::string enterprise_domain_; | 288 std::string enterprise_domain_; |
| 289 bool should_run_bluetooth_discovery_; | 289 bool should_run_bluetooth_discovery_; |
| 290 bool session_started_; | 290 bool session_started_; |
| 291 | 291 |
| 292 scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_; | 292 scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_; |
| 293 scoped_ptr<device::BluetoothDiscoverySession> bluetooth_discovery_session_; | 293 scoped_ptr<device::BluetoothDiscoverySession> bluetooth_discovery_session_; |
| 294 scoped_ptr<ash::NetworkingConfigDelegate> networking_config_delegate_; | 294 scoped_ptr<ash::NetworkingConfigDelegate> networking_config_delegate_; |
| 295 scoped_ptr<ash::VolumeControlDelegate> volume_control_delegate_; | 295 scoped_ptr<ash::VolumeControlDelegate> volume_control_delegate_; |
| 296 scoped_ptr<CrosSettingsObserverSubscription> device_settings_observer_; | 296 scoped_ptr<CrosSettingsObserverSubscription> device_settings_observer_; |
| 297 scoped_ptr<AccessibilityStatusSubscription> accessibility_subscription_; | 297 scoped_ptr<AccessibilityStatusSubscription> accessibility_subscription_; |
| 298 base::ScopedPtrHashMap<std::string, ash::tray::UserAccountsDelegate> | 298 base::ScopedPtrHashMap<std::string, |
| 299 scoped_ptr<ash::tray::UserAccountsDelegate>> |
| 299 accounts_delegates_; | 300 accounts_delegates_; |
| 300 scoped_ptr<ShutdownPolicyHandler> shutdown_policy_handler_; | 301 scoped_ptr<ShutdownPolicyHandler> shutdown_policy_handler_; |
| 301 scoped_ptr<ash::VPNDelegate> vpn_delegate_; | 302 scoped_ptr<ash::VPNDelegate> vpn_delegate_; |
| 302 | 303 |
| 303 ObserverList<ash::CustodianInfoTrayObserver> | 304 ObserverList<ash::CustodianInfoTrayObserver> |
| 304 custodian_info_changed_observers_; | 305 custodian_info_changed_observers_; |
| 305 | 306 |
| 306 ObserverList<ash::ShutdownPolicyObserver> shutdown_policy_observers_; | 307 ObserverList<ash::ShutdownPolicyObserver> shutdown_policy_observers_; |
| 307 | 308 |
| 308 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_; | 309 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_; |
| 309 | 310 |
| 310 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); | 311 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); |
| 311 }; | 312 }; |
| 312 | 313 |
| 313 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); | 314 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); |
| 314 | 315 |
| 315 } // namespace chromeos | 316 } // namespace chromeos |
| 316 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ | 317 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ |
| OLD | NEW |