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

Side by Side 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, 7 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 unified diff | Download patch | Annotate | Revision Log
« 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/common/content_settings_helper.h" 5 #include "chrome/common/content_settings_helper.h"
6 6
7 #include "base/string_piece.h"
7 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
8 #include "base/string_piece.h"
9 #include "chrome/common/url_constants.h" 9 #include "chrome/common/url_constants.h"
10 #include "googleurl/src/gurl.h" 10 #include "googleurl/src/gurl.h"
11 11
12 namespace content_settings_helper { 12 namespace content_settings_helper {
13 13
14 std::string OriginToString(const GURL& origin) { 14 std::string OriginToString(const GURL& origin) {
15 std::string port_component(origin.IntPort() != url_parse::PORT_UNSPECIFIED ? 15 std::string port_component(origin.IntPort() != url_parse::PORT_UNSPECIFIED ?
16 ":" + origin.port() : ""); 16 ":" + origin.port() : "");
17 std::string scheme_component(!origin.SchemeIs(chrome::kHttpScheme) ? 17 std::string scheme_component(!origin.SchemeIs(chrome::kHttpScheme) ?
18 origin.scheme() + chrome::kStandardSchemeSeparator : ""); 18 origin.scheme() + content::kStandardSchemeSeparator : "");
19 return scheme_component + origin.host() + port_component; 19 return scheme_component + origin.host() + port_component;
20 } 20 }
21 21
22 string16 OriginToString16(const GURL& origin) { 22 string16 OriginToString16(const GURL& origin) {
23 return UTF8ToUTF16(OriginToString(origin)); 23 return UTF8ToUTF16(OriginToString(origin));
24 } 24 }
25 25
26 } // namespace content_settings_helper 26 } // namespace content_settings_helper
OLDNEW
« 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