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

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

Issue 2427913003: Use mojo volume interfaces for mash and classic ash. (Closed)
Patch Set: Split volume and system events observers; only hook up volume. Created 4 years, 2 months 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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 void SwitchIME(const std::string& ime_id) override; 106 void SwitchIME(const std::string& ime_id) override;
107 void ActivateIMEProperty(const std::string& key) override; 107 void ActivateIMEProperty(const std::string& key) override;
108 void ManageBluetoothDevices() override; 108 void ManageBluetoothDevices() override;
109 void ToggleBluetooth() override; 109 void ToggleBluetooth() override;
110 void ShowOtherNetworkDialog(const std::string& type) override; 110 void ShowOtherNetworkDialog(const std::string& type) override;
111 bool GetBluetoothAvailable() override; 111 bool GetBluetoothAvailable() override;
112 bool GetBluetoothEnabled() override; 112 bool GetBluetoothEnabled() override;
113 bool GetBluetoothDiscovering() override; 113 bool GetBluetoothDiscovering() override;
114 ash::CastConfigDelegate* GetCastConfigDelegate() override; 114 ash::CastConfigDelegate* GetCastConfigDelegate() override;
115 ash::NetworkingConfigDelegate* GetNetworkingConfigDelegate() const override; 115 ash::NetworkingConfigDelegate* GetNetworkingConfigDelegate() const override;
116 ash::VolumeControlDelegate* GetVolumeControlDelegate() const override;
117 void SetVolumeControlDelegate(
118 std::unique_ptr<ash::VolumeControlDelegate> delegate) override;
119 bool GetSessionStartTime(base::TimeTicks* session_start_time) override; 116 bool GetSessionStartTime(base::TimeTicks* session_start_time) override;
120 bool GetSessionLengthLimit(base::TimeDelta* session_length_limit) override; 117 bool GetSessionLengthLimit(base::TimeDelta* session_length_limit) override;
121 int GetSystemTrayMenuWidth() override; 118 int GetSystemTrayMenuWidth() override;
122 void ActiveUserWasChanged() override; 119 void ActiveUserWasChanged() override;
123 bool IsSearchKeyMappedToCapsLock() override; 120 bool IsSearchKeyMappedToCapsLock() override;
124 void AddCustodianInfoTrayObserver( 121 void AddCustodianInfoTrayObserver(
125 ash::CustodianInfoTrayObserver* observer) override; 122 ash::CustodianInfoTrayObserver* observer) override;
126 void RemoveCustodianInfoTrayObserver( 123 void RemoveCustodianInfoTrayObserver(
127 ash::CustodianInfoTrayObserver* observer) override; 124 ash::CustodianInfoTrayObserver* observer) override;
128 void AddShutdownPolicyObserver( 125 void AddShutdownPolicyObserver(
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 base::TimeDelta session_length_limit_; 264 base::TimeDelta session_length_limit_;
268 std::string enterprise_domain_; 265 std::string enterprise_domain_;
269 bool should_run_bluetooth_discovery_; 266 bool should_run_bluetooth_discovery_;
270 bool session_started_; 267 bool session_started_;
271 268
272 scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_; 269 scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_;
273 std::unique_ptr<device::BluetoothDiscoverySession> 270 std::unique_ptr<device::BluetoothDiscoverySession>
274 bluetooth_discovery_session_; 271 bluetooth_discovery_session_;
275 std::unique_ptr<ash::CastConfigDelegate> cast_config_delegate_; 272 std::unique_ptr<ash::CastConfigDelegate> cast_config_delegate_;
276 std::unique_ptr<ash::NetworkingConfigDelegate> networking_config_delegate_; 273 std::unique_ptr<ash::NetworkingConfigDelegate> networking_config_delegate_;
277 std::unique_ptr<ash::VolumeControlDelegate> volume_control_delegate_;
278 std::unique_ptr<AccessibilityStatusSubscription> accessibility_subscription_; 274 std::unique_ptr<AccessibilityStatusSubscription> accessibility_subscription_;
279 std::unique_ptr<ShutdownPolicyHandler> shutdown_policy_handler_; 275 std::unique_ptr<ShutdownPolicyHandler> shutdown_policy_handler_;
280 std::unique_ptr<ash::VPNDelegate> vpn_delegate_; 276 std::unique_ptr<ash::VPNDelegate> vpn_delegate_;
281 277
282 base::ObserverList<ash::CustodianInfoTrayObserver> 278 base::ObserverList<ash::CustodianInfoTrayObserver>
283 custodian_info_changed_observers_; 279 custodian_info_changed_observers_;
284 280
285 base::ObserverList<ash::ShutdownPolicyObserver> shutdown_policy_observers_; 281 base::ObserverList<ash::ShutdownPolicyObserver> shutdown_policy_observers_;
286 282
287 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_; 283 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_;
288 284
289 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); 285 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
290 }; 286 };
291 287
292 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); 288 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
293 289
294 } // namespace chromeos 290 } // namespace chromeos
295 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 291 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698