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

Unified Diff: components/storage_monitor/storage_monitor_chromeos.h

Issue 1884743002: Convert a few components from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: lint 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
Index: components/storage_monitor/storage_monitor_chromeos.h
diff --git a/components/storage_monitor/storage_monitor_chromeos.h b/components/storage_monitor/storage_monitor_chromeos.h
index 84af559bc069bdae287bc37ee4fd8f4e9e85c785..7b3386b5ccc556bc3ea23b21bf12316836b7f686 100644
--- a/components/storage_monitor/storage_monitor_chromeos.h
+++ b/components/storage_monitor/storage_monitor_chromeos.h
@@ -14,11 +14,11 @@
#endif
#include <map>
+#include <memory>
#include <string>
#include "base/compiler_specific.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "build/build_config.h"
#include "chromeos/disks/disk_mount_manager.h"
@@ -84,9 +84,9 @@ class StorageMonitorCros : public StorageMonitor,
// Mapping of relevant mount points and their corresponding mount devices.
MountMap mount_map_;
- scoped_ptr<device::MediaTransferProtocolManager>
+ std::unique_ptr<device::MediaTransferProtocolManager>
media_transfer_protocol_manager_;
- scoped_ptr<MediaTransferProtocolDeviceObserverLinux>
+ std::unique_ptr<MediaTransferProtocolDeviceObserverLinux>
media_transfer_protocol_device_observer_;
base::WeakPtrFactory<StorageMonitorCros> weak_ptr_factory_;
« no previous file with comments | « components/storage_monitor/storage_monitor.cc ('k') | components/storage_monitor/storage_monitor_chromeos_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698