Chromium Code Reviews| Index: chrome/browser/ui/omnibox/omnibox_controller.cc |
| diff --git a/chrome/browser/ui/omnibox/omnibox_controller.cc b/chrome/browser/ui/omnibox/omnibox_controller.cc |
| index db2aaa1065b0ac936923369827b870051ea63dbf..b16bc20665af327202ed48e493ea27bdbc5f58c0 100644 |
| --- a/chrome/browser/ui/omnibox/omnibox_controller.cc |
| +++ b/chrome/browser/ui/omnibox/omnibox_controller.cc |
| @@ -39,12 +39,9 @@ namespace { |
| // |
| // If the kAllowPrefetchNonDefaultMatch field trial is enabled we return the |
| // prefetch suggestion even if it is not the default match. Otherwise we only |
| -// care about matches that are the default or the very first entry in the |
| -// dropdown (which can happen for non-default matches only if we're hiding a top |
| -// verbatim match) or the second entry in the dropdown (which can happen for |
| -// non-default matches when a top verbatim match is shown); for other matches, |
| -// we think the likelihood of the user selecting them is low enough that |
| -// prefetching isn't worth doing. |
| +// care about matches that are the default; for other matches, we think the |
| +// likelihood of the user selecting them is low enough that prefetching isn't |
| +// worth doing. |
| const AutocompleteMatch* GetMatchToPrefetch(const AutocompleteResult& result) { |
| if (chrome::ShouldAllowPrefetchNonDefaultMatch()) { |
| const AutocompleteResult::const_iterator prefetch_match = std::find_if( |
| @@ -53,20 +50,11 @@ const AutocompleteMatch* GetMatchToPrefetch(const AutocompleteResult& result) { |
| } |
| // If the default match should be prefetched, do that. |
| - const AutocompleteResult::const_iterator default_match( |
| - result.default_match()); |
| + const auto default_match = result.default_match(); |
| if ((default_match != result.end()) && |
| SearchProvider::ShouldPrefetch(*default_match)) |
| return &(*default_match); |
| - // Otherwise, if the top match is a verbatim match and the very next match |
|
Mark P
2015/06/01 19:23:02
I don't understand why you're removing this block.
Peter Kasting
2015/06/01 20:18:01
kmadhusu said the TopMatchIsStandaloneVerbatimMatc
kmadhusu
2015/06/01 20:24:32
pkasting@, I am assuming default match is always t
Peter Kasting
2015/06/01 20:26:57
Default match is always top match.
What removing
kmadhusu
2015/06/01 20:37:21
I see. Thanks for the details. I think we need thi
dschuyler
2015/06/05 20:33:54
Thanks for going over that!
Done.
|
| - // is prefetchable, fetch that. |
| - if ((result.ShouldHideTopMatch() || |
| - result.TopMatchIsStandaloneVerbatimMatch()) && |
| - (result.size() > 1) && |
| - SearchProvider::ShouldPrefetch(result.match_at(1))) |
| - return &result.match_at(1); |
| - |
| return NULL; |
| } |