components/password_manager/core/common/credential_manager_types.cc - Issue 1723583004: CREDENTIAL: Convert federations from URLs to origins throughout.

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/common/credential_manager_types.cc

Issue 1723583004: CREDENTIAL: Convert federations from URLs to origins throughout. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: iOS2 Created 4 years, 10 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

« chrome/browser/password_manager/save_password_infobar_delegate.cc ('K') | « components/password_manager/core/common/credential_manager_types.h ('k') | components/password_manager/core/common/credential_manager_types_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/password_manager/core/common/credential_manager_types.cc

diff --git a/components/password_manager/core/common/credential_manager_types.cc b/components/password_manager/core/common/credential_manager_types.cc

index a9bac499f6313fdafb80315bcdfd6fc7bf11d5c7..d89902134ec9cc40b919d8d89ccd271163166a20 100644

--- a/components/password_manager/core/common/credential_manager_types.cc

+++ b/components/password_manager/core/common/credential_manager_types.cc

@@ -19,14 +19,14 @@ CredentialInfo::CredentialInfo(const autofill::PasswordForm& form,

name(form.display_name),

icon(form.icon_url),

password(form.password_value),

- federation(form.federation_url) {

+ federation(form.federation_origin) {

switch (form_type) {

case CredentialType::CREDENTIAL_TYPE_EMPTY:

password = base::string16();

- federation = GURL();

+ federation = url::Origin();

break;

case CredentialType::CREDENTIAL_TYPE_PASSWORD:

- federation = GURL();

+ federation = url::Origin();

break;

case CredentialType::CREDENTIAL_TYPE_FEDERATED:

password = base::string16();

@@ -47,7 +47,7 @@ scoped_ptr<autofill::PasswordForm> CreatePasswordFormFromCredentialInfo(

form.reset(new autofill::PasswordForm);

form->icon_url = info.icon;

form->display_name = info.name;

- form->federation_url = info.federation;

+ form->federation_origin = info.federation;

form->origin = origin;

form->password_value = info.password;

form->username_value = info.id;

@@ -64,7 +64,7 @@ scoped_ptr<autofill::PasswordForm> CreatePasswordFormFromCredentialInfo(

bool CredentialInfo::operator==(const CredentialInfo& rhs) const {

return (type == rhs.type && id == rhs.id && name == rhs.name &&

icon == rhs.icon && password == rhs.password &&

- federation == rhs.federation);

+ federation.Serialize() == rhs.federation.Serialize());

}

} // namespace password_manager