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

Index: chrome/browser/ui/passwords/manage_passwords_view_utils.cc

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

index 4ff7e5a2742f671a4e1ae5c9769a7756b089aa6b..dbacbcaa6d9aa3b037dd256980a6eecb3edca304 100644

--- a/chrome/browser/ui/passwords/manage_passwords_view_utils.cc

+++ b/chrome/browser/ui/passwords/manage_passwords_view_utils.cc

@@ -26,6 +26,7 @@

#include "ui/gfx/image/image_skia_operations.h"

#include "ui/gfx/range/range.h"

#include "url/gurl.h"

+#include "url/origin.h"

namespace {

@@ -59,13 +60,13 @@ std::pair<base::string16, base::string16> GetCredentialLabelsForAccountChooser(

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()));

}

return std::make_pair(upper_string, lower_string);

}