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

Unified Diff: chrome/browser/search_engines/template_url_parser.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
Index: chrome/browser/search_engines/template_url_parser.cc
diff --git a/chrome/browser/search_engines/template_url_parser.cc b/chrome/browser/search_engines/template_url_parser.cc
index 083aeec0558c6caca06b0a4683907f54b5f8ff07..5669a2cbe6b8fea5a98a68c2372d1585a8cf6c0f 100644
--- a/chrome/browser/search_engines/template_url_parser.cc
+++ b/chrome/browser/search_engines/template_url_parser.cc
@@ -94,8 +94,8 @@ bool IsHTTPRef(const std::string& url) {
if (url.empty())
return true;
GURL gurl(url);
- return gurl.is_valid() && (gurl.SchemeIs(content::kHttpScheme) ||
- gurl.SchemeIs(content::kHttpsScheme));
+ return gurl.is_valid() && (gurl.SchemeIs(url::kHttpScheme) ||
+ gurl.SchemeIs(url::kHttpsScheme));
}
} // namespace
@@ -252,8 +252,8 @@ void TemplateURLParsingContext::EndElementImpl(void* ctx, const xmlChar* name) {
// favicon from the URL.
context->derive_image_from_url_ = true;
} else if (context->image_is_valid_for_favicon_ && image_url.is_valid() &&
- (image_url.SchemeIs(content::kHttpScheme) ||
- image_url.SchemeIs(content::kHttpsScheme))) {
+ (image_url.SchemeIs(url::kHttpScheme) ||
+ image_url.SchemeIs(url::kHttpsScheme))) {
context->data_.favicon_url = image_url;
}
context->image_is_valid_for_favicon_ = false;
« no previous file with comments | « chrome/browser/search_engines/template_url.cc ('k') | chrome/browser/search_engines/template_url_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698