| 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 24 matching lines...) Expand all Loading... |
| 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/ime_keyboard.h" | 39 #include "ui/base/ime/chromeos/ime_keyboard.h" |
| 40 #include "ui/base/ime/chromeos/input_method_manager.h" | 40 #include "ui/base/ime/chromeos/input_method_manager.h" |
| 41 #include "ui/chromeos/ime/input_method_menu_manager.h" | 41 #include "ui/chromeos/ime/input_method_menu_manager.h" |
| 42 | 42 |
| 43 namespace ash { | 43 namespace ash { |
| 44 class SystemTrayNotifier; | 44 class SystemTrayNotifier; |
| 45 class VPNDelegate; | |
| 46 } | 45 } |
| 47 | 46 |
| 48 namespace user_manager { | 47 namespace user_manager { |
| 49 class User; | 48 class User; |
| 50 } | 49 } |
| 51 | 50 |
| 52 namespace chromeos { | 51 namespace chromeos { |
| 53 | 52 |
| 54 class SystemTrayDelegateChromeOS | 53 class SystemTrayDelegateChromeOS |
| 55 : public ui::ime::InputMethodMenuManager::Observer, | 54 : public ui::ime::InputMethodMenuManager::Observer, |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 ash::NetworkingConfigDelegate* GetNetworkingConfigDelegate() const override; | 107 ash::NetworkingConfigDelegate* GetNetworkingConfigDelegate() const override; |
| 109 bool GetSessionStartTime(base::TimeTicks* session_start_time) override; | 108 bool GetSessionStartTime(base::TimeTicks* session_start_time) override; |
| 110 bool GetSessionLengthLimit(base::TimeDelta* session_length_limit) override; | 109 bool GetSessionLengthLimit(base::TimeDelta* session_length_limit) override; |
| 111 int GetSystemTrayMenuWidth() override; | 110 int GetSystemTrayMenuWidth() override; |
| 112 void ActiveUserWasChanged() override; | 111 void ActiveUserWasChanged() override; |
| 113 bool IsSearchKeyMappedToCapsLock() override; | 112 bool IsSearchKeyMappedToCapsLock() override; |
| 114 void AddCustodianInfoTrayObserver( | 113 void AddCustodianInfoTrayObserver( |
| 115 ash::CustodianInfoTrayObserver* observer) override; | 114 ash::CustodianInfoTrayObserver* observer) override; |
| 116 void RemoveCustodianInfoTrayObserver( | 115 void RemoveCustodianInfoTrayObserver( |
| 117 ash::CustodianInfoTrayObserver* observer) override; | 116 ash::CustodianInfoTrayObserver* observer) override; |
| 118 ash::VPNDelegate* GetVPNDelegate() const override; | |
| 119 std::unique_ptr<ash::SystemTrayItem> CreateRotationLockTrayItem( | 117 std::unique_ptr<ash::SystemTrayItem> CreateRotationLockTrayItem( |
| 120 ash::SystemTray* tray) override; | 118 ash::SystemTray* tray) override; |
| 121 | 119 |
| 122 // Overridden from user_manager::UserManager::UserSessionStateObserver: | 120 // Overridden from user_manager::UserManager::UserSessionStateObserver: |
| 123 void UserAddedToSession(const user_manager::User* active_user) override; | 121 void UserAddedToSession(const user_manager::User* active_user) override; |
| 124 void ActiveUserChanged(const user_manager::User* active_user) override; | 122 void ActiveUserChanged(const user_manager::User* active_user) override; |
| 125 | 123 |
| 126 void UserChangedChildStatus(user_manager::User* user) override; | 124 void UserChangedChildStatus(user_manager::User* user) override; |
| 127 | 125 |
| 128 private: | 126 private: |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 237 std::string enterprise_realm_; | 235 std::string enterprise_realm_; |
| 238 bool should_run_bluetooth_discovery_ = false; | 236 bool should_run_bluetooth_discovery_ = false; |
| 239 bool session_started_ = false; | 237 bool session_started_ = false; |
| 240 | 238 |
| 241 scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_; | 239 scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_; |
| 242 std::unique_ptr<device::BluetoothDiscoverySession> | 240 std::unique_ptr<device::BluetoothDiscoverySession> |
| 243 bluetooth_discovery_session_; | 241 bluetooth_discovery_session_; |
| 244 std::unique_ptr<ash::CastConfigDelegate> cast_config_delegate_; | 242 std::unique_ptr<ash::CastConfigDelegate> cast_config_delegate_; |
| 245 std::unique_ptr<ash::NetworkingConfigDelegate> networking_config_delegate_; | 243 std::unique_ptr<ash::NetworkingConfigDelegate> networking_config_delegate_; |
| 246 std::unique_ptr<AccessibilityStatusSubscription> accessibility_subscription_; | 244 std::unique_ptr<AccessibilityStatusSubscription> accessibility_subscription_; |
| 247 std::unique_ptr<ash::VPNDelegate> vpn_delegate_; | |
| 248 | 245 |
| 249 base::ObserverList<ash::CustodianInfoTrayObserver> | 246 base::ObserverList<ash::CustodianInfoTrayObserver> |
| 250 custodian_info_changed_observers_; | 247 custodian_info_changed_observers_; |
| 251 | 248 |
| 252 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_; | 249 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_; |
| 253 | 250 |
| 254 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); | 251 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); |
| 255 }; | 252 }; |
| 256 | 253 |
| 257 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); | 254 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); |
| 258 | 255 |
| 259 } // namespace chromeos | 256 } // namespace chromeos |
| 260 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ | 257 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ |
| OLD | NEW |