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

Unified Diff: chrome/browser/supervised_user/supervised_user_pref_store.h

Issue 1878143002: Convert //chrome/browser/supervised_user from scoped_ptr 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
Index: chrome/browser/supervised_user/supervised_user_pref_store.h
diff --git a/chrome/browser/supervised_user/supervised_user_pref_store.h b/chrome/browser/supervised_user/supervised_user_pref_store.h
index d1de0e094823244b35db44afd2d50b49e2db6aef..592d61ec0a3d697e2e952281e2babc28fd047823 100644
--- a/chrome/browser/supervised_user/supervised_user_pref_store.h
+++ b/chrome/browser/supervised_user/supervised_user_pref_store.h
@@ -5,10 +5,10 @@
#ifndef CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_PREF_STORE_H_
#define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_PREF_STORE_H_
+#include <memory>
#include <string>
#include "base/callback_list.h"
-#include "base/memory/scoped_ptr.h"
#include "base/observer_list.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/supervised_user/supervised_users.h"
@@ -50,11 +50,12 @@ class SupervisedUserPrefStore : public PrefStore,
void OnNewSettingsAvailable(const base::DictionaryValue* settings);
- scoped_ptr<base::CallbackList<void(
- const base::DictionaryValue*)>::Subscription> user_settings_subscription_;
+ std::unique_ptr<
+ base::CallbackList<void(const base::DictionaryValue*)>::Subscription>
+ user_settings_subscription_;
content::NotificationRegistrar unsubscriber_registrar_;
- scoped_ptr<PrefValueMap> prefs_;
+ std::unique_ptr<PrefValueMap> prefs_;
base::ObserverList<PrefStore::Observer, true> observers_;
};

Powered by Google App Engine
This is Rietveld 408576698