chrome/browser/search_engines/template_url.cc - Issue 254763005: Move some content url constants to /url.

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/search_engines/template_url.cc

Issue 254763005: Move some content url constants to /url. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Resolve a merge conflict. Created 6 years, 7 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:

Index: chrome/browser/search_engines/template_url.cc

diff --git a/chrome/browser/search_engines/template_url.cc b/chrome/browser/search_engines/template_url.cc

index 501b7989e44816bed5d46828a94a22b1aefe07e6..874b4bbaa33bed834f6211b2bcf0b8aac9fc5ff7 100644

--- a/chrome/browser/search_engines/template_url.cc

+++ b/chrome/browser/search_engines/template_url.cc

@@ -835,7 +835,7 @@ std::string TemplateURLRef::HandleReplacements(

search_terms_args_without_aqs.assisted_query_stats.clear();

GURL base_url(ReplaceSearchTermsUsingTermsData(

search_terms_args_without_aqs, search_terms_data, NULL));

- if (base_url.SchemeIs(content::kHttpsScheme)) {

+ if (base_url.SchemeIs(url::kHttpsScheme)) {

HandleReplacement(

"aqs", search_terms_args.assisted_query_stats, *i, &url);

}