ios/web/web_state/js/credential_util.mm - 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: ios/web/web_state/js/credential_util.mm

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') | « ios/web/web_state/credential.cc ('k') | ios/web/web_state/js/credential_util_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ios/web/web_state/js/credential_util.mm

diff --git a/ios/web/web_state/js/credential_util.mm b/ios/web/web_state/js/credential_util.mm

index 9017e42a1e65853d78aa21e31c7df24b1d9dfeca..6e4eb7b7c52cab41f53149f0506edc0fdab72b70 100644

--- a/ios/web/web_state/js/credential_util.mm

+++ b/ios/web/web_state/js/credential_util.mm

@@ -10,6 +10,7 @@

#include "base/values.h"

#include "ios/web/public/web_state/credential.h"

#include "url/gurl.h"

+#include "url/origin.h"

namespace {

@@ -74,7 +75,7 @@ bool DictionaryValueToCredential(const base::DictionaryValue& value,

credential->name = name;

credential->avatar_url = avatar_url;

credential->password = password;

- credential->federation_url = federation_url;

+ credential->federation_origin = url::Origin(federation_url);

return true;

}

@@ -93,7 +94,7 @@ void CredentialToDictionaryValue(const Credential& credential,

break;

case CredentialType::CREDENTIAL_TYPE_FEDERATED:

value->SetString("type", kFederatedCredentialType);

- value->SetString("federation", credential.federation_url.spec());

+ value->SetString("federation", credential.federation_origin.Serialize());

break;

default:

NOTREACHED();