| commit | fb7158f72373d70ac10e433f7585c499fd441d18 | |
| author | mgiuca <mgiuca@chromium.org> | |
| Fri, 14 Nov 2014 04:09:42 +0000 (13 20:09 -0800) | ||
| committer | Commit bot <commit-bot@chromium.org> | |
| Fri, 14 Nov 2014 04:10:54 +0000 (14 04:10 +0000) | ||
| tree | 9cf8ee3c579a0246559c26b2c3f6bfe9fafe660c | treesnapshot (tar.gz zip) |
| parent | 7951bf6c82341bf01d1f7472ddc2fe44e89249d0 | commitdiff |
App list search results mixer: Fix invalid DCHECK and rewrote algorithm.
Rewrote the algorithm for adding omnibox results so it can deal with
having more than 6 non-omnibox results. Previously, it would
DCHECK-fail, and on release it would add all of the omnibox results. Now
it removes people and webstore results until there is one slot free for
the omnibox result.
Added some test cases that have people results.
BUG=432763
Review URL: https://codereview.chromium.org/718353002
Cr-Commit-Position: refs/heads/master@{#304167}
Rewrote the algorithm for adding omnibox results so it can deal with
having more than 6 non-omnibox results. Previously, it would
DCHECK-fail, and on release it would add all of the omnibox results. Now
it removes people and webstore results until there is one slot free for
the omnibox result.
Added some test cases that have people results.
BUG=432763
Review URL: https://codereview.chromium.org/718353002
Cr-Commit-Position: refs/heads/master@{#304167}
| ui/app_list/search/mixer.cc | diffblobblamehistory | |
| ui/app_list/search/mixer_unittest.cc | diffblobblamehistory |