chrome/browser/download/download_query.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/download/download_query.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

Index: chrome/browser/download/download_query.cc

diff --git a/chrome/browser/download/download_query.cc b/chrome/browser/download/download_query.cc

index f8008889ce1dbc4e8caab4fa069fbd862bd638c1..456f4cc0a0c68fa5fe7306cd1f8dfa0cc9c3625e 100644

--- a/chrome/browser/download/download_query.cc

+++ b/chrome/browser/download/download_query.cc

@@ -25,9 +25,9 @@

#include "base/values.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/common/pref_names.h"

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

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

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

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

#include "third_party/re2/re2/re2.h"

#include "url/gurl.h"

@@ -77,7 +77,7 @@

base::string16 url_formatted = url_raw;

if (item.GetBrowserContext()) {

Profile* profile = Profile::FromBrowserContext(item.GetBrowserContext());

- url_formatted = url_formatter::FormatUrl(

+ url_formatted = net::FormatUrl(

item.GetOriginalUrl(),

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

}

« no previous file with comments | « chrome/browser/dom_distiller/tab_utils_android.cc ('k') | chrome/browser/extensions/api/sessions/sessions_api.cc » ('j') | no next file with comments »