sync: Implementation of Priority Preferences.

components/user_prefs/pref_registry_syncable.h

Index: components/user_prefs/pref_registry_syncable.h
diff --git a/components/user_prefs/pref_registry_syncable.h b/components/user_prefs/pref_registry_syncable.h
index 08477f249fe30a117f8d281a1d462ee329b11e94..ea6beacc034bd5bd61a60898df0f9e60e89cd2f7 100644
--- a/components/user_prefs/pref_registry_syncable.h
+++ b/components/user_prefs/pref_registry_syncable.h
@@ -30,19 +30,24 @@ class Value;
 // does this for Chrome.
 class USER_PREFS_EXPORT 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,

[tim (not reviewing), 2013/03/21 16:36:00]

We should explain these here.

[albertb, 2013/03/21 17:10:33]

Done.

   };
 
+  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
@@ -111,7 +116,7 @@ class USER_PREFS_EXPORT 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);
 };