Fine tuned availability of hotword plugin.

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 17 matching lines @@
 #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 "grit/theme_resources.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"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(USE_ASH)
 #include "chrome/browser/ui/ash/app_list/app_sync_ui_state_watcher.h"
 #endif
 
 #if defined(OS_WIN)
@@ skipping 40 matching lines @@
 
 AppListViewDelegate::AppListViewDelegate(Profile* profile,
                                          AppListControllerDelegate* controller)
     : controller_(controller),
       profile_(profile),
       model_(NULL) {
   CHECK(controller_);
   RegisterForNotifications();
   g_browser_process->profile_manager()->GetProfileInfoCache().AddObserver(this);
 
-  // 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.
+  app_list::StartPageService* service =
+      app_list::StartPageService::Get(profile_);
   speech_ui_.reset(new app_list::SpeechUIModel(
-#if defined(OS_CHROMEOS)
-      app_list::switches::IsVoiceSearchEnabled() ?
-        app_list::SPEECH_RECOGNITION_HOTWORD_LISTENING :
-#endif
-        app_list::SPEECH_RECOGNITION_OFF));
+      service ? service->state() : app_list::SPEECH_RECOGNITION_OFF));
 
 #if defined(GOOGLE_CHROME_BUILD)
   speech_ui_->set_logo(
       *ui::ResourceBundle::GetSharedInstance().
       GetImageSkiaNamed(IDR_APP_LIST_GOOGLE_LOGO_VOICE_SEARCH));
 #endif
 
   OnProfileChanged();  // sets model_
-  app_list::StartPageService* service =
-      app_list::StartPageService::Get(profile_);
   if (service)
     service->AddObserver(this);
 }
 
 AppListViewDelegate::~AppListViewDelegate() {
   app_list::StartPageService* service =
       app_list::StartPageService::Get(profile_);
   if (service)
     service->RemoveObserver(this);
   g_browser_process->
@@ skipping 269 matching lines @@
 
 void AppListViewDelegate::AddObserver(
     app_list::AppListViewDelegateObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void AppListViewDelegate::RemoveObserver(
     app_list::AppListViewDelegateObserver* observer) {
   observers_.RemoveObserver(observer);
 }