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

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

Issue 273193004: Move some content url constants to /url. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add missing files. Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « apps/shell/browser/shell_content_browser_client.cc ('k') | chrome/browser/autocomplete/search_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/autocomplete/autocomplete_input.cc
diff --git a/chrome/browser/autocomplete/autocomplete_input.cc b/chrome/browser/autocomplete/autocomplete_input.cc
index d81e728a7586fb062021d194bd3a84985ec62e64..af34933a61dbd92e5ad91a88dbb5930805887877 100644
--- a/chrome/browser/autocomplete/autocomplete_input.cc
+++ b/chrome/browser/autocomplete/autocomplete_input.cc
@@ -161,7 +161,7 @@ AutocompleteInput::Type AutocompleteInput::Parse(
if (!canonicalized_url->is_valid())
return QUERY;
- if (LowerCaseEqualsASCII(parsed_scheme, content::kFileScheme)) {
+ if (LowerCaseEqualsASCII(parsed_scheme, url::kFileScheme)) {
// A user might or might not type a scheme when entering a file URL. In
// either case, |parsed_scheme| will tell us that this is a file URL, but
// |parts->scheme| might be empty, e.g. if the user typed "C:\foo".
@@ -184,8 +184,8 @@ AutocompleteInput::Type AutocompleteInput::Parse(
// still claim to handle them.
if (ProfileIOData::IsHandledProtocol(base::UTF16ToASCII(parsed_scheme)) ||
LowerCaseEqualsASCII(parsed_scheme, content::kViewSourceScheme) ||
- LowerCaseEqualsASCII(parsed_scheme, content::kJavaScriptScheme) ||
- LowerCaseEqualsASCII(parsed_scheme, content::kDataScheme))
+ LowerCaseEqualsASCII(parsed_scheme, url::kJavaScriptScheme) ||
+ LowerCaseEqualsASCII(parsed_scheme, url::kDataScheme))
return URL;
// Not an internal protocol. Check and see if the user has explicitly
@@ -456,7 +456,7 @@ void AutocompleteInput::ParseForEmphasizeComponents(const base::string16& text,
host->reset();
}
}
- } else if (LowerCaseEqualsASCII(scheme_str, content::kFileSystemScheme) &&
+ } else if (LowerCaseEqualsASCII(scheme_str, url::kFileSystemScheme) &&
parts.inner_parsed() && parts.inner_parsed()->scheme.is_valid()) {
*host = parts.inner_parsed()->host;
}
« no previous file with comments | « apps/shell/browser/shell_content_browser_client.cc ('k') | chrome/browser/autocomplete/search_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698