Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1948)

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: 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
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 911707f93867964a38a930ef9895c4ef4c294c48..ab8d7b35ca45abeaad26f68a1cff7594def75dca 100644
--- a/chrome/browser/ui/passwords/manage_passwords_view_utils.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_view_utils.cc
@@ -27,6 +27,7 @@
#include "ui/gfx/image/image_skia_operations.h"
#include "ui/gfx/range/range.h"
#include "url/gurl.h"
+#include "url/origin.h"
namespace {
@@ -60,13 +61,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);
}

Powered by Google App Engine
This is Rietveld 408576698