| Index: chrome/browser/prefs/pref_registry_syncable.h
|
| diff --git a/chrome/browser/prefs/pref_registry_syncable.h b/chrome/browser/prefs/pref_registry_syncable.h
|
| index d6d1a4ae0e3da60325696076b0b224ccaaeda730..b411d5fafd141fccef40db9369af17c0e2279495 100644
|
| --- a/chrome/browser/prefs/pref_registry_syncable.h
|
| +++ b/chrome/browser/prefs/pref_registry_syncable.h
|
| @@ -21,19 +21,24 @@ class Value;
|
| // preference is syncable or not.
|
| class PrefRegistrySyncable : public PrefRegistry {
|
| public:
|
| - typedef base::Callback<void(const char* path)> SyncableRegistrationCallback;
|
| -
|
| // Enum used when registering preferences to determine if it should
|
| // be synced or not.
|
| enum PrefSyncStatus {
|
| UNSYNCABLE_PREF,
|
| - SYNCABLE_PREF
|
| + SYNCABLE_PREF,
|
| + SYNCABLE_PRIORITY_PREF,
|
| };
|
|
|
| + typedef
|
| + base::Callback<void(const char* path, const PrefSyncStatus sync_status)>
|
| + SyncableRegistrationCallback;
|
| +
|
| PrefRegistrySyncable();
|
|
|
| + typedef std::map<std::string, PrefSyncStatus> PrefToStatus;
|
| +
|
| // Retrieve the set of syncable preferences currently registered.
|
| - const std::set<std::string>& syncable_preferences() const;
|
| + const PrefToStatus& syncable_preferences() const;
|
|
|
| // Exactly one callback can be set for the event of a syncable
|
| // preference being registered. It will be fired after the
|
| @@ -102,7 +107,7 @@ class PrefRegistrySyncable : public PrefRegistry {
|
| SyncableRegistrationCallback callback_;
|
|
|
| // Contains the names of all registered preferences that are syncable.
|
| - std::set<std::string> syncable_preferences_;
|
| + PrefToStatus syncable_preferences_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(PrefRegistrySyncable);
|
| };
|
|
|