diff options
Diffstat (limited to 'chrome/browser/autocomplete')
8 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_input.cc b/chrome/browser/autocomplete/autocomplete_input.cc index a2b637e..56e1efa 100644 --- a/chrome/browser/autocomplete/autocomplete_input.cc +++ b/chrome/browser/autocomplete/autocomplete_input.cc @@ -474,7 +474,7 @@ base::string16 AutocompleteInput::FormattedStringWithEquivalentMeaning( const base::string16& formatted_url) { if (!net::CanStripTrailingSlash(url)) return formatted_url; - const base::string16 url_with_path(formatted_url + char16('/')); + const base::string16 url_with_path(formatted_url + base::char16('/')); return (AutocompleteInput::Parse(formatted_url, base::string16(), NULL, NULL, NULL) == AutocompleteInput::Parse(url_with_path, base::string16(), NULL, NULL, diff --git a/chrome/browser/autocomplete/autocomplete_match.cc b/chrome/browser/autocomplete/autocomplete_match.cc index 768d32f..e0a2ada 100644 --- a/chrome/browser/autocomplete/autocomplete_match.cc +++ b/chrome/browser/autocomplete/autocomplete_match.cc @@ -31,7 +31,7 @@ bool IsTrivialClassification(const ACMatchClassifications& classifications) { // AutocompleteMatch ---------------------------------------------------------- // static -const char16 AutocompleteMatch::kInvalidChars[] = { +const base::char16 AutocompleteMatch::kInvalidChars[] = { '\n', '\r', '\t', 0x2028, // Line separator 0x2029, // Paragraph separator diff --git a/chrome/browser/autocomplete/autocomplete_match.h b/chrome/browser/autocomplete/autocomplete_match.h index ad91c259a..26a9c25 100644 --- a/chrome/browser/autocomplete/autocomplete_match.h +++ b/chrome/browser/autocomplete/autocomplete_match.h @@ -79,7 +79,7 @@ struct AutocompleteMatch { // Null-terminated array of characters that are not valid within |contents| // and |description| strings. - static const char16 kInvalidChars[]; + static const base::char16 kInvalidChars[]; AutocompleteMatch(); AutocompleteMatch(AutocompleteProvider* provider, diff --git a/chrome/browser/autocomplete/autocomplete_provider.cc b/chrome/browser/autocomplete/autocomplete_provider.cc index 488741e..76f5074 100644 --- a/chrome/browser/autocomplete/autocomplete_provider.cc +++ b/chrome/browser/autocomplete/autocomplete_provider.cc @@ -214,7 +214,7 @@ size_t AutocompleteProvider::TrimHttpPrefix(base::string16* url) { if (!AutocompleteInput::HasHTTPScheme(*url)) return 0; size_t scheme_pos = - url->find(base::ASCIIToUTF16(content::kHttpScheme) + char16(':')); + url->find(base::ASCIIToUTF16(content::kHttpScheme) + base::char16(':')); DCHECK_NE(base::string16::npos, scheme_pos); // Erase scheme plus up to two slashes. diff --git a/chrome/browser/autocomplete/extension_app_provider.cc b/chrome/browser/autocomplete/extension_app_provider.cc index 88efea6..d6624fc 100644 --- a/chrome/browser/autocomplete/extension_app_provider.cc +++ b/chrome/browser/autocomplete/extension_app_provider.cc @@ -118,7 +118,7 @@ void ExtensionAppProvider::Start(const AutocompleteInput& input, base::string16::const_iterator name_iter = std::search(name.begin(), name.end(), input.text().begin(), input.text().end(), - base::CaseInsensitiveCompare<char16>()); + base::CaseInsensitiveCompare<base::char16>()); bool matches_name = name_iter != name.end(); size_t name_match_index = matches_name ? static_cast<size_t>(name_iter - name.begin()) : base::string16::npos; @@ -130,7 +130,7 @@ void ExtensionAppProvider::Start(const AutocompleteInput& input, base::string16::const_iterator url_iter = std::search(url.begin(), url.end(), input.text().begin(), input.text().end(), - base::CaseInsensitiveCompare<char16>()); + base::CaseInsensitiveCompare<base::char16>()); matches_url = url_iter != url.end() && input.type() != AutocompleteInput::FORCED_QUERY; url_match_index = matches_url ? diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc index db57dfb..9685201 100644 --- a/chrome/browser/autocomplete/search_provider.cc +++ b/chrome/browser/autocomplete/search_provider.cc @@ -429,7 +429,7 @@ AutocompleteMatch SearchProvider::CreateSearchSuggestion( if (input.type() == AutocompleteInput::FORCED_QUERY) match.fill_into_edit.assign(base::ASCIIToUTF16("?")); if (is_keyword) - match.fill_into_edit.append(match.keyword + char16(' ')); + match.fill_into_edit.append(match.keyword + base::char16(' ')); if (!input.prevent_inline_autocomplete() && StartsWith(query_string, input_text, false)) { match.inline_autocompletion = query_string.substr(input_text.length()); diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc index 9d96424..579f31b 100644 --- a/chrome/browser/autocomplete/search_provider_unittest.cc +++ b/chrome/browser/autocomplete/search_provider_unittest.cc @@ -566,7 +566,7 @@ TEST_F(SearchProviderTest, QueryKeywordProvider) { EXPECT_FALSE(match.keyword.empty()); // The fill into edit should contain the keyword. - EXPECT_EQ(keyword_t_url_->keyword() + char16(' ') + keyword_term_, + EXPECT_EQ(keyword_t_url_->keyword() + base::char16(' ') + keyword_term_, match.fill_into_edit); } diff --git a/chrome/browser/autocomplete/shortcuts_provider.h b/chrome/browser/autocomplete/shortcuts_provider.h index 471d0ff..e93fbd2 100644 --- a/chrome/browser/autocomplete/shortcuts_provider.h +++ b/chrome/browser/autocomplete/shortcuts_provider.h @@ -41,7 +41,7 @@ class ShortcutsProvider friend class ClassifyTest; friend class history::ShortcutsProviderTest; - typedef std::multimap<char16, base::string16> WordMap; + typedef std::multimap<base::char16, base::string16> WordMap; virtual ~ShortcutsProvider(); |