chrome/browser/ui/webui/history_ui.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/ui/webui/history_ui.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/ui/views/website_settings/permissions_bubble_view.cc ('k') | chrome/browser/ui/webui/net_internals/net_internals_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/history_ui.cc

diff --git a/chrome/browser/ui/webui/history_ui.cc b/chrome/browser/ui/webui/history_ui.cc

index 69de94b8b0583f48f1cd69f08b9ad01cb3c6ef91..0fd41b3b01904e68692d0c85932122c6d24fe09e 100644

--- a/chrome/browser/ui/webui/history_ui.cc

+++ b/chrome/browser/ui/webui/history_ui.cc

@@ -46,13 +46,13 @@

#include "components/search/search.h"

#include "components/signin/core/browser/signin_manager.h"

#include "components/sync_driver/device_info.h"

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

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

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

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

#include "grit/browser_resources.h"

#include "grit/theme_resources.h"

#include "net/base/escape.h"

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

#include "sync/protocol/history_delete_directive_specifics.pb.h"

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

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

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

scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue());

SetUrlAndTitle(result.get());

- base::string16 domain =

- url_formatter::IDNToUnicode(url.host(), accept_languages);

+ base::string16 domain = net::IDNToUnicode(url.host(), accept_languages);

// When the domain is empty, use the scheme instead. This allows for a

// sensible treatment of e.g. file: URLs when group by domain is on.

if (domain.empty())