Chromium Code Reviews| Index: ui/app_list/search_controller.cc |
| diff --git a/ui/app_list/search_controller.cc b/ui/app_list/search_controller.cc |
| index 5891341544cf885ddc0f038d7ecb2785ee7fab3d..4929795b2b300211a3e4275d846b7e49265e790d 100644 |
| --- a/ui/app_list/search_controller.cc |
| +++ b/ui/app_list/search_controller.cc |
| @@ -57,7 +57,7 @@ void SearchController::Start(bool is_voice_query) { |
| is_voice_query_ = is_voice_query; |
| - OnResultsChanged(); |
| + OnResultsChanged(query.empty()); |
|
xiyuan
2016/08/09 17:49:09
We should remember empty query in a member var ins
xdai1
2016/08/09 20:14:17
Done.
|
| stop_timer_.Start(FROM_HERE, |
| base::TimeDelta::FromMilliseconds(kStopTimeMS), |
| @@ -119,13 +119,12 @@ size_t SearchController::AddGroup(size_t max_results, double multiplier) { |
| void SearchController::AddProvider(size_t group_id, |
| std::unique_ptr<SearchProvider> provider) { |
| provider->set_result_changed_callback(base::Bind( |
| - &SearchController::OnResultsChanged, |
| - base::Unretained(this))); |
| + &SearchController::OnResultsChanged, base::Unretained(this), true)); |
|
xiyuan
2016/08/09 17:49:09
As aforementioned, let's remember the query_for_re
xdai1
2016/08/09 20:14:17
Done.
|
| mixer_->AddProviderToGroup(group_id, provider.get()); |
| providers_.push_back(std::move(provider)); |
| } |
| -void SearchController::OnResultsChanged() { |
| +void SearchController::OnResultsChanged(bool is_empty_query) { |
| if (dispatching_query_) |
| return; |
| @@ -135,7 +134,7 @@ void SearchController::OnResultsChanged() { |
| ->swap(known_results); |
| } |
| - mixer_->MixAndPublish(is_voice_query_, known_results); |
| + mixer_->MixAndPublish(is_empty_query, is_voice_query_, known_results); |
| } |
| } // namespace app_list |