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

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

Issue 1115083002: Add the supporting code for the cast system tray integration (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments Created 5 years, 7 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 <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 void GetCurrentIMEProperties(ash::IMEPropertyInfoList* list) override; 118 void GetCurrentIMEProperties(ash::IMEPropertyInfoList* list) override;
119 void SwitchIME(const std::string& ime_id) override; 119 void SwitchIME(const std::string& ime_id) override;
120 void ActivateIMEProperty(const std::string& key) override; 120 void ActivateIMEProperty(const std::string& key) override;
121 void ManageBluetoothDevices() override; 121 void ManageBluetoothDevices() override;
122 void ToggleBluetooth() override; 122 void ToggleBluetooth() override;
123 void ShowOtherNetworkDialog(const std::string& type) override; 123 void ShowOtherNetworkDialog(const std::string& type) override;
124 bool GetBluetoothAvailable() override; 124 bool GetBluetoothAvailable() override;
125 bool GetBluetoothEnabled() override; 125 bool GetBluetoothEnabled() override;
126 bool GetBluetoothDiscovering() override; 126 bool GetBluetoothDiscovering() override;
127 void ChangeProxySettings() override; 127 void ChangeProxySettings() override;
128 ash::CastConfigDelegate* GetCastConfigDelegate() const override;
128 ash::NetworkingConfigDelegate* GetNetworkingConfigDelegate() const override; 129 ash::NetworkingConfigDelegate* GetNetworkingConfigDelegate() const override;
129 ash::VolumeControlDelegate* GetVolumeControlDelegate() const override; 130 ash::VolumeControlDelegate* GetVolumeControlDelegate() const override;
130 void SetVolumeControlDelegate( 131 void SetVolumeControlDelegate(
131 scoped_ptr<ash::VolumeControlDelegate> delegate) override; 132 scoped_ptr<ash::VolumeControlDelegate> delegate) override;
132 bool GetSessionStartTime(base::TimeTicks* session_start_time) override; 133 bool GetSessionStartTime(base::TimeTicks* session_start_time) override;
133 bool GetSessionLengthLimit(base::TimeDelta* session_length_limit) override; 134 bool GetSessionLengthLimit(base::TimeDelta* session_length_limit) override;
134 int GetSystemTrayMenuWidth() override; 135 int GetSystemTrayMenuWidth() override;
135 void ActiveUserWasChanged() override; 136 void ActiveUserWasChanged() override;
136 bool IsSearchKeyMappedToCapsLock() override; 137 bool IsSearchKeyMappedToCapsLock() override;
137 ash::tray::UserAccountsDelegate* GetUserAccountsDelegate( 138 ash::tray::UserAccountsDelegate* GetUserAccountsDelegate(
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 bool have_session_start_time_; 286 bool have_session_start_time_;
286 base::TimeTicks session_start_time_; 287 base::TimeTicks session_start_time_;
287 bool have_session_length_limit_; 288 bool have_session_length_limit_;
288 base::TimeDelta session_length_limit_; 289 base::TimeDelta session_length_limit_;
289 std::string enterprise_domain_; 290 std::string enterprise_domain_;
290 bool should_run_bluetooth_discovery_; 291 bool should_run_bluetooth_discovery_;
291 bool session_started_; 292 bool session_started_;
292 293
293 scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_; 294 scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_;
294 scoped_ptr<device::BluetoothDiscoverySession> bluetooth_discovery_session_; 295 scoped_ptr<device::BluetoothDiscoverySession> bluetooth_discovery_session_;
296 scoped_ptr<ash::CastConfigDelegate> cast_config_delegate_;
295 scoped_ptr<ash::NetworkingConfigDelegate> networking_config_delegate_; 297 scoped_ptr<ash::NetworkingConfigDelegate> networking_config_delegate_;
296 scoped_ptr<ash::VolumeControlDelegate> volume_control_delegate_; 298 scoped_ptr<ash::VolumeControlDelegate> volume_control_delegate_;
297 scoped_ptr<CrosSettingsObserverSubscription> device_settings_observer_; 299 scoped_ptr<CrosSettingsObserverSubscription> device_settings_observer_;
298 scoped_ptr<AccessibilityStatusSubscription> accessibility_subscription_; 300 scoped_ptr<AccessibilityStatusSubscription> accessibility_subscription_;
299 base::ScopedPtrHashMap<std::string, 301 base::ScopedPtrHashMap<std::string,
300 scoped_ptr<ash::tray::UserAccountsDelegate>> 302 scoped_ptr<ash::tray::UserAccountsDelegate>>
301 accounts_delegates_; 303 accounts_delegates_;
302 scoped_ptr<ShutdownPolicyHandler> shutdown_policy_handler_; 304 scoped_ptr<ShutdownPolicyHandler> shutdown_policy_handler_;
303 scoped_ptr<ash::VPNDelegate> vpn_delegate_; 305 scoped_ptr<ash::VPNDelegate> vpn_delegate_;
304 306
305 ObserverList<ash::CustodianInfoTrayObserver> 307 ObserverList<ash::CustodianInfoTrayObserver>
306 custodian_info_changed_observers_; 308 custodian_info_changed_observers_;
307 309
308 ObserverList<ash::ShutdownPolicyObserver> shutdown_policy_observers_; 310 ObserverList<ash::ShutdownPolicyObserver> shutdown_policy_observers_;
309 311
310 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_; 312 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_;
311 313
312 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); 314 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
313 }; 315 };
314 316
315 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); 317 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
316 318
317 } // namespace chromeos 319 } // namespace chromeos
318 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 320 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698