chrome/browser/ssl/captive_portal_blocking_page.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/ssl/captive_portal_blocking_page.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/profiles/profile_io_data.cc ('k') | chrome/browser/supervised_user/supervised_user_bookmarks_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ssl/captive_portal_blocking_page.cc

diff --git a/chrome/browser/ssl/captive_portal_blocking_page.cc b/chrome/browser/ssl/captive_portal_blocking_page.cc

index 955fea0ee65b0ed4aeb7677b042a93e767cb6d16..9287fe4efb52f7d0c71e8f08db9e33c1ea438536 100644

--- a/chrome/browser/ssl/captive_portal_blocking_page.cc

+++ b/chrome/browser/ssl/captive_portal_blocking_page.cc

@@ -17,6 +17,7 @@

#include "chrome/browser/ssl/ssl_cert_reporter.h"

#include "chrome/common/pref_names.h"

#include "components/captive_portal/captive_portal_detector.h"

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

#include "components/wifi/wifi_service.h"

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

#include "grit/generated_resources.h"

@@ -169,7 +170,8 @@ void CaptivePortalBlockingPage::PopulateInterstitialStrings(

web_contents()->GetBrowserContext());

if (profile)

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

- base::string16 login_host = net::IDNToUnicode(login_url_.host(), languages);

+ base::string16 login_host =

+ url_formatter::IDNToUnicode(login_url_.host(), languages);

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

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

« no previous file with comments | « chrome/browser/profiles/profile_io_data.cc ('k') | chrome/browser/supervised_user/supervised_user_bookmarks_handler.cc » ('j') | no next file with comments »