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

Unified Diff: device/battery/battery_status_manager_win.cc

Issue 1874313002: Convert device to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « device/battery/battery_status_manager_mac.cc ('k') | device/battery/battery_status_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/battery/battery_status_manager_win.cc
diff --git a/device/battery/battery_status_manager_win.cc b/device/battery/battery_status_manager_win.cc
index a832bbbd2eb8b3d1d757db1a3d0e8327c33141c3..917c0e00ae425659a4e74b055a2bdc92f56b7d4f 100644
--- a/device/battery/battery_status_manager_win.cc
+++ b/device/battery/battery_status_manager_win.cc
@@ -4,9 +4,10 @@
#include "device/battery/battery_status_manager_win.h"
+#include <memory>
+
#include "base/bind.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/metrics/histogram.h"
#include "base/strings/string16.h"
#include "base/win/message_window.h"
@@ -152,7 +153,7 @@ class BatteryStatusObserver {
HPOWERNOTIFY power_handle_;
HPOWERNOTIFY battery_change_handle_;
BatteryCallback callback_;
- scoped_ptr<base::win::MessageWindow> window_;
+ std::unique_ptr<base::win::MessageWindow> window_;
DISALLOW_COPY_AND_ASSIGN(BatteryStatusObserver);
};
@@ -173,7 +174,7 @@ class BatteryStatusManagerWin : public BatteryStatusManager {
void StopListeningBatteryChange() override { battery_observer_->Stop(); }
private:
- scoped_ptr<BatteryStatusObserver> battery_observer_;
+ std::unique_ptr<BatteryStatusObserver> battery_observer_;
DISALLOW_COPY_AND_ASSIGN(BatteryStatusManagerWin);
};
@@ -206,9 +207,9 @@ BatteryStatus ComputeWebBatteryStatus(const SYSTEM_POWER_STATUS& win_status) {
}
// static
-scoped_ptr<BatteryStatusManager> BatteryStatusManager::Create(
+std::unique_ptr<BatteryStatusManager> BatteryStatusManager::Create(
const BatteryStatusService::BatteryUpdateCallback& callback) {
- return scoped_ptr<BatteryStatusManager>(
+ return std::unique_ptr<BatteryStatusManager>(
new BatteryStatusManagerWin(callback));
}
« no previous file with comments | « device/battery/battery_status_manager_mac.cc ('k') | device/battery/battery_status_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698