chrome/browser/interstitials/security_interstitial_page.cc - Issue 1260033005: Revert of 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/interstitials/security_interstitial_page.cc

Issue 1260033005: Revert of Move net::FormatUrl and friends outside of //net and into //components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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/geolocation/geolocation_infobar_delegate.cc ('k') | chrome/browser/media/media_stream_capture_indicator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/interstitials/security_interstitial_page.cc

diff --git a/chrome/browser/interstitials/security_interstitial_page.cc b/chrome/browser/interstitials/security_interstitial_page.cc

index b98345638aeffde31d7f7761fd52b3699af0cfc9..082e505bf8905adf7df65c926909de31db28cb84 100644

--- a/chrome/browser/interstitials/security_interstitial_page.cc

+++ b/chrome/browser/interstitials/security_interstitial_page.cc

@@ -18,10 +18,10 @@

#include "chrome/grit/generated_resources.h"

#include "components/google/core/browser/google_util.h"

#include "components/security_interstitials/core/metrics_helper.h"

-#include "components/url_formatter/url_formatter.h"

#include "content/public/browser/interstitial_page.h"

#include "content/public/browser/page_navigator.h"

#include "content/public/browser/web_contents.h"

+#include "net/base/net_util.h"

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

#include "ui/base/resource/resource_bundle.h"

#include "ui/base/webui/jstemplate_builder.h"

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

Profile::FromBrowserContext(web_contents()->GetBrowserContext());

if (profile)

languages = profile->GetPrefs()->GetString(prefs::kAcceptLanguages);

- base::string16 host =

- url_formatter::IDNToUnicode(request_url_.host(), languages);

+ base::string16 host = net::IDNToUnicode(request_url_.host(), languages);

if (base::i18n::IsRTL())

base::i18n::WrapStringWithLTRFormatting(&host);

return host;