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

Unified Diff: chrome/browser/search_engines/template_url_parser.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/search/search.cc ('k') | chrome/browser/search_engines/template_url_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 9fa4c4a431b02346a85eb42a11cd2a811595238d..69532d2686cc4916fec297d25de7d8597587313e 100644
--- a/chrome/browser/search_engines/template_url_parser.cc
+++ b/chrome/browser/search_engines/template_url_parser.cc
@@ -100,7 +100,7 @@ bool IsHTTPRef(const std::string& url) {
if (url.empty())
return true;
GURL gurl(url);
- return gurl.is_valid() && (gurl.SchemeIs(chrome::kHttpScheme) ||
+ return gurl.is_valid() && (gurl.SchemeIs(content::kHttpScheme) ||
gurl.SchemeIs(content::kHttpsScheme));
}
@@ -258,7 +258,7 @@ 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(chrome::kHttpScheme) ||
+ (image_url.SchemeIs(content::kHttpScheme) ||
image_url.SchemeIs(content::kHttpsScheme))) {
context->data_.favicon_url = image_url;
}
« no previous file with comments | « chrome/browser/search/search.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