| Index: ui/app_list/search_controller.cc
|
| diff --git a/ui/app_list/search_controller.cc b/ui/app_list/search_controller.cc
|
| index 3a4a52f59c2d96b45c1bda7c3efaf807e00f8eb2..f4960e12715a72886c81952900ca20d1b8ff3806 100644
|
| --- a/ui/app_list/search_controller.cc
|
| +++ b/ui/app_list/search_controller.cc
|
| @@ -28,17 +28,18 @@ namespace app_list {
|
| SearchController::SearchController(SearchBoxModel* search_box,
|
| AppListModel::SearchResults* results,
|
| History* history)
|
| - : search_box_(search_box),
|
| - dispatching_query_(false),
|
| - mixer_(new Mixer(results)),
|
| - history_(history) {
|
| + : search_box_(search_box),
|
| + dispatching_query_(false),
|
| + mixer_(new Mixer(results)),
|
| + history_(history),
|
| + is_voice_query_(false) {
|
| mixer_->Init();
|
| }
|
|
|
| SearchController::~SearchController() {
|
| }
|
|
|
| -void SearchController::Start() {
|
| +void SearchController::Start(bool is_voice_query) {
|
| Stop();
|
|
|
| base::string16 query;
|
| @@ -52,6 +53,8 @@ void SearchController::Start() {
|
| }
|
| dispatching_query_ = false;
|
|
|
| + is_voice_query_ = is_voice_query;
|
| +
|
| OnResultsChanged();
|
|
|
| stop_timer_.Start(FROM_HERE,
|
| @@ -108,7 +111,7 @@ void SearchController::OnResultsChanged() {
|
| ->swap(known_results);
|
| }
|
|
|
| - mixer_->MixAndPublish(known_results);
|
| + mixer_->MixAndPublish(is_voice_query_, known_results);
|
| }
|
|
|
| } // namespace app_list
|
|
|