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 bee7327aaebe7f6f92905a3adf40ab74fb50e10d..2ff0f6e4e0cdaef20e703c486747a3d9e225e358 100644 |
--- a/chrome/browser/sync/profile_sync_components_factory_impl.cc |
+++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc |
@@ -113,6 +113,19 @@ void ProfileSyncComponentsFactoryImpl::RegisterDataTypes( |
void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes( |
ProfileSyncService* pss) { |
+ // Autofill sync is enabled by default. Register unless explicitly |
+ // disabled. |
+ if (!command_line_->HasSwitch(switches::kDisableSyncAutofill)) { |
+ pss->RegisterDataTypeController( |
+ new AutofillDataTypeController(this, profile_, pss)); |
+ } |
+ |
+ if (!command_line_->HasSwitch(switches::kDisableSyncAutofillProfile)) { |
Nicolas Zea
2013/01/29 01:22:23
Comment about this being enabled by default too
cjhopman
2013/02/05 01:47:20
Done.
|
+ pss->RegisterDataTypeController( |
+ new AutofillProfileDataTypeController(this, profile_, pss)); |
+ } |
+ |
+ |
Nicolas Zea
2013/01/29 01:22:23
remove extra newline
cjhopman
2013/02/05 01:47:20
Done.
|
// Bookmark sync is enabled by default. Register unless explicitly |
// disabled. |
if (!command_line_->HasSwitch(switches::kDisableSyncBookmarks)) { |
@@ -160,13 +173,6 @@ void ProfileSyncComponentsFactoryImpl::RegisterDesktopDataTypes( |
new ExtensionDataTypeController(syncer::APPS, this, profile_, pss)); |
} |
- // Autofill sync is enabled by default. Register unless explicitly |
- // disabled. |
- if (!command_line_->HasSwitch(switches::kDisableSyncAutofill)) { |
- pss->RegisterDataTypeController( |
- new AutofillDataTypeController(this, profile_, pss)); |
- } |
- |
// Extension sync is enabled by default. Register unless explicitly |
// disabled. |
if (!command_line_->HasSwitch(switches::kDisableSyncExtensions)) { |
@@ -213,11 +219,6 @@ void ProfileSyncComponentsFactoryImpl::RegisterDesktopDataTypes( |
syncer::APP_SETTINGS, this, profile_, pss)); |
} |
- if (!command_line_->HasSwitch(switches::kDisableSyncAutofillProfile)) { |
- pss->RegisterDataTypeController( |
- new AutofillProfileDataTypeController(this, profile_, pss)); |
- } |
- |
// App notifications sync is enabled by default. Register unless explicitly |
// disabled. |
if (!command_line_->HasSwitch(switches::kDisableSyncAppNotifications)) { |