| Index: chrome/browser/ui/app_list/app_list_view_delegate.cc
|
| diff --git a/chrome/browser/ui/app_list/app_list_view_delegate.cc b/chrome/browser/ui/app_list/app_list_view_delegate.cc
|
| index 93ff48ca37d70c8ec4e38278f3ab1e9b10c5c2cf..ea702094511dba8d219dc4bf227db47d586dcfeb 100644
|
| --- a/chrome/browser/ui/app_list/app_list_view_delegate.cc
|
| +++ b/chrome/browser/ui/app_list/app_list_view_delegate.cc
|
| @@ -35,6 +35,7 @@
|
| #include "content/public/browser/page_navigator.h"
|
| #include "content/public/browser/user_metrics.h"
|
| #include "ui/app_list/search_box_model.h"
|
| +#include "ui/app_list/speech_ui_model.h"
|
|
|
| #if defined(USE_ASH)
|
| #include "chrome/browser/ui/ash/app_list/app_sync_ui_state_watcher.h"
|
| @@ -276,12 +277,18 @@ void AppListViewDelegate::ShowForProfileByPath(
|
| controller_->ShowForProfileByPath(profile_path);
|
| }
|
|
|
| -void AppListViewDelegate::OnSearch(const base::string16& query) {
|
| - model_->search_box()->SetText(query);
|
| +void AppListViewDelegate::OnSpeechResult(const base::string16& query,
|
| + bool is_final) {
|
| + model_->speech_ui()->SetSpeechResult(query, is_final);
|
| }
|
|
|
| -void AppListViewDelegate::OnSpeechRecognitionStateChanged(bool recognizing) {
|
| - model_->search_box()->SetSpeechRecognitionButtonState(recognizing);
|
| +void AppListViewDelegate::OnSpeechSoundLevelChanged(int16 level) {
|
| + model_->speech_ui()->UpdateSoundLevel(level);
|
| +}
|
| +
|
| +void AppListViewDelegate::OnSpeechRecognitionStateChanged(
|
| + app_list::SpeechRecognitionState new_state) {
|
| + model_->speech_ui()->SetSpeechRecognitionState(new_state);
|
| }
|
|
|
| void AppListViewDelegate::Observe(
|
|
|