| Index: chrome/browser/prefs/pref_service_syncable.h
|
| diff --git a/chrome/browser/prefs/pref_service_syncable.h b/chrome/browser/prefs/pref_service_syncable.h
|
| index 971a9225d110bacc7f742028e0c406aa6ee37cfb..e1c7d236934c1385c75530ab292b3852da2e057b 100644
|
| --- a/chrome/browser/prefs/pref_service_syncable.h
|
| +++ b/chrome/browser/prefs/pref_service_syncable.h
|
| @@ -9,7 +9,6 @@
|
| #include "chrome/browser/prefs/pref_model_associator.h"
|
| #include "components/user_prefs/pref_registry_syncable.h"
|
|
|
| -class PrefRegistrySyncable;
|
| class PrefServiceSyncableObserver;
|
| class Profile;
|
|
|
| @@ -40,7 +39,7 @@ class PrefServiceSyncable : public PrefService {
|
| PrefNotifierImpl* pref_notifier,
|
| PrefValueStore* pref_value_store,
|
| PersistentPrefStore* user_prefs,
|
| - PrefRegistrySyncable* pref_registry,
|
| + user_prefs::PrefRegistrySyncable* pref_registry,
|
| base::Callback<void(PersistentPrefStore::PrefReadError)>
|
| read_error_callback,
|
| bool async);
|
| @@ -82,7 +81,7 @@ class PrefServiceSyncable : public PrefService {
|
|
|
| void AddRegisteredSyncablePreference(
|
| const char* path,
|
| - const PrefRegistrySyncable::PrefSyncStatus sync_status);
|
| + const user_prefs::PrefRegistrySyncable::PrefSyncStatus sync_status);
|
|
|
| // Invoked internally when the IsSyncing() state changes.
|
| void OnIsSyncingChanged();
|
|
|