chrome/browser/ui/passwords/manage_passwords_view_utils.cc - Issue 1171333003: Move net::FormatUrl and friends outside of //net and into //components

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 1171333003: Move net::FormatUrl and friends outside of //net and into //components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase again now that CQ is fixed Created 5 years, 4 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/ui/content_settings/content_setting_bubble_model_unittest.cc ('k') | chrome/browser/ui/search_engines/edit_search_engine_controller.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 717959e14ad733ea71bf72575432a245caa89105..11206becb2a45081fcdebcdbffa74a503e2f7820 100644

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

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

@@ -8,7 +8,7 @@

#include "chrome/grit/chromium_strings.h"

#include "chrome/grit/generated_resources.h"

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

-#include "components/secure_display/elide_url.h"

+#include "components/url_formatter/elide_url.h"

#include "net/base/net_util.h"

#include "net/base/registry_controlled_domains/registry_controlled_domain.h"

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

@@ -56,7 +56,7 @@ void GetSavePasswordDialogTitleTextAndLinkRange(

net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES);

if (target_domain_differs) {

title_id = IDS_SAVE_PASSWORD_TITLE;

- replacements.push_back(secure_display::FormatUrlForSecurityDisplay(

+ replacements.push_back(url_formatter::FormatUrlForSecurityDisplay(

form_origin_url, std::string()));

}