Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(185)

Side by Side Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.h

Issue 2525563003: mash: Change CastConfigDelegate to a mojoified CastConfigClient. (Closed)
Patch Set: Now for the external apitests as well. Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 void GetCurrentIME(ash::IMEInfo* info) override; 96 void GetCurrentIME(ash::IMEInfo* info) override;
97 void GetAvailableIMEList(ash::IMEInfoList* list) override; 97 void GetAvailableIMEList(ash::IMEInfoList* list) override;
98 void GetCurrentIMEProperties(ash::IMEPropertyInfoList* list) override; 98 void GetCurrentIMEProperties(ash::IMEPropertyInfoList* list) override;
99 void SwitchIME(const std::string& ime_id) override; 99 void SwitchIME(const std::string& ime_id) override;
100 void ActivateIMEProperty(const std::string& key) override; 100 void ActivateIMEProperty(const std::string& key) override;
101 void ManageBluetoothDevices() override; 101 void ManageBluetoothDevices() override;
102 void ToggleBluetooth() override; 102 void ToggleBluetooth() override;
103 bool GetBluetoothAvailable() override; 103 bool GetBluetoothAvailable() override;
104 bool GetBluetoothEnabled() override; 104 bool GetBluetoothEnabled() override;
105 bool GetBluetoothDiscovering() override; 105 bool GetBluetoothDiscovering() override;
106 ash::CastConfigDelegate* GetCastConfigDelegate() override;
107 ash::NetworkingConfigDelegate* GetNetworkingConfigDelegate() const override; 106 ash::NetworkingConfigDelegate* GetNetworkingConfigDelegate() const override;
108 bool GetSessionStartTime(base::TimeTicks* session_start_time) override; 107 bool GetSessionStartTime(base::TimeTicks* session_start_time) override;
109 bool GetSessionLengthLimit(base::TimeDelta* session_length_limit) override; 108 bool GetSessionLengthLimit(base::TimeDelta* session_length_limit) override;
110 int GetSystemTrayMenuWidth() override; 109 int GetSystemTrayMenuWidth() override;
111 void ActiveUserWasChanged() override; 110 void ActiveUserWasChanged() override;
112 bool IsSearchKeyMappedToCapsLock() override; 111 bool IsSearchKeyMappedToCapsLock() override;
113 void AddCustodianInfoTrayObserver( 112 void AddCustodianInfoTrayObserver(
114 ash::CustodianInfoTrayObserver* observer) override; 113 ash::CustodianInfoTrayObserver* observer) override;
115 void RemoveCustodianInfoTrayObserver( 114 void RemoveCustodianInfoTrayObserver(
116 ash::CustodianInfoTrayObserver* observer) override; 115 ash::CustodianInfoTrayObserver* observer) override;
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 bool have_session_length_limit_ = false; 231 bool have_session_length_limit_ = false;
233 base::TimeDelta session_length_limit_; 232 base::TimeDelta session_length_limit_;
234 std::string enterprise_domain_; 233 std::string enterprise_domain_;
235 std::string enterprise_realm_; 234 std::string enterprise_realm_;
236 bool should_run_bluetooth_discovery_ = false; 235 bool should_run_bluetooth_discovery_ = false;
237 bool session_started_ = false; 236 bool session_started_ = false;
238 237
239 scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_; 238 scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_;
240 std::unique_ptr<device::BluetoothDiscoverySession> 239 std::unique_ptr<device::BluetoothDiscoverySession>
241 bluetooth_discovery_session_; 240 bluetooth_discovery_session_;
242 std::unique_ptr<ash::CastConfigDelegate> cast_config_delegate_;
243 std::unique_ptr<ash::NetworkingConfigDelegate> networking_config_delegate_; 241 std::unique_ptr<ash::NetworkingConfigDelegate> networking_config_delegate_;
244 std::unique_ptr<AccessibilityStatusSubscription> accessibility_subscription_; 242 std::unique_ptr<AccessibilityStatusSubscription> accessibility_subscription_;
245 243
246 base::ObserverList<ash::CustodianInfoTrayObserver> 244 base::ObserverList<ash::CustodianInfoTrayObserver>
247 custodian_info_changed_observers_; 245 custodian_info_changed_observers_;
248 246
249 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_; 247 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_;
250 248
251 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); 249 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
252 }; 250 };
253 251
254 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); 252 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
255 253
256 } // namespace chromeos 254 } // namespace chromeos
255
257 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 256 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698