diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-06 06:17:34 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-06 06:17:34 +0000 |
| commit | 443e93170c8d4db335384b340571fd3cb9c3bbb7 (patch) | |
| tree | a3a48f898d87d24530b57888b7244806118d8337 /chrome/browser/prefs/pref_service_syncable.h | |
| parent | b713132324bcb1c387fafacef68f6b275931551b (diff) | |
| download | chromium_src-443e93170c8d4db335384b340571fd3cb9c3bbb7.zip chromium_src-443e93170c8d4db335384b340571fd3cb9c3bbb7.tar.gz chromium_src-443e93170c8d4db335384b340571fd3cb9c3bbb7.tar.bz2 | |
components: Move PrefRegistrySyncable into user_prefs namespace.
BUG=180785
R=joi@chromium.org
TBR=darin@chromium.org
Review URL: https://chromiumcodereview.appspot.com/14622003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198384 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs/pref_service_syncable.h')
| -rw-r--r-- | chrome/browser/prefs/pref_service_syncable.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/prefs/pref_service_syncable.h b/chrome/browser/prefs/pref_service_syncable.h index 971a922..e1c7d23 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(); |