chrome/browser/search/search.cc - Issue 23658056: content: Move kHttpScheme constant into content namespace.

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 23658056: content: Move kHttpScheme constant into content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 3 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 cdda21a59948d2295330ead84cd7b5f553d1dfca..0ec40461ea530655922f4799b8b223a02ee3f288 100644

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

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

@@ -128,7 +128,7 @@ bool MatchesOrigin(const GURL& my_url, const GURL& other_url) {

my_url.port() == other_url.port() &&

(my_url.scheme() == other_url.scheme() ||

(my_url.SchemeIs(content::kHttpsScheme) &&

- other_url.SchemeIs(chrome::kHttpScheme)));

+ other_url.SchemeIs(content::kHttpScheme)));

}

bool MatchesAnySearchURL(const GURL& url, TemplateURL* template_url) {