chrome/browser/password_manager/account_chooser_dialog_android.cc - Issue 1627193003: [Smart Lock, UI] Display origin in account chooser dialog.

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/account_chooser_dialog_android.cc

Issue 1627193003: [Smart Lock, UI] Display origin in account chooser dialog. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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/password_manager/account_chooser_dialog_android.h ('k') | components/password_manager/core/browser/password_ui_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/password_manager/account_chooser_dialog_android.cc

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

index 833980783bf98991ebb8999e77f9263908f5973b..a025de8f5e5359f082d6a1ef93453e3c7a06b626 100644

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

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

@@ -20,6 +20,7 @@

#include "components/browser_sync/browser/profile_sync_service.h"

#include "components/password_manager/core/browser/password_bubble_experiment.h"

#include "components/password_manager/core/browser/password_manager_constants.h"

+#include "components/password_manager/core/browser/password_ui_utils.h"

#include "components/password_manager/core/common/credential_manager_types.h"

#include "jni/AccountChooserDialog_jni.h"

#include "ui/android/window_android.h"

@@ -109,7 +110,7 @@ AccountChooserDialogAndroid::AccountChooserDialogAndroid(

ScopedVector<autofill::PasswordForm> federated_credentials,

const GURL& origin,

const ManagePasswordsState::CredentialsCallback& callback)

- : web_contents_(web_contents) {

+ : web_contents_(web_contents), origin_(origin) {

passwords_data_.set_client(

ChromePasswordManagerClient::FromWebContents(web_contents_));

passwords_data_.OnRequestCredentials(

@@ -146,7 +147,10 @@ void AccountChooserDialogAndroid::ShowDialog() {

env, native_window->GetJavaObject().obj(),

reinterpret_cast<intptr_t>(this), java_credentials_array.obj(),

base::android::ConvertUTF16ToJavaString(env, title).obj(),

- title_link_range.start(), title_link_range.end()));

+ title_link_range.start(), title_link_range.end(),

+ base::android::ConvertUTF8ToJavaString(

+ env, password_manager::GetShownOrigin(origin_, std::string()))

+ .obj()));

base::android::ScopedJavaLocalRef<jobject> java_dialog(java_dialog_global);

net::URLRequestContextGetter* request_context =

Profile::FromBrowserContext(web_contents_->GetBrowserContext())