Chromium Code Reviews| Index: chrome/browser/sync/profile_sync_components_factory_impl.cc |
| diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.cc b/chrome/browser/sync/profile_sync_components_factory_impl.cc |
| index dc447fc72d89a3efbba106010c306f8f35cd1823..5daf49cd3bdb9b67b3e02615ab95cbace0569521 100644 |
| --- a/chrome/browser/sync/profile_sync_components_factory_impl.cc |
| +++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc |
| @@ -205,6 +205,9 @@ void ProfileSyncComponentsFactoryImpl::RegisterDesktopDataTypes( |
| 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) |
| @@ -298,7 +301,10 @@ base::WeakPtr<syncer::SyncableService> ProfileSyncComponentsFactoryImpl:: |
| 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()) |