chrome/browser/password_manager/credential_android.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: chrome/browser/password_manager/credential_android.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

« no previous file with comments | « chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc ('k') | chrome/browser/password_manager/native_backend_gnome_x.cc » ('j') | chrome/browser/password_manager/save_password_infobar_delegate.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/password_manager/credential_android.cc

diff --git a/chrome/browser/password_manager/credential_android.cc b/chrome/browser/password_manager/credential_android.cc

index c1be78d139f8d8362a7f8d5173ca789af3be65eb..f1dc98b3710ec715b17a8f1b704846210b54c506 100644

--- a/chrome/browser/password_manager/credential_android.cc

+++ b/chrome/browser/password_manager/credential_android.cc

@@ -9,6 +9,7 @@

#include "chrome/grit/generated_resources.h"

#include "jni/Credential_jni.h"

#include "ui/base/l10n/l10n_util.h"

+#include "url/origin.h"

base::android::ScopedJavaLocalRef<jobject> CreateNativeCredential(

JNIEnv* env,

@@ -18,11 +19,11 @@ base::android::ScopedJavaLocalRef<jobject> CreateNativeCredential(

using base::android::ConvertUTF16ToJavaString;

using base::android::ConvertUTF8ToJavaString;

std::string federation =

- password_form.federation_url.is_empty()

+ password_form.federation_origin.unique()

? std::string()

: l10n_util::GetStringFUTF8(

IDS_PASSWORDS_VIA_FEDERATION,

- base::ASCIIToUTF16(password_form.federation_url.host()));

+ base::ASCIIToUTF16(password_form.federation_origin.host()));

return Java_Credential_createCredential(

env, ConvertUTF16ToJavaString(env, password_form.username_value).obj(),

ConvertUTF16ToJavaString(env, password_form.display_name).obj(),