Plumb preamble log data from the hotword extension into the speech recognizer.

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 "apps/custom_launcher_page_contents.h"
 #include "base/callback.h"
@@ skipping 25 matching lines @@
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/url_constants.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
+#include "content/public/browser/speech_recognition_session_preamble.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/manifest_handlers/launcher_page_info.h"
 #include "grit/theme_resources.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/app_list_view_delegate_observer.h"
@@ skipping 322 matching lines @@
     if (speech_ui_->state() == app_list::SPEECH_RECOGNITION_READY) {
       OnSpeechRecognitionStateChanged(
           app_list::SPEECH_RECOGNITION_HOTWORD_LISTENING);
     }
   } else {
     if (speech_ui_->state() == app_list::SPEECH_RECOGNITION_HOTWORD_LISTENING)
       OnSpeechRecognitionStateChanged(app_list::SPEECH_RECOGNITION_READY);
   }
 }
 
-void AppListViewDelegate::OnHotwordRecognized() {
+void AppListViewDelegate::OnHotwordRecognized(
+    const scoped_refptr<content::SpeechRecognitionSessionPreamble>& preamble) {
   DCHECK_EQ(app_list::SPEECH_RECOGNITION_HOTWORD_LISTENING,
             speech_ui_->state());
-  ToggleSpeechRecognition();
+  ToggleSpeechRecognitionForHotword(preamble);
 }
 
 void AppListViewDelegate::SigninManagerCreated(SigninManagerBase* manager) {
   scoped_observer_.Add(manager);
 }
 
 void AppListViewDelegate::SigninManagerShutdown(SigninManagerBase* manager) {
   if (scoped_observer_.IsObserving(manager))
     scoped_observer_.Remove(manager);
 }
@@ skipping 195 matching lines @@
 
 void AppListViewDelegate::OpenFeedback() {
   chrome::HostDesktopType desktop = chrome::GetHostDesktopTypeForNativeWindow(
       controller_->GetAppListWindow());
   Browser* browser = chrome::FindTabbedBrowser(profile_, false, desktop);
   chrome::ShowFeedbackPage(browser, std::string(),
                            chrome::kAppLauncherCategoryTag);
 }
 
 void AppListViewDelegate::ToggleSpeechRecognition() {
+  ToggleSpeechRecognitionForHotword(nullptr);
+}
+
+void AppListViewDelegate::ToggleSpeechRecognitionForHotword(
+    const scoped_refptr<content::SpeechRecognitionSessionPreamble>& preamble) {
   app_list::StartPageService* service =
       app_list::StartPageService::Get(profile_);
   if (service)
-    service->ToggleSpeechRecognition();
+    service->ToggleSpeechRecognition(preamble);
 
   // With the new hotword extension, stop the hotword session. With the launcher
   // and NTP, this is unnecessary since the hotwording is implicitly stopped.
   // However, for always on, hotword triggering launches the launcher which
   // starts a session and hence starts the hotword detector. This results in the
   // hotword detector and the speech-to-text engine running in parallel, which
   // will conflict with each other (i.e. saying 'Ok Google' twice in a row
   // should cause a search to happen for 'Ok Google', not two hotword triggers).
   // To get around this, always stop the session when switching to speech
   // recognition.
@@ skipping 167 matching lines @@
 
       // SigninManagerFactory is not a leaky singleton (unlike this class), and
       // its destructor will check that it has no remaining observers.
       scoped_observer_.RemoveAll();
       SigninManagerFactory::GetInstance()->RemoveObserver(this);
       break;
     default:
       NOTREACHED();
   }
 }