diff options
Diffstat (limited to 'chrome/browser/autocomplete/search_provider.cc')
| -rw-r--r-- | chrome/browser/autocomplete/search_provider.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc index fa162d3..2b308a3 100644 --- a/chrome/browser/autocomplete/search_provider.cc +++ b/chrome/browser/autocomplete/search_provider.cc @@ -417,8 +417,8 @@ URLFetcher* SearchProvider::CreateSuggestFetcher(int id, DCHECK(suggestions_url->SupportsReplacement()); URLFetcher* fetcher = URLFetcher::Create(id, GURL(suggestions_url->ReplaceSearchTerms( - provider, WideToUTF16Hack(text), - TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16())), + provider, text, TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, + std::wstring())), URLFetcher::GET, this); fetcher->set_request_context(profile_->GetRequestContext()); fetcher->Start(); @@ -778,8 +778,7 @@ void SearchProvider::AddMatchToMap(const std::wstring& query_string, ++search_start; } if (is_keyword) { - match.fill_into_edit.append(UTF16ToWideHack( - providers_.keyword_provider().keyword() + char16(' '))); + match.fill_into_edit.append(providers_.keyword_provider().keyword() + L" "); match.template_url = &providers_.keyword_provider(); } match.fill_into_edit.append(query_string); @@ -793,9 +792,9 @@ void SearchProvider::AddMatchToMap(const std::wstring& query_string, DCHECK(search_url->SupportsReplacement()); match.destination_url = GURL(search_url->ReplaceSearchTerms(provider, - WideToUTF16Hack(query_string), + query_string, accepted_suggestion, - WideToUTF16Hack(input_text))); + input_text)); // Search results don't look like URLs. match.transition = @@ -873,8 +872,8 @@ void SearchProvider::UpdateFirstSearchMatchDescription() { match.description.assign( UTF16ToWideHack(l10n_util::GetStringFUTF16( IDS_AUTOCOMPLETE_SEARCH_DESCRIPTION, - providers_.default_provider(). - AdjustedShortNameForLocaleDirection()))); + WideToUTF16Hack(providers_.default_provider(). + AdjustedShortNameForLocaleDirection())))); match.description_class.push_back( ACMatchClassification(0, ACMatchClassification::DIM)); // Only the first search match gets a description. |