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

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

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 void ToggleBluetooth() override; 127 void ToggleBluetooth() override;
128 void ShowOtherNetworkDialog(const std::string& type) override; 128 void ShowOtherNetworkDialog(const std::string& type) override;
129 bool GetBluetoothAvailable() override; 129 bool GetBluetoothAvailable() override;
130 bool GetBluetoothEnabled() override; 130 bool GetBluetoothEnabled() override;
131 bool GetBluetoothDiscovering() override; 131 bool GetBluetoothDiscovering() override;
132 void ChangeProxySettings() override; 132 void ChangeProxySettings() override;
133 ash::CastConfigDelegate* GetCastConfigDelegate() override; 133 ash::CastConfigDelegate* GetCastConfigDelegate() override;
134 ash::NetworkingConfigDelegate* GetNetworkingConfigDelegate() const override; 134 ash::NetworkingConfigDelegate* GetNetworkingConfigDelegate() const override;
135 ash::VolumeControlDelegate* GetVolumeControlDelegate() const override; 135 ash::VolumeControlDelegate* GetVolumeControlDelegate() const override;
136 void SetVolumeControlDelegate( 136 void SetVolumeControlDelegate(
137 scoped_ptr<ash::VolumeControlDelegate> delegate) override; 137 std::unique_ptr<ash::VolumeControlDelegate> delegate) override;
138 bool GetSessionStartTime(base::TimeTicks* session_start_time) override; 138 bool GetSessionStartTime(base::TimeTicks* session_start_time) override;
139 bool GetSessionLengthLimit(base::TimeDelta* session_length_limit) override; 139 bool GetSessionLengthLimit(base::TimeDelta* session_length_limit) override;
140 int GetSystemTrayMenuWidth() override; 140 int GetSystemTrayMenuWidth() override;
141 void ActiveUserWasChanged() override; 141 void ActiveUserWasChanged() override;
142 bool IsSearchKeyMappedToCapsLock() override; 142 bool IsSearchKeyMappedToCapsLock() override;
143 void AddCustodianInfoTrayObserver( 143 void AddCustodianInfoTrayObserver(
144 ash::CustodianInfoTrayObserver* observer) override; 144 ash::CustodianInfoTrayObserver* observer) override;
145 void RemoveCustodianInfoTrayObserver( 145 void RemoveCustodianInfoTrayObserver(
146 ash::CustodianInfoTrayObserver* observer) override; 146 ash::CustodianInfoTrayObserver* observer) override;
147 void AddShutdownPolicyObserver( 147 void AddShutdownPolicyObserver(
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 void AdapterDiscoveringChanged(device::BluetoothAdapter* adapter, 236 void AdapterDiscoveringChanged(device::BluetoothAdapter* adapter,
237 bool discovering) override; 237 bool discovering) override;
238 void DeviceAdded(device::BluetoothAdapter* adapter, 238 void DeviceAdded(device::BluetoothAdapter* adapter,
239 device::BluetoothDevice* device) override; 239 device::BluetoothDevice* device) override;
240 void DeviceChanged(device::BluetoothAdapter* adapter, 240 void DeviceChanged(device::BluetoothAdapter* adapter,
241 device::BluetoothDevice* device) override; 241 device::BluetoothDevice* device) override;
242 void DeviceRemoved(device::BluetoothAdapter* adapter, 242 void DeviceRemoved(device::BluetoothAdapter* adapter,
243 device::BluetoothDevice* device) override; 243 device::BluetoothDevice* device) override;
244 244
245 void OnStartBluetoothDiscoverySession( 245 void OnStartBluetoothDiscoverySession(
246 scoped_ptr<device::BluetoothDiscoverySession> discovery_session); 246 std::unique_ptr<device::BluetoothDiscoverySession> discovery_session);
247 247
248 void UpdateEnterpriseDomain(); 248 void UpdateEnterpriseDomain();
249 249
250 // Overridden from CloudPolicyStore::Observer 250 // Overridden from CloudPolicyStore::Observer
251 void OnStoreLoaded(policy::CloudPolicyStore* store) override; 251 void OnStoreLoaded(policy::CloudPolicyStore* store) override;
252 void OnStoreError(policy::CloudPolicyStore* store) override; 252 void OnStoreError(policy::CloudPolicyStore* store) override;
253 253
254 // Overridden from ash::SessionStateObserver 254 // Overridden from ash::SessionStateObserver
255 void UserAddedToSession(const AccountId& account_id) override; 255 void UserAddedToSession(const AccountId& account_id) override;
256 void ActiveUserChanged(const AccountId& account_id) override; 256 void ActiveUserChanged(const AccountId& account_id) override;
(...skipping 18 matching lines...) Expand all
275 void ImeMenuListChanged() override; 275 void ImeMenuListChanged() override;
276 void ImeMenuItemsChanged( 276 void ImeMenuItemsChanged(
277 const std::string& engine_id, 277 const std::string& engine_id,
278 const std::vector<input_method::InputMethodManager::MenuItem>& items) 278 const std::vector<input_method::InputMethodManager::MenuItem>& items)
279 override; 279 override;
280 280
281 // helper methods used by GetSupervisedUserMessage. 281 // helper methods used by GetSupervisedUserMessage.
282 const base::string16 GetLegacySupervisedUserMessage() const; 282 const base::string16 GetLegacySupervisedUserMessage() const;
283 const base::string16 GetChildUserMessage() const; 283 const base::string16 GetChildUserMessage() const;
284 284
285 scoped_ptr<content::NotificationRegistrar> registrar_; 285 std::unique_ptr<content::NotificationRegistrar> registrar_;
286 scoped_ptr<PrefChangeRegistrar> local_state_registrar_; 286 std::unique_ptr<PrefChangeRegistrar> local_state_registrar_;
287 scoped_ptr<PrefChangeRegistrar> user_pref_registrar_; 287 std::unique_ptr<PrefChangeRegistrar> user_pref_registrar_;
288 Profile* user_profile_; 288 Profile* user_profile_;
289 base::HourClockType clock_type_; 289 base::HourClockType clock_type_;
290 int search_key_mapped_to_; 290 int search_key_mapped_to_;
291 bool screen_locked_; 291 bool screen_locked_;
292 bool have_session_start_time_; 292 bool have_session_start_time_;
293 base::TimeTicks session_start_time_; 293 base::TimeTicks session_start_time_;
294 bool have_session_length_limit_; 294 bool have_session_length_limit_;
295 base::TimeDelta session_length_limit_; 295 base::TimeDelta session_length_limit_;
296 std::string enterprise_domain_; 296 std::string enterprise_domain_;
297 bool should_run_bluetooth_discovery_; 297 bool should_run_bluetooth_discovery_;
298 bool session_started_; 298 bool session_started_;
299 299
300 scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_; 300 scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_;
301 scoped_ptr<device::BluetoothDiscoverySession> bluetooth_discovery_session_; 301 std::unique_ptr<device::BluetoothDiscoverySession>
302 scoped_ptr<ash::CastConfigDelegate> cast_config_delegate_; 302 bluetooth_discovery_session_;
303 scoped_ptr<ash::NetworkingConfigDelegate> networking_config_delegate_; 303 std::unique_ptr<ash::CastConfigDelegate> cast_config_delegate_;
304 scoped_ptr<ash::VolumeControlDelegate> volume_control_delegate_; 304 std::unique_ptr<ash::NetworkingConfigDelegate> networking_config_delegate_;
305 scoped_ptr<AccessibilityStatusSubscription> accessibility_subscription_; 305 std::unique_ptr<ash::VolumeControlDelegate> volume_control_delegate_;
306 scoped_ptr<ShutdownPolicyHandler> shutdown_policy_handler_; 306 std::unique_ptr<AccessibilityStatusSubscription> accessibility_subscription_;
307 scoped_ptr<ash::VPNDelegate> vpn_delegate_; 307 std::unique_ptr<ShutdownPolicyHandler> shutdown_policy_handler_;
308 std::unique_ptr<ash::VPNDelegate> vpn_delegate_;
308 309
309 base::ObserverList<ash::CustodianInfoTrayObserver> 310 base::ObserverList<ash::CustodianInfoTrayObserver>
310 custodian_info_changed_observers_; 311 custodian_info_changed_observers_;
311 312
312 base::ObserverList<ash::ShutdownPolicyObserver> shutdown_policy_observers_; 313 base::ObserverList<ash::ShutdownPolicyObserver> shutdown_policy_observers_;
313 314
314 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_; 315 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_;
315 316
316 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); 317 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
317 }; 318 };
318 319
319 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); 320 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
320 321
321 } // namespace chromeos 322 } // namespace chromeos
322 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 323 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698