diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-30 22:13:48 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-30 22:13:48 +0000 |
| commit | dbdda5408e79f9b0a0936743f9c48ee258c08bf5 (patch) | |
| tree | 2ca96e9381018da170c7deb118193eda874046c3 /chrome/browser/autocomplete | |
| parent | a014a131a2d903d21a311635c1ec40124d739815 (diff) | |
| download | chromium_src-dbdda5408e79f9b0a0936743f9c48ee258c08bf5.zip chromium_src-dbdda5408e79f9b0a0936743f9c48ee258c08bf5.tar.gz chromium_src-dbdda5408e79f9b0a0936743f9c48ee258c08bf5.tar.bz2 | |
content: Move kViewSourceScheme constant into content namespace.
BUG=None
R=thestig@chromium.org,grt@chromium.org,joi@chromium.org,eroman@chromium.org
Review URL: https://chromiumcodereview.appspot.com/15950011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203241 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_input.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_provider.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_input.cc b/chrome/browser/autocomplete/autocomplete_input.cc index 06ac18a..304f058 100644 --- a/chrome/browser/autocomplete/autocomplete_input.cc +++ b/chrome/browser/autocomplete/autocomplete_input.cc @@ -178,7 +178,7 @@ AutocompleteInput::Type AutocompleteInput::Parse( // reach the renderer or else the renderer handles internally without // reaching the net::URLRequest logic. We thus won't catch these above, but // we should still claim to handle them. - if (LowerCaseEqualsASCII(parsed_scheme, chrome::kViewSourceScheme) || + if (LowerCaseEqualsASCII(parsed_scheme, content::kViewSourceScheme) || LowerCaseEqualsASCII(parsed_scheme, chrome::kJavaScriptScheme) || LowerCaseEqualsASCII(parsed_scheme, chrome::kDataScheme)) return URL; @@ -431,7 +431,7 @@ void AutocompleteInput::ParseForEmphasizeComponents( int after_scheme_and_colon = parts.scheme.end() + 1; // For the view-source scheme, we should emphasize the scheme and host of the // URL qualified by the view-source prefix. - if (LowerCaseEqualsASCII(scheme_str, chrome::kViewSourceScheme) && + if (LowerCaseEqualsASCII(scheme_str, content::kViewSourceScheme) && (static_cast<int>(text.length()) > after_scheme_and_colon)) { // Obtain the URL prefixed by view-source and parse it. string16 real_url(text.substr(after_scheme_and_colon)); diff --git a/chrome/browser/autocomplete/autocomplete_provider.cc b/chrome/browser/autocomplete/autocomplete_provider.cc index 98904cb0..cbd1d60 100644 --- a/chrome/browser/autocomplete/autocomplete_provider.cc +++ b/chrome/browser/autocomplete/autocomplete_provider.cc @@ -130,7 +130,7 @@ AutocompleteProvider::~AutocompleteProvider() { bool AutocompleteProvider::HasHTTPScheme(const string16& input) { std::string utf8_input(UTF16ToUTF8(input)); url_parse::Component scheme; - if (url_util::FindAndCompareScheme(utf8_input, chrome::kViewSourceScheme, + if (url_util::FindAndCompareScheme(utf8_input, content::kViewSourceScheme, &scheme)) utf8_input.erase(0, scheme.end() + 1); return url_util::FindAndCompareScheme(utf8_input, chrome::kHttpScheme, NULL); |