sync: Implementation of Priority Preferences.

chrome/browser/sync/profile_sync_components_factory_impl.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 "base/command_line.h"
 #include "build/build_config.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/extensions/api/storage/settings_frontend.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
@@ skipping 187 matching lines @@
     pss->RegisterDataTypeController(
         new ExtensionDataTypeController(syncer::EXTENSIONS,
                                         this, profile_, pss));
   }
 
   // Preference sync is enabled by default.  Register unless explicitly
   // disabled.
   if (!command_line_->HasSwitch(switches::kDisableSyncPreferences)) {
     pss->RegisterDataTypeController(
         new UIDataTypeController(syncer::PREFERENCES, this, profile_, pss));
+    pss->RegisterDataTypeController(
+        new UIDataTypeController(syncer::PRIORITY_PREFERENCES,
+                                 this, profile_, pss));
   }
 
 #if defined(ENABLE_THEMES)
   // Theme sync is enabled by default.  Register unless explicitly disabled.
   if (!command_line_->HasSwitch(switches::kDisableSyncThemes)) {
     pss->RegisterDataTypeController(
         new ThemeDataTypeController(this, profile_, pss));
   }
 #endif
 
@@ skipping 73 matching lines @@
 }
 
 base::WeakPtr<syncer::SyncableService> ProfileSyncComponentsFactoryImpl::
     GetSyncableServiceForType(syncer::ModelType type) {
   if (!profile_) {  // For tests.
      return base::WeakPtr<syncer::SyncableService>();
   }
   switch (type) {
     case syncer::PREFERENCES:
       return PrefServiceSyncable::FromProfile(
-          profile_)->GetSyncableService()->AsWeakPtr();
+          profile_)->GetSyncableService(syncer::PREFERENCES)->AsWeakPtr();
+    case syncer::PRIORITY_PREFERENCES:
+      return PrefServiceSyncable::FromProfile(profile_)->GetSyncableService(
+        syncer::PRIORITY_PREFERENCES)->AsWeakPtr();

[Nicolas Zea, 2013/03/18 19:18:27]

nit: fix indent

[albertb, 2013/03/18 21:33:03]

Done.

     case syncer::AUTOFILL:
     case syncer::AUTOFILL_PROFILE: {
       if (!web_data_service_.get())
         return base::WeakPtr<syncer::SyncableService>();
       if (type == syncer::AUTOFILL) {
         return web_data_service_->GetAutocompleteSyncableService()->AsWeakPtr();
       } else {
         return web_data_service_->
                    GetAutofillProfileSyncableService()->AsWeakPtr();
       }
@@ skipping 106 matching lines @@
 ProfileSyncComponentsFactory::SyncComponents
     ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents(
        ProfileSyncService* profile_sync_service,
         DataTypeErrorHandler* error_handler) {
   SessionModelAssociator* model_associator =
       new SessionModelAssociator(profile_sync_service, error_handler);
   SessionChangeProcessor* change_processor =
       new SessionChangeProcessor(error_handler, model_associator);
   return SyncComponents(model_associator, change_processor);
 }