chrome/browser/ui/views/passwords/account_chooser_dialog_view.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/ui/views/passwords/account_chooser_dialog_view.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') | « chrome/browser/ui/passwords/manage_passwords_view_utils.cc ('k') | chrome/browser/ui/views/passwords/manage_password_items_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/passwords/account_chooser_dialog_view.cc

diff --git a/chrome/browser/ui/views/passwords/account_chooser_dialog_view.cc b/chrome/browser/ui/views/passwords/account_chooser_dialog_view.cc

index fe617ff101806703abec7c3214746b3f4b1d3e5e..6f1172199274176e6aa44bc717df7278e1821f9e 100644

--- a/chrome/browser/ui/views/passwords/account_chooser_dialog_view.cc

+++ b/chrome/browser/ui/views/passwords/account_chooser_dialog_view.cc

@@ -159,13 +159,13 @@ void AccountChooserDialogView::InitWindow() {

const base::string16& upper_string =

form->display_name.empty() ? form->username_value : form->display_name;

base::string16 lower_string;

- if (form->federation_url.is_empty()) {

+ if (form->federation_origin.unique()) {

if (!form->display_name.empty())

lower_string = form->username_value;

} else {

lower_string = l10n_util::GetStringFUTF16(

IDS_PASSWORDS_VIA_FEDERATION,

- base::UTF8ToUTF16(form->federation_url.host()));

+ base::UTF8ToUTF16(form->federation_origin.host()));

}

layout->StartRow(0, SINGLE_VIEW_COLUMN_SET_NO_PADDING);

CredentialsItemView* view = new CredentialsItemView(