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

Unified Diff: device/battery/battery_status_manager_mac.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_linux.cc ('k') | device/battery/battery_status_manager_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/battery/battery_status_manager_mac.cc
diff --git a/device/battery/battery_status_manager_mac.cc b/device/battery/battery_status_manager_mac.cc
index ca8879097c70cfc6acb3149898972f1e13f4b7d6..ca81a580a430f6b6a222cbe7dbe704a2b07925ce 100644
--- a/device/battery/battery_status_manager_mac.cc
+++ b/device/battery/battery_status_manager_mac.cc
@@ -5,14 +5,15 @@
#include "device/battery/battery_status_manager.h"
#include <CoreFoundation/CoreFoundation.h>
-#include <IOKit/ps/IOPowerSources.h>
#include <IOKit/ps/IOPSKeys.h>
+#include <IOKit/ps/IOPowerSources.h>
+
+#include <memory>
#include <vector>
#include "base/mac/foundation_util.h"
#include "base/mac/scoped_cftyperef.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/metrics/histogram.h"
#include "base/time/time.h"
@@ -227,7 +228,7 @@ class BatteryStatusManagerMac : public BatteryStatusManager {
}
private:
- scoped_ptr<BatteryStatusObserver> notifier_;
+ std::unique_ptr<BatteryStatusObserver> notifier_;
DISALLOW_COPY_AND_ASSIGN(BatteryStatusManagerMac);
};
@@ -235,9 +236,9 @@ class BatteryStatusManagerMac : public BatteryStatusManager {
} // end namespace
// 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 BatteryStatusManagerMac(callback));
}
« no previous file with comments | « device/battery/battery_status_manager_linux.cc ('k') | device/battery/battery_status_manager_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698