diff options
| author | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-07 17:50:58 +0000 |
|---|---|---|
| committer | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-07 17:50:58 +0000 |
| commit | 33bd60f508a0eaa7ddfefb497b35c1627a6ff0be (patch) | |
| tree | 5ccf0d1a06ce8faa8d8bba5dca828ba6485cb4bc /chrome/browser/autocomplete_history_manager.cc | |
| parent | 3acdf835f850997396ef30c61688a9a2f55fb594 (diff) | |
| download | chromium_src-33bd60f508a0eaa7ddfefb497b35c1627a6ff0be.zip chromium_src-33bd60f508a0eaa7ddfefb497b35c1627a6ff0be.tar.gz chromium_src-33bd60f508a0eaa7ddfefb497b35c1627a6ff0be.tar.bz2 | |
Autocomplete and AutoFill entries are shown combined in the suggestions popup.
These changes merge popup menu suggestions for Autocomplete and AutoFill. Suggestions are collected from both sources and returned to the renderer as a single list. This combined list is given to WebKit to display in the suggestions popup. When the user selects an item in the popup the appropriate result gets filled in the fields.
BUG=41328
TEST=AutoFillManagerTest.*
Review URL: http://codereview.chromium.org/2878020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51736 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete_history_manager.cc')
| -rw-r--r-- | chrome/browser/autocomplete_history_manager.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/autocomplete_history_manager.cc b/chrome/browser/autocomplete_history_manager.cc index 12c661e..f30ec2b 100644 --- a/chrome/browser/autocomplete_history_manager.cc +++ b/chrome/browser/autocomplete_history_manager.cc @@ -179,9 +179,9 @@ void AutocompleteHistoryManager::SendSuggestions(const WDTypedResult* result) { const WDResult<std::vector<string16> >* autofill_result = static_cast<const WDResult<std::vector<string16> >*>(result); host->AutocompleteSuggestionsReturned( - query_id_, autofill_result->GetValue(), -1); + query_id_, autofill_result->GetValue()); } else { host->AutocompleteSuggestionsReturned( - query_id_, std::vector<string16>(), -1); + query_id_, std::vector<string16>()); } } |