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

Unified Diff: components/password_manager/core/browser/password_syncable_service.cc

Issue 520583003: Sync new PasswordForm fields. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove the blank Created 6 years, 3 months 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
Index: components/password_manager/core/browser/password_syncable_service.cc
diff --git a/components/password_manager/core/browser/password_syncable_service.cc b/components/password_manager/core/browser/password_syncable_service.cc
index a0d3dc25b0bf6ae2e7f17453f8eb64ea45c101ff..027998b978aa94f496f1901f9affe5b48671cc37 100644
--- a/components/password_manager/core/browser/password_syncable_service.cc
+++ b/components/password_manager/core/browser/password_syncable_service.cc
@@ -54,7 +54,12 @@ bool AreLocalAndSyncPasswordsEqual(
password_form.blacklisted_by_user ==
password_specifics.blacklisted() &&
password_form.type == password_specifics.type() &&
- password_form.times_used == password_specifics.times_used());
+ password_form.times_used == password_specifics.times_used() &&
+ base::UTF16ToUTF8(password_form.display_name) ==
+ password_specifics.display_name() &&
+ password_form.avatar_url.spec() == password_specifics.avatar_url() &&
+ password_form.federation_url.spec() ==
+ password_specifics.federation_url());
}
syncer::SyncChange::SyncChangeType GetSyncChangeType(
@@ -390,6 +395,9 @@ syncer::SyncData SyncDataFromPassword(
password_specifics->set_blacklisted(password_form.blacklisted_by_user);
CopyField(type);
CopyField(times_used);
+ CopyStringField(display_name);
+ password_specifics->set_avatar_url(password_form.avatar_url.spec());
+ password_specifics->set_federation_url(password_form.federation_url.spec());
#undef CopyStringField
#undef CopyField
@@ -419,6 +427,9 @@ autofill::PasswordForm PasswordFromSpecifics(
new_password.type =
static_cast<autofill::PasswordForm::Type>(password.type());
new_password.times_used = password.times_used();
+ new_password.display_name = base::UTF8ToUTF16(password.display_name());
+ new_password.avatar_url = GURL(password.avatar_url());
+ new_password.federation_url = GURL(password.federation_url());
return new_password;
}

Powered by Google App Engine
This is Rietveld 408576698