Enables the 'hotword not listening' icon in the search box.

chrome/browser/ui/app_list/app_list_view_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/app_list/app_list_view_delegate.h"
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
@@ skipping 16 matching lines @@
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 #include "chrome/browser/ui/web_applications/web_app_ui.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/user_metrics.h"
+#include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/app_list_view_delegate_observer.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"
 #endif
 
 #if defined(OS_WIN)
 #include "chrome/browser/web_applications/web_app_win.h"
@@ skipping 43 matching lines @@
       profile_(profile),
       model_(NULL) {
   CHECK(controller_);
   RegisterForNotifications();
   g_browser_process->profile_manager()->GetProfileInfoCache().AddObserver(this);
   OnProfileChanged();  // sets model_
   app_list::StartPageService* service =
       app_list::StartPageService::Get(profile_);
   if (service)
     service->AddObserver(this);
+
+

[xiyuan, 2014/01/30 00:27:45]

nit: nuke one empty line

[Jun Mukai, 2014/01/30 00:33:24]

Done.

+  // Hotword listening is on by default in ChromeOS right now. Here shouldn't
+  // use the current state in the webui because it will be changed to 'hotword
+  // listening' state from 'ready' after the view is initialized.
+  speech_ui_.reset(new app_list::SpeechUIModel(
+#if defined(OS_CHROMEOS)
+      app_list::switches::IsVoiceSearchEnabled() ?
+      app_list::SPEECH_RECOGNITION_HOTWORD_LISTENING :

[xiyuan, 2014/01/30 00:27:45]

nit: 2 more space indent here and the value on line 111 beblow?

[Jun Mukai, 2014/01/30 00:33:24]

Done.

+#endif
+      app_list::SPEECH_RECOGNITION_OFF));
 }
 
 AppListViewDelegate::~AppListViewDelegate() {
   app_list::StartPageService* service =
       app_list::StartPageService::Get(profile_);
   if (service)
     service->RemoveObserver(this);
   g_browser_process->
       profile_manager()->GetProfileInfoCache().RemoveObserver(this);
 }
@@ skipping 60 matching lines @@
 
 app_list::AppListModel* AppListViewDelegate::GetModel() {
   return model_;
 }
 
 app_list::SigninDelegate* AppListViewDelegate::GetSigninDelegate() {
   return &signin_delegate_;
 }
 
 app_list::SpeechUIModel* AppListViewDelegate::GetSpeechUI() {
-  return &speech_ui_;
+  return speech_ui_.get();
 }
 
 void AppListViewDelegate::GetShortcutPathForApp(
     const std::string& app_id,
     const base::Callback<void(const base::FilePath&)>& callback) {
 #if defined(OS_WIN)
   ExtensionService* service = profile_->GetExtensionService();
   DCHECK(service);
   const extensions::Extension* extension =
       service->GetInstalledExtension(app_id);
@@ skipping 112 matching lines @@
     service->ToggleSpeechRecognition();
 }
 
 void AppListViewDelegate::ShowForProfileByPath(
     const base::FilePath& profile_path) {
   controller_->ShowForProfileByPath(profile_path);
 }
 
 void AppListViewDelegate::OnSpeechResult(const base::string16& result,
                                          bool is_final) {
-  speech_ui_.SetSpeechResult(result, is_final);
+  speech_ui_->SetSpeechResult(result, is_final);
   if (is_final) {
     auto_launch_timeout_ = base::TimeDelta::FromSeconds(
         kAutoLaunchDefaultTimeoutSec);
     model_->search_box()->SetText(result);
   }
 }
 
 void AppListViewDelegate::OnSpeechSoundLevelChanged(int16 level) {
-  speech_ui_.UpdateSoundLevel(level);
+  speech_ui_->UpdateSoundLevel(level);
 }
 
 void AppListViewDelegate::OnSpeechRecognitionStateChanged(
     app_list::SpeechRecognitionState new_state) {
-  speech_ui_.SetSpeechRecognitionState(new_state);
+  speech_ui_->SetSpeechRecognitionState(new_state);
 }
 
 void AppListViewDelegate::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   OnProfileChanged();
 }
 
 void AppListViewDelegate::OnProfileAdded(const base::FilePath& profile_path) {
@@ skipping 36 matching lines @@
 
 void AppListViewDelegate::AddObserver(
     app_list::AppListViewDelegateObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void AppListViewDelegate::RemoveObserver(
     app_list::AppListViewDelegateObserver* observer) {
   observers_.RemoveObserver(observer);
 }