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

Side by Side Diff: chrome/browser/chromeos/power/peripheral_battery_observer.h

Issue 1870793002: Convert //chrome/browser/chromeos 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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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_CHROMEOS_POWER_PERIPHERAL_BATTERY_OBSERVER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_POWER_PERIPHERAL_BATTERY_OBSERVER_H_
6 #define CHROME_BROWSER_CHROMEOS_POWER_PERIPHERAL_BATTERY_OBSERVER_H_ 6 #define CHROME_BROWSER_CHROMEOS_POWER_PERIPHERAL_BATTERY_OBSERVER_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 // PeripheralBatteryObserver is an observer of |bluetooth_adapter_| for 87 // PeripheralBatteryObserver is an observer of |bluetooth_adapter_| for
88 // bluetooth device change/remove events. 88 // bluetooth device change/remove events.
89 scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_; 89 scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_;
90 90
91 // Used only for helping test. Not owned and can be NULL. 91 // Used only for helping test. Not owned and can be NULL.
92 base::SimpleTestTickClock* testing_clock_; 92 base::SimpleTestTickClock* testing_clock_;
93 93
94 // Record the profile used when adding message center notifications. 94 // Record the profile used when adding message center notifications.
95 Profile* notification_profile_; 95 Profile* notification_profile_;
96 96
97 scoped_ptr<base::WeakPtrFactory<PeripheralBatteryObserver> > weakptr_factory_; 97 std::unique_ptr<base::WeakPtrFactory<PeripheralBatteryObserver>>
98 weakptr_factory_;
98 99
99 DISALLOW_COPY_AND_ASSIGN(PeripheralBatteryObserver); 100 DISALLOW_COPY_AND_ASSIGN(PeripheralBatteryObserver);
100 }; 101 };
101 102
102 } // namespace chromeos 103 } // namespace chromeos
103 104
104 #endif // CHROME_BROWSER_CHROMEOS_POWER_PERIPHERAL_BATTERY_OBSERVER_H_ 105 #endif // CHROME_BROWSER_CHROMEOS_POWER_PERIPHERAL_BATTERY_OBSERVER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698