sync: Implementation of Priority Preferences.

chrome/browser/sync/sync_prefs.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/sync_prefs.h"
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/public/pref_member.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 310 matching lines @@
     case syncer::HISTORY_DELETE_DIRECTIVES:
       return prefs::kSyncHistoryDeleteDirectives;
     case syncer::SYNCED_NOTIFICATIONS:
       return prefs::kSyncSyncedNotifications;
     case syncer::DICTIONARY:
       return prefs::kSyncDictionary;
     case syncer::FAVICON_IMAGES:
       return prefs::kSyncFaviconImages;
     case syncer::FAVICON_TRACKING:
       return prefs::kSyncFaviconTracking;
+    case syncer::PRIORITY_PREFERENCES:
+      return prefs::kSyncPriorityPreferences;
     default:
       break;
   }
   NOTREACHED();
   return NULL;
 }
 
 #if defined(OS_CHROMEOS)
 std::string SyncPrefs::GetSpareBootstrapToken() const {
   DCHECK(CalledOnValidThread());
@@ skipping 45 matching lines @@
 
 void SyncPrefs::RegisterPrefGroups() {
   pref_groups_[syncer::APPS].Put(syncer::APP_NOTIFICATIONS);
   pref_groups_[syncer::APPS].Put(syncer::APP_SETTINGS);
 
   pref_groups_[syncer::AUTOFILL].Put(syncer::AUTOFILL_PROFILE);
 
   pref_groups_[syncer::EXTENSIONS].Put(syncer::EXTENSION_SETTINGS);
 
   pref_groups_[syncer::PREFERENCES].Put(syncer::DICTIONARY);
+  pref_groups_[syncer::PREFERENCES].Put(syncer::PRIORITY_PREFERENCES);
   pref_groups_[syncer::PREFERENCES].Put(syncer::SEARCH_ENGINES);
 
   // TODO(zea): put favicons in the bookmarks group as well once it handles
   // those favicons.
   pref_groups_[syncer::SESSIONS].Put(syncer::FAVICON_IMAGES);
   pref_groups_[syncer::SESSIONS].Put(syncer::FAVICON_TRACKING);
 
   // TODO(akalin): Revisit this once UI lands.
   pref_groups_[syncer::SESSIONS].Put(syncer::HISTORY_DELETE_DIRECTIVES);
 }
@@ skipping 28 matching lines @@
 void SyncPrefs::SetDataTypePreferred(
     syncer::ModelType type, bool is_preferred) {
   DCHECK(CalledOnValidThread());
   CHECK(pref_service_);
   const char* pref_name = GetPrefNameForDataType(type);
   if (!pref_name) {
     NOTREACHED();
     return;
   }
   pref_service_->SetBoolean(pref_name, is_preferred);
+
+  if (type == syncer::PREFERENCES) {

[Nicolas Zea, 2013/02/21 23:41:11]

Why is this necessary? Don't the pref groups handle this?

[albertb, 2013/02/22 20:08:47]

Done.

+    SetDataTypePreferred(syncer::PRIORITY_PREFERENCES, is_preferred);
+  }
 }
 
 syncer::ModelTypeSet SyncPrefs::ResolvePrefGroups(
     syncer::ModelTypeSet registered_types,
     syncer::ModelTypeSet types) const {
   DCHECK(registered_types.HasAll(types));
   syncer::ModelTypeSet types_with_groups = types;
   for (PrefGroupsMap::const_iterator i = pref_groups_.begin();
       i != pref_groups_.end(); ++i) {
     if (types.Has(i->first))
       types_with_groups.PutAll(i->second);
     else
       types_with_groups.RemoveAll(i->second);
   }
   types_with_groups.RetainAll(registered_types);
   return types_with_groups;
 }
 
 }  // namespace browser_sync