Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(69)

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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/net/url_fixer_upper.cc ('k') | chrome/renderer/safe_browsing/phishing_classifier.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « chrome/common/net/url_fixer_upper.cc ('k') | chrome/renderer/safe_browsing/phishing_classifier.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698