components/password_manager/core/browser/password_syncable_service.cc - Issue 1220713005: Rename avatar_url to icon_url in PasswordForm.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1220713005: Rename avatar_url to icon_url in PasswordForm. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@rename2

Patch Set: Rebased. Created 5 years, 5 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

« no previous file with comments | « components/password_manager/core/browser/password_manager_test_utils.cc ('k') | components/password_manager/core/browser/password_syncable_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 d38cf462b17885cedc9c5e2abf25acc62d5297c6..887750f7c61a0f8634551160c86dcbb40eb44ec3 100644

--- a/components/password_manager/core/browser/password_syncable_service.cc

+++ b/components/password_manager/core/browser/password_syncable_service.cc

@@ -58,7 +58,7 @@ bool AreLocalAndSyncPasswordsEqual(

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.icon_url.spec() == password_specifics.avatar_url() &&

password_form.federation_url.spec() ==

password_specifics.federation_url());

}

@@ -460,7 +460,7 @@ syncer::SyncData SyncDataFromPassword(

CopyField(type);

CopyField(times_used);

CopyStringField(display_name);

- password_specifics->set_avatar_url(password_form.avatar_url.spec());

+ password_specifics->set_avatar_url(password_form.icon_url.spec());

password_specifics->set_federation_url(password_form.federation_url.spec());

#undef CopyStringField

#undef CopyField

@@ -492,7 +492,7 @@ autofill::PasswordForm PasswordFromSpecifics(

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.icon_url = GURL(password.avatar_url());

new_password.federation_url = GURL(password.federation_url());

return new_password;

}