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 a9d9a5251fe81ffaaae99262bf03232fe5180af0..729d129820b501edc378a325e36fedaf603f7205 100644 |
--- a/chrome/browser/sync/profile_sync_components_factory_impl.cc |
+++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc |
@@ -131,6 +131,22 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes( |
pss->RegisterDataTypeController( |
new SessionDataTypeController(this, profile_, pss)); |
} |
+ |
+ // Password sync is enabled by default. Register unless explicitly |
+ // disabled. |
+ if (!command_line_->HasSwitch(switches::kDisableSyncPasswords)) { |
+#if !defined(OS_ANDROID) |
+ pss->RegisterDataTypeController( |
+ new PasswordDataTypeController(this, profile_, pss)); |
+#else |
+ // On Android, enable password sync only when Keystore encryption |
Nicolas Zea
2013/01/18 00:05:11
I wonder, do we need this? Don't we just care abou
shashi
2013/01/18 02:06:31
This is just to hide the feature behind a flag, un
|
+ // is enabled. |
+ if (command_line_->HasSwitch(switches::kSyncKeystoreEncryption)) { |
+ pss->RegisterDataTypeController( |
+ new PasswordDataTypeController(this, profile_, pss)); |
+ } |
+#endif |
+ } |
} |
void ProfileSyncComponentsFactoryImpl::RegisterDesktopDataTypes( |
@@ -157,13 +173,6 @@ void ProfileSyncComponentsFactoryImpl::RegisterDesktopDataTypes( |
this, profile_, pss)); |
} |
- // Password sync is enabled by default. Register unless explicitly |
- // disabled. |
- if (!command_line_->HasSwitch(switches::kDisableSyncPasswords)) { |
- pss->RegisterDataTypeController( |
- new PasswordDataTypeController(this, profile_, pss)); |
- } |
- |
// Preference sync is enabled by default. Register unless explicitly |
// disabled. |
if (!command_line_->HasSwitch(switches::kDisableSyncPreferences)) { |