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

Unified Diff: chrome/common/content_settings_pattern_parser.cc

Issue 10261003: content: Move kStandardSchemeSeparator into content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 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_pattern.cc ('k') | chrome/common/extensions/extension.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/content_settings_pattern_parser.cc
diff --git a/chrome/common/content_settings_pattern_parser.cc b/chrome/common/content_settings_pattern_parser.cc
index e98b4d50d1de78448ab1acd905dd5bf3b013c6d3..1498586ce9021631a7f78d3920c59d505f4ae783 100644
--- a/chrome/common/content_settings_pattern_parser.cc
+++ b/chrome/common/content_settings_pattern_parser.cc
@@ -6,9 +6,9 @@
#include "base/string_util.h"
#include "chrome/common/url_constants.h"
-#include "net/base/net_util.h"
#include "googleurl/src/gurl.h"
#include "googleurl/src/url_canon.h"
+#include "net/base/net_util.h"
namespace {
@@ -69,10 +69,10 @@ void PatternParser::Parse(const std::string& pattern_spec,
// Test if a scheme pattern is in the spec.
current_pos = pattern_spec.find(
- std::string(chrome::kStandardSchemeSeparator), start);
+ std::string(content::kStandardSchemeSeparator), start);
if (current_pos != std::string::npos) {
scheme_component = Component(start, current_pos);
- start = current_pos + strlen(chrome::kStandardSchemeSeparator);
+ start = current_pos + strlen(content::kStandardSchemeSeparator);
current_pos = start;
} else {
current_pos = start;
@@ -199,7 +199,7 @@ std::string PatternParser::ToString(
std::string str = "";
if (!parts.is_scheme_wildcard)
- str += parts.scheme + chrome::kStandardSchemeSeparator;
+ str += parts.scheme + content::kStandardSchemeSeparator;
if (parts.scheme == chrome::kFileScheme) {
if (parts.is_path_wildcard)
« no previous file with comments | « chrome/common/content_settings_pattern.cc ('k') | chrome/common/extensions/extension.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698