summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/autocomplete/autocomplete.cc2
-rw-r--r--chrome/browser/autocomplete/autocomplete_edit.cc2
-rw-r--r--chrome/browser/autocomplete/builtin_provider.cc4
-rw-r--r--chrome/browser/autocomplete/builtin_provider_unittest.cc6
-rw-r--r--chrome/browser/browser_about_handler_unittest.cc4
-rw-r--r--chrome/browser/cookies_tree_model.cc4
-rw-r--r--chrome/browser/extensions/extension_browsertests_misc.cc2
-rw-r--r--chrome/browser/extensions/extension_cookies_helpers.cc2
-rw-r--r--chrome/browser/history/url_database.cc2
-rw-r--r--chrome/browser/net/url_fixer_upper.cc6
-rw-r--r--chrome/common/content_settings_helper.cc6
-rw-r--r--chrome/common/content_settings_pattern.cc6
-rw-r--r--chrome/common/content_settings_pattern_parser.cc8
-rw-r--r--chrome/common/extensions/extension.cc4
-rw-r--r--chrome/common/extensions/url_pattern.cc8
-rw-r--r--content/public/common/url_constants.cc4
-rw-r--r--content/public/common/url_constants.h6
17 files changed, 38 insertions, 38 deletions
diff --git a/chrome/browser/autocomplete/autocomplete.cc b/chrome/browser/autocomplete/autocomplete.cc
index 6e7c725c..9efc108 100644
--- a/chrome/browser/autocomplete/autocomplete.cc
+++ b/chrome/browser/autocomplete/autocomplete.cc
@@ -220,7 +220,7 @@ AutocompleteInput::Type AutocompleteInput::Parse(
// URL of the form "username:password@foo.com".
const string16 http_scheme_prefix =
ASCIIToUTF16(std::string(chrome::kHttpScheme) +
- chrome::kStandardSchemeSeparator);
+ content::kStandardSchemeSeparator);
url_parse::Parsed http_parts;
string16 http_scheme;
GURL http_canonicalized_url;
diff --git a/chrome/browser/autocomplete/autocomplete_edit.cc b/chrome/browser/autocomplete/autocomplete_edit.cc
index e5524be..b8f9c7f 100644
--- a/chrome/browser/autocomplete/autocomplete_edit.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit.cc
@@ -390,7 +390,7 @@ void AutocompleteEditModel::AdjustTextForCopy(int sel_min,
url->SchemeIs(chrome::kHttpScheme) && perm_url.host() == url->host()) {
*write_url = true;
string16 http = ASCIIToUTF16(chrome::kHttpScheme) +
- ASCIIToUTF16(chrome::kStandardSchemeSeparator);
+ ASCIIToUTF16(content::kStandardSchemeSeparator);
if (text->compare(0, http.length(), http) != 0)
*text = http + *text;
}
diff --git a/chrome/browser/autocomplete/builtin_provider.cc b/chrome/browser/autocomplete/builtin_provider.cc
index a80ee2d..f5e51d9 100644
--- a/chrome/browser/autocomplete/builtin_provider.cc
+++ b/chrome/browser/autocomplete/builtin_provider.cc
@@ -56,9 +56,9 @@ void BuiltinProvider::Start(const AutocompleteInput& input,
return;
const string16 kAbout = ASCIIToUTF16(chrome::kAboutScheme) +
- ASCIIToUTF16(chrome::kStandardSchemeSeparator);
+ ASCIIToUTF16(content::kStandardSchemeSeparator);
const string16 kChrome = ASCIIToUTF16(chrome::kChromeUIScheme) +
- ASCIIToUTF16(chrome::kStandardSchemeSeparator);
+ ASCIIToUTF16(content::kStandardSchemeSeparator);
const int kUrl = ACMatchClassification::URL;
const int kMatch = kUrl | ACMatchClassification::MATCH;
diff --git a/chrome/browser/autocomplete/builtin_provider_unittest.cc b/chrome/browser/autocomplete/builtin_provider_unittest.cc
index 38261fb..08efce7f 100644
--- a/chrome/browser/autocomplete/builtin_provider_unittest.cc
+++ b/chrome/browser/autocomplete/builtin_provider_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 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.
@@ -70,7 +70,7 @@ TEST_F(BuiltinProviderTest, TypingScheme) {
const string16 kChrome = ASCIIToUTF16(chrome::kChromeUIScheme);
const string16 kSeparator1 = ASCIIToUTF16(":");
const string16 kSeparator2 = ASCIIToUTF16(":/");
- const string16 kSeparator3 = ASCIIToUTF16(chrome::kStandardSchemeSeparator);
+ const string16 kSeparator3 = ASCIIToUTF16(content::kStandardSchemeSeparator);
// These default URLs should correspond with those in BuiltinProvider::Start.
const GURL kURL1 = GURL(chrome::kChromeUIChromeURLsURL);
@@ -136,7 +136,7 @@ TEST_F(BuiltinProviderTest, ChromeURLs) {
const string16 kChrome = ASCIIToUTF16(chrome::kChromeUIScheme);
const string16 kSeparator1 = ASCIIToUTF16(":");
const string16 kSeparator2 = ASCIIToUTF16(":/");
- const string16 kSeparator3 = ASCIIToUTF16(chrome::kStandardSchemeSeparator);
+ const string16 kSeparator3 = ASCIIToUTF16(content::kStandardSchemeSeparator);
// This makes assumptions about the chrome URLs listed by the BuiltinProvider.
// Currently they are derived from ChromePaths() in browser_about_handler.cc.
diff --git a/chrome/browser/browser_about_handler_unittest.cc b/chrome/browser/browser_about_handler_unittest.cc
index 9516714..4f7a6e7 100644
--- a/chrome/browser/browser_about_handler_unittest.cc
+++ b/chrome/browser/browser_about_handler_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 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.
@@ -18,7 +18,7 @@ typedef testing::Test BrowserAboutHandlerTest;
TEST_F(BrowserAboutHandlerTest, WillHandleBrowserAboutURL) {
std::string chrome_prefix(chrome::kChromeUIScheme);
- chrome_prefix.append(chrome::kStandardSchemeSeparator);
+ chrome_prefix.append(content::kStandardSchemeSeparator);
struct AboutURLTestData {
GURL test_url;
GURL result_url;
diff --git a/chrome/browser/cookies_tree_model.cc b/chrome/browser/cookies_tree_model.cc
index c410ec8..f01aeb1 100644
--- a/chrome/browser/cookies_tree_model.cc
+++ b/chrome/browser/cookies_tree_model.cc
@@ -879,7 +879,7 @@ void CookiesTreeModel::PopulateCookieInfoWithFilter(
// We treat secure cookies just the same as normal ones.
source_string = std::string(chrome::kHttpScheme) +
- chrome::kStandardSchemeSeparator + domain + "/";
+ content::kStandardSchemeSeparator + domain + "/";
}
GURL source(source_string);
@@ -1109,7 +1109,7 @@ void CookiesTreeModel::PopulateServerBoundCertInfoWithFilter(
// Domain Bound Cert. Make a valid URL to satisfy the
// CookieTreeRootNode::GetOrCreateOriginNode interface.
origin = GURL(std::string(chrome::kHttpsScheme) +
- chrome::kStandardSchemeSeparator +
+ content::kStandardSchemeSeparator +
cert_info->server_identifier() + "/");
}
std::wstring title = CookieTreeOriginNode::TitleForUrl(origin);
diff --git a/chrome/browser/extensions/extension_browsertests_misc.cc b/chrome/browser/extensions/extension_browsertests_misc.cc
index cf98af4..1c49de0 100644
--- a/chrome/browser/extensions/extension_browsertests_misc.cc
+++ b/chrome/browser/extensions/extension_browsertests_misc.cc
@@ -356,7 +356,7 @@ GURL GetFeedUrl(net::TestServer* server, const std::string& feed_page,
// We navigate directly to the subscribe page for feeds where the feed
// sniffing won't work, in other words, as is the case for malformed feeds.
return GURL(std::string(chrome::kExtensionScheme) +
- chrome::kStandardSchemeSeparator +
+ content::kStandardSchemeSeparator +
extension_id + std::string(kSubscribePage) + std::string("?") +
feed_url.spec() + std::string("&synchronous"));
} else {
diff --git a/chrome/browser/extensions/extension_cookies_helpers.cc b/chrome/browser/extensions/extension_cookies_helpers.cc
index 203dc73..78e692b 100644
--- a/chrome/browser/extensions/extension_cookies_helpers.cc
+++ b/chrome/browser/extensions/extension_cookies_helpers.cc
@@ -108,7 +108,7 @@ GURL GetURLFromCanonicalCookie(
cookie.IsSecure() ? chrome::kHttpsScheme : chrome::kHttpScheme;
const std::string host =
domain_key.find('.') != 0 ? domain_key : domain_key.substr(1);
- return GURL(scheme + chrome::kStandardSchemeSeparator + host + "/");
+ return GURL(scheme + content::kStandardSchemeSeparator + host + "/");
}
void AppendMatchingCookiesToList(
diff --git a/chrome/browser/history/url_database.cc b/chrome/browser/history/url_database.cc
index 4436a4e..5387bc1 100644
--- a/chrome/browser/history/url_database.cc
+++ b/chrome/browser/history/url_database.cc
@@ -318,7 +318,7 @@ bool URLDatabase::IsTypedHost(const std::string& host) {
URLRows dummy;
for (size_t i = 0; i < arraysize(schemes); ++i) {
std::string scheme_and_host(schemes[i]);
- scheme_and_host += chrome::kStandardSchemeSeparator + host;
+ scheme_and_host += content::kStandardSchemeSeparator + host;
if (AutocompleteForPrefix(scheme_and_host + '/', 1, true, &dummy) ||
AutocompleteForPrefix(scheme_and_host + ':', 1, true, &dummy))
return true;
diff --git a/chrome/browser/net/url_fixer_upper.cc b/chrome/browser/net/url_fixer_upper.cc
index 4a4a883..8f64782 100644
--- a/chrome/browser/net/url_fixer_upper.cc
+++ b/chrome/browser/net/url_fixer_upper.cc
@@ -434,7 +434,7 @@ std::string URLFixerUpper::SegmentURL(const std::string& text,
// Construct the text to parse by inserting the scheme.
std::string inserted_text(scheme);
- inserted_text.append(chrome::kStandardSchemeSeparator);
+ inserted_text.append(content::kStandardSchemeSeparator);
std::string text_to_parse(text.begin(), first_nonwhite);
text_to_parse.append(inserted_text);
text_to_parse.append(first_nonwhite, text.end());
@@ -501,7 +501,7 @@ GURL URLFixerUpper::FixupURL(const std::string& text,
url_parse::Component(0, static_cast<int>(scheme.length())))) {
// Replace the about: scheme with the chrome: scheme.
std::string url(chrome_url ? chrome::kChromeUIScheme : scheme);
- url.append(chrome::kStandardSchemeSeparator);
+ url.append(content::kStandardSchemeSeparator);
// We need to check whether the |username| is valid because it is our
// responsibility to append the '@' to delineate the user information from
@@ -526,7 +526,7 @@ GURL URLFixerUpper::FixupURL(const std::string& text,
// In the worst-case, we insert a scheme if the URL lacks one.
if (!parts.scheme.is_valid()) {
std::string fixed_scheme(scheme);
- fixed_scheme.append(chrome::kStandardSchemeSeparator);
+ fixed_scheme.append(content::kStandardSchemeSeparator);
trimmed.insert(0, fixed_scheme);
}
diff --git a/chrome/common/content_settings_helper.cc b/chrome/common/content_settings_helper.cc
index 18997c7..c98ed3f 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;
}
diff --git a/chrome/common/content_settings_pattern.cc b/chrome/common/content_settings_pattern.cc
index 8feef19..dbe70af 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();
}
diff --git a/chrome/common/content_settings_pattern_parser.cc b/chrome/common/content_settings_pattern_parser.cc
index e98b4d5..1498586 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)
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index a3ffc5a..01dd1acb 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -27,8 +27,8 @@
#include "chrome/common/chrome_version_info.h"
#include "chrome/common/extensions/csp_validator.h"
#include "chrome/common/extensions/extension_action.h"
-#include "chrome/common/extensions/extension_manifest_constants.h"
#include "chrome/common/extensions/extension_error_utils.h"
+#include "chrome/common/extensions/extension_manifest_constants.h"
#include "chrome/common/extensions/extension_resource.h"
#include "chrome/common/extensions/feature.h"
#include "chrome/common/extensions/file_browser_handler.h"
@@ -3028,7 +3028,7 @@ const SkBitmap& Extension::GetDefaultIcon(bool is_app) {
// static
GURL Extension::GetBaseURLFromExtensionId(const std::string& extension_id) {
return GURL(std::string(chrome::kExtensionScheme) +
- chrome::kStandardSchemeSeparator + extension_id + "/");
+ content::kStandardSchemeSeparator + extension_id + "/");
}
bool Extension::InitFromValue(int flags, string16* error) {
diff --git a/chrome/common/extensions/url_pattern.cc b/chrome/common/extensions/url_pattern.cc
index c0b04b7..94bb877 100644
--- a/chrome/common/extensions/url_pattern.cc
+++ b/chrome/common/extensions/url_pattern.cc
@@ -144,7 +144,7 @@ URLPattern::ParseResult URLPattern::Parse(const std::string& pattern) {
}
// Parse out the scheme.
- size_t scheme_end_pos = pattern.find(chrome::kStandardSchemeSeparator);
+ size_t scheme_end_pos = pattern.find(content::kStandardSchemeSeparator);
bool has_standard_scheme_separator = true;
// Some urls also use ':' alone as the scheme separator.
@@ -165,7 +165,7 @@ URLPattern::ParseResult URLPattern::Parse(const std::string& pattern) {
// Advance past the scheme separator.
scheme_end_pos +=
- (standard_scheme ? strlen(chrome::kStandardSchemeSeparator) : 1);
+ (standard_scheme ? strlen(content::kStandardSchemeSeparator) : 1);
if (scheme_end_pos >= pattern.size())
return PARSE_ERROR_EMPTY_HOST;
@@ -340,7 +340,7 @@ bool URLPattern::MatchesScheme(const std::string& test) const {
bool URLPattern::MatchesHost(const std::string& host) const {
std::string test(chrome::kHttpScheme);
- test += chrome::kStandardSchemeSeparator;
+ test += content::kStandardSchemeSeparator;
test += host;
test += "/";
return MatchesHost(GURL(test));
@@ -404,7 +404,7 @@ const std::string& URLPattern::GetAsString() const {
bool standard_scheme = IsStandardScheme(scheme_);
std::string spec = scheme_ +
- (standard_scheme ? chrome::kStandardSchemeSeparator : ":");
+ (standard_scheme ? content::kStandardSchemeSeparator : ":");
if (scheme_ != chrome::kFileScheme && standard_scheme) {
if (match_subdomains_) {
diff --git a/content/public/common/url_constants.cc b/content/public/common/url_constants.cc
index 84faeae..4ac3da6 100644
--- a/content/public/common/url_constants.cc
+++ b/content/public/common/url_constants.cc
@@ -52,8 +52,6 @@ const char kMetadataScheme[] = "metadata";
const char kSwappedOutScheme[] = "swappedout";
const char kViewSourceScheme[] = "view-source";
-const char kStandardSchemeSeparator[] = "://";
-
const char kAboutBlankURL[] = "about:blank";
const char kChromeUIAppCacheInternalsHost[] = "appcache-internals";
const char kChromeUIBlobInternalsHost[] = "blob-internals";
@@ -73,6 +71,8 @@ const char kChromeUIShorthangURL[] = "chrome://shorthang";
namespace content {
+const char kStandardSchemeSeparator[] = "://";
+
// This error URL is loaded in normal web renderer processes, so it should not
// have a chrome:// scheme that might let it be confused with a WebUI page.
const char kUnreachableWebDataURL[] = "data:text/html,chromewebdata";
diff --git a/content/public/common/url_constants.h b/content/public/common/url_constants.h
index e67e192..a6e7567 100644
--- a/content/public/common/url_constants.h
+++ b/content/public/common/url_constants.h
@@ -34,9 +34,6 @@ CONTENT_EXPORT extern const char kMetadataScheme[];
CONTENT_EXPORT extern const char kSwappedOutScheme[];
CONTENT_EXPORT extern const char kViewSourceScheme[];
-// Used to separate a standard scheme and the hostname: "://".
-CONTENT_EXPORT extern const char kStandardSchemeSeparator[];
-
// Hosts for about URLs.
CONTENT_EXPORT extern const char kAboutBlankURL[];
CONTENT_EXPORT extern const char kChromeUIAppCacheInternalsHost[];
@@ -59,6 +56,9 @@ CONTENT_EXPORT extern const char kChromeUIShorthangURL[];
namespace content {
+// Used to separate a standard scheme and the hostname: "://".
+CONTENT_EXPORT extern const char kStandardSchemeSeparator[];
+
// Special URL used to start a navigation to an error page.
extern const char kUnreachableWebDataURL[];
generated by cgit v1.1 at 2025-02-07 05:14:50 +0000