chrome/browser/search/search.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/search.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/search.cc

diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc

index 46ea5d7e4e3ab02515a255dc344330ff31a90a0b..7967311be46d155e232bd5106a7cc2c7a3b58a31 100644

--- a/chrome/browser/search/search.cc

+++ b/chrome/browser/search/search.cc

@@ -532,7 +532,7 @@ GURL GetInstantURL(Profile* profile, int start_margin,

if (!instant_url.SchemeIsSecure() &&

!google_util::StartsWithCommandLineGoogleBaseURL(instant_url)) {

GURL::Replacements replacements;

- const std::string secure_scheme(content::kHttpsScheme);

+ const std::string secure_scheme(url::kHttpsScheme);

replacements.SetSchemeStr(secure_scheme);

instant_url = instant_url.ReplaceComponents(replacements);

}