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

Unified Diff: chrome/browser/autocomplete/autocomplete_input.cc

Issue 23658056: content: Move kHttpScheme constant into content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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
Index: chrome/browser/autocomplete/autocomplete_input.cc
diff --git a/chrome/browser/autocomplete/autocomplete_input.cc b/chrome/browser/autocomplete/autocomplete_input.cc
index c1fdf540f3fb8dbedc7da51b0a121fd0aa564b69..0ddfa5c457f660b4d203476b0a399ecc5acbc4fe 100644
--- a/chrome/browser/autocomplete/autocomplete_input.cc
+++ b/chrome/browser/autocomplete/autocomplete_input.cc
@@ -172,7 +172,7 @@ AutocompleteInput::Type AutocompleteInput::Parse(
// (e.g. "ftp" or "view-source") but I'll wait to spend the effort on that
// until I run into some cases that really need it.
if (parts->scheme.is_nonempty() &&
- !LowerCaseEqualsASCII(parsed_scheme, chrome::kHttpScheme) &&
+ !LowerCaseEqualsASCII(parsed_scheme, content::kHttpScheme) &&
!LowerCaseEqualsASCII(parsed_scheme, content::kHttpsScheme)) {
// See if we know how to handle the URL internally.
if (ProfileIOData::IsHandledProtocol(UTF16ToASCII(parsed_scheme)))
@@ -208,7 +208,7 @@ AutocompleteInput::Type AutocompleteInput::Parse(
// We don't know about this scheme. It might be that the user typed a
// URL of the form "username:password@foo.com".
const string16 http_scheme_prefix =
- ASCIIToUTF16(std::string(chrome::kHttpScheme) +
+ ASCIIToUTF16(std::string(content::kHttpScheme) +
content::kStandardSchemeSeparator);
url_parse::Parsed http_parts;
string16 http_scheme;
@@ -216,7 +216,7 @@ AutocompleteInput::Type AutocompleteInput::Parse(
Type http_type = Parse(http_scheme_prefix + text, desired_tld,
&http_parts, &http_scheme,
&http_canonicalized_url);
- DCHECK_EQ(std::string(chrome::kHttpScheme), UTF16ToUTF8(http_scheme));
+ DCHECK_EQ(std::string(content::kHttpScheme), UTF16ToUTF8(http_scheme));
if (http_type == URL &&
http_parts.username.is_nonempty() &&

Powered by Google App Engine
This is Rietveld 408576698