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

Unified Diff: chrome/browser/chromeos/extensions/file_manager/event_router.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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/extensions/file_manager/event_router.h
diff --git a/chrome/browser/chromeos/extensions/file_manager/event_router.h b/chrome/browser/chromeos/extensions/file_manager/event_router.h
index ed30696377ae646278e36e73813689177606d00b..ce0c8274117a79b6572b97669d649f3059d81cf5 100644
--- a/chrome/browser/chromeos/extensions/file_manager/event_router.h
+++ b/chrome/browser/chromeos/extensions/file_manager/event_router.h
@@ -8,13 +8,13 @@
#include <stdint.h>
#include <map>
+#include <memory>
#include <string>
#include <vector>
#include "base/compiler_specific.h"
#include "base/files/file_path_watcher.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "chrome/browser/chromeos/drive/drive_integration_service.h"
#include "chrome/browser/chromeos/extensions/file_manager/device_event_router.h"
#include "chrome/browser/chromeos/extensions/file_manager/job_event_router.h"
@@ -215,11 +215,11 @@ class EventRouter : public KeyedService,
base::Time last_copy_progress_event_;
WatcherMap file_watchers_;
- scoped_ptr<PrefChangeRegistrar> pref_change_registrar_;
+ std::unique_ptr<PrefChangeRegistrar> pref_change_registrar_;
Profile* profile_;
- scoped_ptr<DeviceEventRouter> device_event_router_;
- scoped_ptr<JobEventRouter> job_event_router_;
+ std::unique_ptr<DeviceEventRouter> device_event_router_;
+ std::unique_ptr<JobEventRouter> job_event_router_;
DispatchDirectoryChangeEventImplCallback
dispatch_directory_change_event_impl_;

Powered by Google App Engine
This is Rietveld 408576698