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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_PREF_STORE_H_ 5 #ifndef CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_PREF_STORE_H_
6 #define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_PREF_STORE_H_ 6 #define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_PREF_STORE_H_
7 7
8 #include <memory>
8 #include <string> 9 #include <string>
9 10
10 #include "base/callback_list.h" 11 #include "base/callback_list.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "base/observer_list.h" 12 #include "base/observer_list.h"
13 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/supervised_user/supervised_users.h" 14 #include "chrome/browser/supervised_user/supervised_users.h"
15 #include "components/prefs/pref_store.h" 15 #include "components/prefs/pref_store.h"
16 #include "content/public/browser/notification_observer.h" 16 #include "content/public/browser/notification_observer.h"
17 #include "content/public/browser/notification_registrar.h" 17 #include "content/public/browser/notification_registrar.h"
18 18
19 namespace base { 19 namespace base {
20 class DictionaryValue; 20 class DictionaryValue;
21 class Value; 21 class Value;
(...skipping 21 matching lines...) Expand all
43 // NotificationObserver implementation. 43 // NotificationObserver implementation.
44 void Observe(int type, 44 void Observe(int type,
45 const content::NotificationSource& src, 45 const content::NotificationSource& src,
46 const content::NotificationDetails& details) override; 46 const content::NotificationDetails& details) override;
47 47
48 private: 48 private:
49 ~SupervisedUserPrefStore() override; 49 ~SupervisedUserPrefStore() override;
50 50
51 void OnNewSettingsAvailable(const base::DictionaryValue* settings); 51 void OnNewSettingsAvailable(const base::DictionaryValue* settings);
52 52
53 scoped_ptr<base::CallbackList<void( 53 std::unique_ptr<
54 const base::DictionaryValue*)>::Subscription> user_settings_subscription_; 54 base::CallbackList<void(const base::DictionaryValue*)>::Subscription>
55 user_settings_subscription_;
55 content::NotificationRegistrar unsubscriber_registrar_; 56 content::NotificationRegistrar unsubscriber_registrar_;
56 57
57 scoped_ptr<PrefValueMap> prefs_; 58 std::unique_ptr<PrefValueMap> prefs_;
58 59
59 base::ObserverList<PrefStore::Observer, true> observers_; 60 base::ObserverList<PrefStore::Observer, true> observers_;
60 }; 61 };
61 62
62 #endif // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_PREF_STORE_H_ 63 #endif // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_PREF_STORE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698