Hotword Audio Verification App: Adds to hotwordPrivate API

chrome/browser/search/hotword_service.cc

 // Copyright 2013 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/search/hotword_service.h"
 
 #include "base/command_line.h"
 #include "base/i18n/case_conversion.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
@@ skipping 435 matching lines @@
   if (extension_service) {
     extension_service->DisableExtension(
         extension_misc::kHotwordExtensionId,
         extensions::Extension::DISABLE_USER_ACTION);
   }
 }
 
 void HotwordService::OnHotwordAlwaysOnSearchEnabledChanged(
     const std::string& pref_name) {
   DCHECK_EQ(pref_name, std::string(prefs::kHotwordAlwaysOnSearchEnabled));
+  // TODO(kcarattini): Launch in the appropriate mode given the state of
+  // the account-level Audio History setting.
+  LaunchHotwordAudioVerificationApp(HOTWORD_AND_AUDIO_HISTORY);
+}
+
+void HotwordService::LaunchHotwordAudioVerificationApp(
+    const LaunchMode& launch_mode) {
+  hotword_audio_verification_launch_mode_ = launch_mode;
 
   ExtensionService* extension_service = GetExtensionService(profile_);
   if (!extension_service)
     return;
-
   const extensions::Extension* extension = extension_service->GetExtensionById(
       extension_misc::kHotwordAudioVerificationAppId, true);
   if (!extension)
     return;
 
-  if (profile_->GetPrefs()->GetBoolean(prefs::kHotwordAlwaysOnSearchEnabled)) {
-    OpenApplication(AppLaunchParams(
-        profile_, extension, extensions::LAUNCH_CONTAINER_WINDOW, NEW_WINDOW));
-  }
+  OpenApplication(AppLaunchParams(

[rpetterson, 2014/09/10 23:04:23]

Why don't you check if the pref is enabled any more?
OnHotwordAlwaysOnSearchEnabledChanged can be triggered for turning the setting
off as well and we wouldn't want that to pop up the app.

[kcarattini, 2014/09/11 00:08:30]

I don't think this is the final behaviour we want at all, actually, and I plan
to fix that in a follow-up cl (added a TODO). I think what we want is to manage
the enabling of the pref, rather than react to it, by overriding the default
pref behaviour and intercepting the checkbox click before the pref is enabled
(and control the enabled state through the app).

[rpetterson, 2014/09/11 17:43:54]

Got it. So only enable it if they've done the verification and otherwise disable
it?

[kcarattini, 2014/09/11 23:32:50]

Yes, that's the idea.

+      profile_, extension, extensions::LAUNCH_CONTAINER_WINDOW, NEW_WINDOW));
+}
+
+HotwordService::LaunchMode
+HotwordService::GetHotwordAudioVerificationLaunchMode() {
+  return hotword_audio_verification_launch_mode_;
 }
 
 void HotwordService::OnHotwordSearchEnabledChanged(
     const std::string& pref_name) {
   DCHECK_EQ(pref_name, std::string(prefs::kHotwordSearchEnabled));
 
   ExtensionService* extension_service = GetExtensionService(profile_);
   if (profile_->GetPrefs()->GetBoolean(prefs::kHotwordSearchEnabled))
     EnableHotwordExtension(extension_service);
   else
@@ skipping 37 matching lines @@
     return false;
 
   std::string previous_locale =
       profile_->GetPrefs()->GetString(prefs::kHotwordPreviousLanguage);
   std::string locale = GetCurrentLocale(profile_);
 
   // If it's a new locale, then the old extension should be uninstalled.
   return locale != previous_locale &&
       HotwordService::DoesHotwordSupportLanguage(profile_);
 }