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

Unified Diff: chrome/common/content_settings_pattern.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/common/content_settings_helper.cc ('k') | chrome/common/net/url_fixer_upper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/content_settings_pattern.cc
diff --git a/chrome/common/content_settings_pattern.cc b/chrome/common/content_settings_pattern.cc
index d5e971ca0a1ef6cccb37e4910bd69811acd3c392..34272b08f8bcb58aabdf48a8dbd8c46ddedbcf4f 100644
--- a/chrome/common/content_settings_pattern.cc
+++ b/chrome/common/content_settings_pattern.cc
@@ -22,7 +22,7 @@
namespace {
std::string GetDefaultPort(const std::string& scheme) {
- if (scheme == chrome::kHttpScheme)
+ if (scheme == content::kHttpScheme)
return "80";
if (scheme == content::kHttpsScheme)
return "443";
@@ -243,7 +243,7 @@ bool ContentSettingsPattern::Builder::Validate(const PatternParts& parts) {
// Test if the scheme is supported or a wildcard.
if (!parts.is_scheme_wildcard &&
- parts.scheme != std::string(chrome::kHttpScheme) &&
+ parts.scheme != std::string(content::kHttpScheme) &&
parts.scheme != std::string(content::kHttpsScheme)) {
return false;
}
@@ -278,7 +278,7 @@ bool ContentSettingsPattern::Builder::LegacyValidate(
// Test if the scheme is supported or a wildcard.
if (!parts.is_scheme_wildcard &&
- parts.scheme != std::string(chrome::kHttpScheme) &&
+ parts.scheme != std::string(content::kHttpScheme) &&
parts.scheme != std::string(content::kHttpsScheme)) {
return false;
}
@@ -339,7 +339,7 @@ ContentSettingsPattern ContentSettingsPattern::FromURL(
// also have a "http" scheme.
if (local_url->HostIsIPAddress()) {
builder->WithScheme(local_url->scheme())->WithHost(local_url->host());
- } else if (local_url->SchemeIs(chrome::kHttpScheme)) {
+ } else if (local_url->SchemeIs(content::kHttpScheme)) {
builder->WithSchemeWildcard()->WithDomainWildcard()->WithHost(
local_url->host());
} else if (local_url->SchemeIs(content::kHttpsScheme)) {
« no previous file with comments | « chrome/common/content_settings_helper.cc ('k') | chrome/common/net/url_fixer_upper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698