diff options
| author | mpearson@chromium.org <mpearson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-22 19:33:35 +0000 |
|---|---|---|
| committer | mpearson@chromium.org <mpearson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-22 19:33:35 +0000 |
| commit | a2770a7dc01cc54b5143b0d61d56407621031dd0 (patch) | |
| tree | 664eb8a8625d5134e6dc5b02e1fd615aea5b7270 /chrome/browser/ui/omnibox/omnibox_edit_model.cc | |
| parent | aa62afd7cd7d99a896f0e3b3ab4da77d03203d5c (diff) | |
| download | chromium_src-a2770a7dc01cc54b5143b0d61d56407621031dd0.zip chromium_src-a2770a7dc01cc54b5143b0d61d56407621031dd0.tar.gz chromium_src-a2770a7dc01cc54b5143b0d61d56407621031dd0.tar.bz2 | |
Omnibox: Retire AutocompleteInput::MatchesRequested
and replace it with a simple boolean: want_asynchronous_matches
The extra complexity of the enum wasn't being used.
TBR=mpcomplete
(for the changes to chrome/browser/extensions/api/omnibox/*, which incidentally only touch test files)
BUG=
Review URL: https://codereview.chromium.org/242493008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265328 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/omnibox/omnibox_edit_model.cc')
| -rw-r--r-- | chrome/browser/ui/omnibox/omnibox_edit_model.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.cc b/chrome/browser/ui/omnibox/omnibox_edit_model.cc index c8278c1..a34048f 100644 --- a/chrome/browser/ui/omnibox/omnibox_edit_model.cc +++ b/chrome/browser/ui/omnibox/omnibox_edit_model.cc @@ -637,7 +637,8 @@ void OmniboxEditModel::AcceptInput(WindowOpenDisposition disposition, old_input.cursor_position(), base::ASCIIToUTF16("com"), GURL(), old_input.current_page_classification(), old_input.prevent_inline_autocomplete(), old_input.prefer_keyword(), - old_input.allow_exact_keyword_match(), old_input.matches_requested()); + old_input.allow_exact_keyword_match(), + old_input.want_asynchronous_matches()); AutocompleteMatch url_match( autocomplete_controller()->history_url_provider()->SuggestExactInput( input.text(), input.canonicalized_url(), false)); @@ -918,8 +919,7 @@ void OmniboxEditModel::OnSetFocus(bool control_down) { // |permanent_text_| is empty. autocomplete_controller()->StartZeroSuggest(AutocompleteInput( permanent_text_, base::string16::npos, base::string16(), - delegate_->GetURL(), ClassifyPage(), false, false, true, - AutocompleteInput::ALL_MATCHES)); + delegate_->GetURL(), ClassifyPage(), false, false, true, true)); } if (user_input_in_progress_ || !in_revert_) |