Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(34)

Unified Diff: components/password_manager/sync/browser/password_manager_setting_migrator_service.cc

Issue 1422713011: [Smart Lock, prefs reconciliation] IOS factory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ios/chrome/browser/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/password_manager/sync/browser/password_manager_setting_migrator_service.cc
diff --git a/components/password_manager/sync/browser/password_manager_setting_migrator_service.cc b/components/password_manager/sync/browser/password_manager_setting_migrator_service.cc
index 84d295642253b86ec0d01d6462b3acba44e9aeda..8c6a767452cf5efccac5c8582cf1b5eabbbd8b27 100644
--- a/components/password_manager/sync/browser/password_manager_setting_migrator_service.cc
+++ b/components/password_manager/sync/browser/password_manager_setting_migrator_service.cc
@@ -176,7 +176,7 @@ void PasswordManagerSettingMigratorService::OnIsSyncingChanged() {
}
bool PasswordManagerSettingMigratorService::WasModelAssociationStepPerformed() {
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) || defined(OS_IOS)
return prefs_->IsPrioritySyncing();
#else
return prefs_->IsSyncing() && prefs_->IsPrioritySyncing();
@@ -197,7 +197,7 @@ void PasswordManagerSettingMigratorService::MigrateAfterModelAssociation(
if (sync_data_.empty()) {
MigrateOffState(prefs);
} else if (sync_data_.size() == 1) {
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) || defined(OS_IOS)
if (initial_new_pref_value_ != initial_legacy_pref_value_) {
// Treat special case for mobile clients where only priority pref
// arrives on the client.
« no previous file with comments | « no previous file | ios/chrome/browser/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698