| Index: base/prefs/pref_service.h
|
| diff --git a/base/prefs/pref_service.h b/base/prefs/pref_service.h
|
| index 186433c1b62907c16eb3360ca8d567ca2b1a07a6..56231c364e40dbf1a8a8776cff31eadc527d6a8d 100644
|
| --- a/base/prefs/pref_service.h
|
| +++ b/base/prefs/pref_service.h
|
| @@ -30,12 +30,17 @@ class PrefNotifierImpl;
|
| class PrefObserver;
|
| class PrefRegistry;
|
| class PrefValueStore;
|
| +class PrefService;
|
| class PrefStore;
|
|
|
| namespace base {
|
| class FilePath;
|
| }
|
|
|
| +namespace chrome {
|
| +void MigrateBrowserUIUserPrefs(PrefService* prefs);
|
| +}
|
| +
|
| namespace subtle {
|
| class PrefMemberBase;
|
| class ScopedUserPrefUpdateBase;
|
| @@ -307,6 +312,9 @@ class BASE_PREFS_EXPORT PrefService : public base::NonThreadSafe {
|
| friend class PrefChangeRegistrar;
|
| friend class subtle::PrefMemberBase;
|
|
|
| + // For access to GetBrowserDictionary below.
|
| + friend void chrome::MigrateBrowserUIUserPrefs(PrefService* prefs);
|
| +
|
| // These are protected so they can only be accessed by the friend
|
| // classes listed above.
|
| //
|
| @@ -348,6 +356,11 @@ class BASE_PREFS_EXPORT PrefService : public base::NonThreadSafe {
|
| // actually get the value.).
|
| const base::Value* GetPreferenceValue(const std::string& path) const;
|
|
|
| + // This is only to be used to migrate unregistered prefs to become registered.
|
| + // TODO(dgrogan): Can be removed when m39 goes to stable. See
|
| + // http://crbug.com/167256.
|
| + scoped_ptr<base::DictionaryValue> GetBrowserDictionary() const;
|
| +
|
| // Local cache of registered Preference objects. The pref_registry_
|
| // is authoritative with respect to what the types and default values
|
| // of registered preferences are.
|
|
|