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

Unified Diff: chrome/common/content_settings_helper.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/browser/net/url_fixer_upper.cc ('k') | chrome/common/content_settings_pattern.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/content_settings_helper.cc
diff --git a/chrome/common/content_settings_helper.cc b/chrome/common/content_settings_helper.cc
index 18997c7ae704bfbf5bc1ea95c1dc30672de6547d..c98ed3fd27c5a035f9be0b4aaa32232e52309286 100644
--- a/chrome/common/content_settings_helper.cc
+++ b/chrome/common/content_settings_helper.cc
@@ -1,11 +1,11 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/common/content_settings_helper.h"
-#include "base/utf_string_conversions.h"
#include "base/string_piece.h"
+#include "base/utf_string_conversions.h"
#include "chrome/common/url_constants.h"
#include "googleurl/src/gurl.h"
@@ -15,7 +15,7 @@ std::string OriginToString(const GURL& origin) {
std::string port_component(origin.IntPort() != url_parse::PORT_UNSPECIFIED ?
":" + origin.port() : "");
std::string scheme_component(!origin.SchemeIs(chrome::kHttpScheme) ?
- origin.scheme() + chrome::kStandardSchemeSeparator : "");
+ origin.scheme() + content::kStandardSchemeSeparator : "");
return scheme_component + origin.host() + port_component;
}
« no previous file with comments | « chrome/browser/net/url_fixer_upper.cc ('k') | chrome/common/content_settings_pattern.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698