diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-10 23:52:43 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-10 23:52:43 +0000 |
| commit | e7a5b787751ed3c1c31f66ae919f11911393b974 (patch) | |
| tree | 7627eb287c3e079a240f6cc8f98cf94c36a568b4 /chrome/browser/autocomplete/search_provider.cc | |
| parent | 01b9961c2ee639c10b07624d40a73702a9f3d0ec (diff) | |
| download | chromium_src-e7a5b787751ed3c1c31f66ae919f11911393b974.zip chromium_src-e7a5b787751ed3c1c31f66ae919f11911393b974.tar.gz chromium_src-e7a5b787751ed3c1c31f66ae919f11911393b974.tar.bz2 | |
Make the autocomplete system and various other connected bits of code use GURL instead of wstring where appropriate. Original patch by phajdan.jr@gmail.com, r=me,sky. See http://codereview.chromium.org/13205 .
BUG=715234
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6758 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete/search_provider.cc')
| -rw-r--r-- | chrome/browser/autocomplete/search_provider.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc index 0bad51c..32c2fb2 100644 --- a/chrome/browser/autocomplete/search_provider.cc +++ b/chrome/browser/autocomplete/search_provider.cc @@ -88,9 +88,9 @@ void SearchProvider::Run() { const TemplateURLRef* const suggestions_url = default_provider_.suggestions_url(); DCHECK(suggestions_url->SupportsReplacement()); - fetcher_.reset(new URLFetcher(GURL(suggestions_url->ReplaceSearchTerms( + fetcher_.reset(new URLFetcher(suggestions_url->ReplaceSearchTerms( default_provider_, input_.text(), - TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, std::wstring())), + TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, std::wstring()), URLFetcher::GET, this)); fetcher_->set_request_context(profile_->GetRequestContext()); fetcher_->Start(); @@ -320,7 +320,7 @@ bool SearchProvider::ParseSuggestResults(Value* root_val) { description_list && description_list->Get(i, &site_val) && site_val->IsType(Value::TYPE_STRING) && site_val->GetAsString(&site_name)) { - navigation_results_.push_back(NavigationResult(suggestion_str, + navigation_results_.push_back(NavigationResult(GURL(suggestion_str), site_name)); } } else { @@ -566,7 +566,7 @@ AutocompleteMatch SearchProvider::NavigationToMatch( AutocompleteMatch match(this, relevance, false, AutocompleteMatch::NAVSUGGEST); match.destination_url = navigation.url; - match.contents = StringForURLDisplay(GURL(navigation.url), true); + match.contents = StringForURLDisplay(navigation.url, true); // TODO(kochi): Consider moving HistoryURLProvider::TrimHttpPrefix() to some // public utility function. if (!url_util::FindAndCompareScheme(input_.text(), "http", NULL)) |