Hotword Private API: Adds speech training functions.

chrome/browser/extensions/api/hotword_private/hotword_private_api.cc

 // Copyright 2014 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/extensions/api/hotword_private/hotword_private_api.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 46 matching lines @@
 }
 
 // static
 const char* HotwordPrivateEventService::service_name() {
   return "HotwordPrivateEventService";
 }
 
 void HotwordPrivateEventService::OnEnabledChanged(
     const std::string& pref_name) {
   DCHECK(pref_name == std::string(prefs::kHotwordSearchEnabled) ||
-         pref_name == std::string(prefs::kHotwordAlwaysOnSearchEnabled));
+         pref_name == std::string(prefs::kHotwordAlwaysOnSearchEnabled) ||
+         pref_name == std::string(

[rpetterson, 2014/10/30 19:48:36]

Why is this a part of OnEnabledChanged? I would expect a different event for the
training state.

[kcarattini, 2014/10/30 23:44:18]

Changed the comment in hotword_private.idl, as discussed.

+             hotword_internal::kHotwordTrainingEnabled));
   SignalEvent(OnEnabledChanged::kEventName);
 }
 
 void HotwordPrivateEventService::OnHotwordSessionRequested() {
   SignalEvent(api::hotword_private::OnHotwordSessionRequested::kEventName);
 }
 
 void HotwordPrivateEventService::OnHotwordSessionStopped() {
   SignalEvent(api::hotword_private::OnHotwordSessionStopped::kEventName);
 }
 
+void HotwordPrivateEventService::OnFinalizeSpeakerModel() {
+  SignalEvent(api::hotword_private::OnFinalizeSpeakerModel::kEventName);
+}
+
+void HotwordPrivateEventService::OnHotwordTriggered() {
+  SignalEvent(api::hotword_private::OnHotwordTriggered::kEventName);
+}
+
 void HotwordPrivateEventService::SignalEvent(const std::string& event_name) {
   EventRouter* router = EventRouter::Get(profile_);
   if (!router || !router->HasEventListener(event_name))
     return;
   scoped_ptr<base::ListValue> args(new base::ListValue());
   scoped_ptr<Event> event(new Event(event_name, args.Pass()));
   router->BroadcastEvent(event.Pass());
 }
 
 bool HotwordPrivateSetEnabledFunction::RunSync() {
@@ skipping 41 matching lines @@
 
   PrefService* prefs = GetProfile()->GetPrefs();
   result.enabled_set = prefs->HasPrefPath(prefs::kHotwordSearchEnabled);
   result.enabled = prefs->GetBoolean(prefs::kHotwordSearchEnabled);
   result.always_on_enabled =
       prefs->GetBoolean(prefs::kHotwordAlwaysOnSearchEnabled);
   result.audio_logging_enabled = false;
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   result.experimental_hotword_enabled = command_line->HasSwitch(
       switches::kEnableExperimentalHotwording);
-  if (hotword_service)
+  if (hotword_service) {

[rpetterson, 2014/10/30 19:48:35]

Group this if statement with the one above.

[kcarattini, 2014/10/30 23:44:18]

Done.

     result.audio_logging_enabled = hotword_service->IsOptedIntoAudioLogging();
+    result.training_enabled = hotword_service->IsTraining();
+  }
 
   SetResult(result.ToValue().release());
   return true;
 }
 
 bool HotwordPrivateSetHotwordSessionStateFunction::RunSync() {
   scoped_ptr<api::hotword_private::SetHotwordSessionState::Params> params(
       api::hotword_private::SetHotwordSessionState::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   HotwordService* hotword_service =
       HotwordServiceFactory::GetForProfile(GetProfile());
-  if (hotword_service && hotword_service->client())
+  if (hotword_service &&
+      hotword_service->client() &&
+      !hotword_service->IsTraining())
     hotword_service->client()->OnHotwordStateChanged(params->started);
   return true;
 }
 
 bool HotwordPrivateNotifyHotwordRecognitionFunction::RunSync() {
   HotwordService* hotword_service =
       HotwordServiceFactory::GetForProfile(GetProfile());
   if (hotword_service) {
-    if (hotword_service->client()) {
+    if (hotword_service->IsTraining()) {
+      hotword_service->NotifyHotwordTriggered();
+    } else if (hotword_service->client()) {
       hotword_service->client()->OnHotwordRecognized();
     } else if (HotwordService::IsExperimentalHotwordingEnabled() &&
                hotword_service->IsAlwaysOnEnabled()) {
       Browser* browser = GetCurrentBrowser();
       // If a Browser does not exist, fall back to the universally available,
       // but not recommended, way.
       AppListService* app_list_service = AppListService::Get(
           browser ? browser->host_desktop_type() : chrome::GetActiveDesktop());
       CHECK(app_list_service);
       app_list_service->ShowForVoiceSearch(GetProfile());
     }
   }
   return true;
 }
 
 bool HotwordPrivateGetLaunchStateFunction::RunSync() {
-  api::hotword_private::LaunchState result;
-
   HotwordService* hotword_service =
       HotwordServiceFactory::GetForProfile(GetProfile());
   if (!hotword_service) {
     error_ = hotword_private_constants::kHotwordServiceUnavailable;
     return false;
-  } else {
-    result.launch_mode =
-        hotword_service->GetHotwordAudioVerificationLaunchMode();
   }
 
+  api::hotword_private::LaunchState result;
+  result.launch_mode =
+      hotword_service->GetHotwordAudioVerificationLaunchMode();
   SetResult(result.ToValue().release());
   return true;
 }
 
+bool HotwordPrivateStartTrainingFunction::RunSync() {
+  HotwordService* hotword_service =
+      HotwordServiceFactory::GetForProfile(GetProfile());
+  if (!hotword_service) {
+    error_ = hotword_private_constants::kHotwordServiceUnavailable;
+    return false;
+  }
+
+  hotword_service->StartTraining();
+  return true;
+}
+
+bool HotwordPrivateFinalizeSpeakerModelFunction::RunSync() {
+  HotwordService* hotword_service =
+      HotwordServiceFactory::GetForProfile(GetProfile());
+  if (!hotword_service) {
+    error_ = hotword_private_constants::kHotwordServiceUnavailable;
+    return false;
+  }
+
+  hotword_service->FinalizeSpeakerModel();
+  return true;
+}
+
+bool HotwordPrivateStopTrainingFunction::RunSync() {
+  HotwordService* hotword_service =
+      HotwordServiceFactory::GetForProfile(GetProfile());
+  if (!hotword_service) {
+    error_ = hotword_private_constants::kHotwordServiceUnavailable;
+    return false;
+  }
+
+  hotword_service->StopTraining();
+  return true;
+}
+
 }  // namespace extensions