Chromium Code Reviews| 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..d6898ed8035ef09e2d5d3ce4b31fe61f406bd5b6 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; |
|
Nicolas Zea
2013/02/21 23:41:11
nit: third line should be indented another 4 space
albertb
2013/02/22 20:08:47
Done.
|
| + |
| 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); |
| }; |