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

Unified Diff: chrome/common/content_settings_pattern.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_helper.cc ('k') | chrome/common/content_settings_pattern_parser.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 8feef19d195bc890245ed38f380528a697347b58..dbe70af38c7faab5e978e28f1695299e8659b267 100644
--- a/chrome/common/content_settings_pattern.cc
+++ b/chrome/common/content_settings_pattern.cc
@@ -12,11 +12,11 @@
#include "chrome/common/content_settings_pattern_parser.h"
#include "chrome/common/render_messages.h"
#include "chrome/common/url_constants.h"
-#include "net/base/dns_util.h"
-#include "net/base/net_util.h"
#include "googleurl/src/gurl.h"
#include "googleurl/src/url_canon.h"
#include "ipc/ipc_message_utils.h"
+#include "net/base/dns_util.h"
+#include "net/base/net_util.h"
namespace {
@@ -167,7 +167,7 @@ bool ContentSettingsPattern::Builder::Canonicalize(PatternParts* parts) {
if (parts->scheme == std::string(chrome::kFileScheme) &&
!parts->is_path_wildcard) {
GURL url(std::string(chrome::kFileScheme) +
- std::string(chrome::kStandardSchemeSeparator) + parts->path);
+ std::string(content::kStandardSchemeSeparator) + parts->path);
parts->path = url.path();
}
« no previous file with comments | « chrome/common/content_settings_helper.cc ('k') | chrome/common/content_settings_pattern_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698