chrome/common/search_urls.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/common/search_urls.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/common/search_urls.cc

diff --git a/chrome/common/search_urls.cc b/chrome/common/search_urls.cc

index 98568429e5d2334348244c46976c1254fdfc6bc8..b1277b62e91fdaf40fdae3d25e8fdc83b99e7f2c 100644

--- a/chrome/common/search_urls.cc

+++ b/chrome/common/search_urls.cc

@@ -14,8 +14,8 @@ bool MatchesOrigin(const GURL& my_url, const GURL& other_url) {

return my_url.host() == other_url.host() &&

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

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

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

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

+ (my_url.SchemeIs(url::kHttpsScheme) &&

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

}

} // namespace