| 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 <memory> | 10 #include <memory> |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 #include "ui/chromeos/ime/input_method_menu_manager.h" | 36 #include "ui/chromeos/ime/input_method_menu_manager.h" |
| 37 | 37 |
| 38 namespace ash { | 38 namespace ash { |
| 39 class SystemTrayNotifier; | 39 class SystemTrayNotifier; |
| 40 } | 40 } |
| 41 | 41 |
| 42 namespace user_manager { | 42 namespace user_manager { |
| 43 class User; | 43 class User; |
| 44 } | 44 } |
| 45 | 45 |
| 46 class TrayBluetoothHelper; | |
| 47 | |
| 48 namespace chromeos { | 46 namespace chromeos { |
| 49 | 47 |
| 50 class SystemTrayDelegateChromeOS | 48 class SystemTrayDelegateChromeOS |
| 51 : public ui::ime::InputMethodMenuManager::Observer, | 49 : public ui::ime::InputMethodMenuManager::Observer, |
| 52 public ash::SystemTrayDelegate, | 50 public ash::SystemTrayDelegate, |
| 53 public SessionManagerClient::Observer, | 51 public SessionManagerClient::Observer, |
| 54 public content::NotificationObserver, | 52 public content::NotificationObserver, |
| 55 public input_method::InputMethodManager::Observer, | 53 public input_method::InputMethodManager::Observer, |
| 56 public policy::CloudPolicyStore::Observer, | 54 public policy::CloudPolicyStore::Observer, |
| 57 public chrome::BrowserListObserver, | 55 public chrome::BrowserListObserver, |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 Profile* user_profile_ = nullptr; | 197 Profile* user_profile_ = nullptr; |
| 200 int search_key_mapped_to_ = input_method::kSearchKey; | 198 int search_key_mapped_to_ = input_method::kSearchKey; |
| 201 bool have_session_start_time_ = false; | 199 bool have_session_start_time_ = false; |
| 202 base::TimeTicks session_start_time_; | 200 base::TimeTicks session_start_time_; |
| 203 bool have_session_length_limit_ = false; | 201 bool have_session_length_limit_ = false; |
| 204 base::TimeDelta session_length_limit_; | 202 base::TimeDelta session_length_limit_; |
| 205 std::string enterprise_domain_; | 203 std::string enterprise_domain_; |
| 206 bool is_active_directory_managed_ = false; | 204 bool is_active_directory_managed_ = false; |
| 207 bool session_started_ = false; | 205 bool session_started_ = false; |
| 208 | 206 |
| 209 // TODO(jamescook): Move into //ash. http://crbug.com/660043 | |
| 210 std::unique_ptr<TrayBluetoothHelper> bluetooth_helper_; | |
| 211 | |
| 212 std::unique_ptr<ash::NetworkingConfigDelegate> networking_config_delegate_; | 207 std::unique_ptr<ash::NetworkingConfigDelegate> networking_config_delegate_; |
| 213 std::unique_ptr<AccessibilityStatusSubscription> accessibility_subscription_; | 208 std::unique_ptr<AccessibilityStatusSubscription> accessibility_subscription_; |
| 214 | 209 |
| 215 base::ObserverList<ash::CustodianInfoTrayObserver> | 210 base::ObserverList<ash::CustodianInfoTrayObserver> |
| 216 custodian_info_changed_observers_; | 211 custodian_info_changed_observers_; |
| 217 | 212 |
| 218 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); | 213 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); |
| 219 }; | 214 }; |
| 220 | 215 |
| 221 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); | 216 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); |
| 222 | 217 |
| 223 } // namespace chromeos | 218 } // namespace chromeos |
| 224 | 219 |
| 225 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ | 220 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ |
| OLD | NEW |