| 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 18926b64cbb494d3d236c08eb44d87373ee41f3b..6580434e66d0967eec482169e6ef5234e7d79121 100644
|
| --- a/chrome/browser/prefs/pref_service_syncable.h
|
| +++ b/chrome/browser/prefs/pref_service_syncable.h
|
| @@ -7,6 +7,7 @@
|
|
|
| #include "base/prefs/pref_service.h"
|
| #include "chrome/browser/prefs/pref_model_associator.h"
|
| +#include "chrome/browser/prefs/pref_registry_syncable.h"
|
|
|
| class PrefRegistrySyncable;
|
| class PrefServiceSyncableObserver;
|
| @@ -64,6 +65,7 @@ class PrefServiceSyncable : public PrefService {
|
| // TODO(zea): Have PrefServiceSyncable implement
|
| // syncer::SyncableService directly.
|
| syncer::SyncableService* GetSyncableService();
|
| + syncer::SyncableService* GetPrioritySyncableService();
|
|
|
| // Do not call this after having derived an incognito or per tab pref service.
|
| virtual void UpdateCommandLinePrefStore(PrefStore* cmd_line_store) OVERRIDE;
|
| @@ -71,16 +73,22 @@ class PrefServiceSyncable : public PrefService {
|
| private:
|
| friend class PrefModelAssociator;
|
|
|
| - void AddRegisteredSyncablePreference(const char* path);
|
| + void AddRegisteredSyncablePreference(const char* path,
|
| + const PrefRegistrySyncable::PrefSyncStatus sync_status);
|
|
|
| // Invoked internally when the IsSyncing() state changes.
|
| void OnIsSyncingChanged();
|
|
|
| + // Process a local preference change. This can trigger new SyncChanges being
|
| + // sent to the syncer.
|
| + void ProcessPrefChange(const std::string& name);
|
| +
|
| // Whether CreateIncognitoPrefService() has been called to create a
|
| // "forked" PrefService.
|
| bool pref_service_forked_;
|
|
|
| PrefModelAssociator pref_sync_associator_;
|
| + PrefModelAssociator priority_pref_sync_associator_;
|
|
|
| ObserverList<PrefServiceSyncableObserver> observer_list_;
|
|
|
|
|