Hotword Audio Verification app: control the hotword settings

chrome/browser/ui/webui/options/browser_options_handler.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/webui/options/browser_options_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 733 matching lines @@
         base::Bind(&BrowserOptionsHandler::ShowCloudPrintDevicesPage,
                    base::Unretained(this)));
   }
 #endif
   web_ui()->RegisterMessageCallback(
       "requestHotwordAvailable",
       base::Bind(&BrowserOptionsHandler::HandleRequestHotwordAvailable,
                  base::Unretained(this)));
 
   web_ui()->RegisterMessageCallback(
+      "launchHotwordAudioVerificationApp",
+      base::Bind(
+          &BrowserOptionsHandler::HandleLaunchHotwordAudioVerificationApp,
+          base::Unretained(this)));
+
+  web_ui()->RegisterMessageCallback(
       "launchEasyUnlockSetup",
       base::Bind(&BrowserOptionsHandler::HandleLaunchEasyUnlockSetup,
                base::Unretained(this)));
 #if defined(OS_WIN)
   web_ui()->RegisterMessageCallback(
       "refreshExtensionControlIndicators",
       base::Bind(
           &BrowserOptionsHandler::HandleRefreshExtensionControlIndicators,
           base::Unretained(this)));
 #endif  // defined(OS_WIN)
@@ skipping 834 matching lines @@
                                        enabled, error_message);
     }
     if (CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kEnableExperimentalHotwording)) {
       web_ui()->CallJavascriptFunction(
           "BrowserOptions.showHotwordAlwaysOnSection");
     }
   }
 }
 
+void BrowserOptionsHandler::HandleLaunchHotwordAudioVerificationApp(
+    const base::ListValue* args) {
+  Profile* profile = Profile::FromWebUI(web_ui());
+  HotwordService* hotword_service =
+      HotwordServiceFactory::GetForProfile(profile);
+  if (!hotword_service) {
+    return;
+  }
+
+  bool retrain = false;
+  args->GetBoolean(0, &retrain);
+
+  if (retrain) {
+    DCHECK(profile->GetPrefs()->GetBoolean(

[rpetterson, 2014/09/11 20:14:17]

I would do all these DCHECKs in the similar if statement below unless you plan
on acting on the state of the preference.

[kcarattini, 2014/09/12 01:02:08]

Done.

+        prefs::kHotwordAlwaysOnSearchEnabled));
+    DCHECK(profile->GetPrefs()->GetBoolean(
+        prefs::kHotwordAudioLoggingEnabled));
+  } else {
+    DCHECK(!profile->GetPrefs()->GetBoolean(
+        prefs::kHotwordAlwaysOnSearchEnabled));
+  }
+
+  if (retrain) {

[rpetterson, 2014/09/11 20:14:17]

Would the following be clearer?

LaunchMode launch_mode = HotwordService::HOTWORD_AND_AUDIO_HISTORY;
if (retrain)
  launch_mode = HotwordService::SPEECH_TRAINING;
else if (prefs::kHotwordAudioLoggingEnabled)
  launch_mode = HotwordService::HOTWORD_ONLY;
hotword_service->LaunchHotwordAudioVerificationApp(launch_mode);

[kcarattini, 2014/09/12 01:02:08]

Done.

+    hotword_service->LaunchHotwordAudioVerificationApp(
+        HotwordService::SPEECH_TRAINING);
+  } else if (profile->GetPrefs()->GetBoolean(
+      prefs::kHotwordAudioLoggingEnabled)) {
+    // TODO(kcarattini): Make sure the Chrome Audio Logging pref is synced
+    // to the account-level Audio History setting from footprints.
+    hotword_service->LaunchHotwordAudioVerificationApp(
+        HotwordService::HOTWORD_ONLY);
+  } else {
+    hotword_service->LaunchHotwordAudioVerificationApp(
+        HotwordService::HOTWORD_AND_AUDIO_HISTORY);
+  }
+}
+
 void BrowserOptionsHandler::HandleLaunchEasyUnlockSetup(
     const base::ListValue* args) {
   EasyUnlockService::Get(Profile::FromWebUI(web_ui()))->LaunchSetup();
 }
 
 void BrowserOptionsHandler::HandleRefreshExtensionControlIndicators(
     const base::ListValue* args) {
   SetupExtensionControlledIndicators();
 }
 
@@ skipping 245 matching lines @@
   extension = extensions::GetExtensionOverridingProxy(
       Profile::FromWebUI(web_ui()));
   AppendExtensionData("proxy", extension, &extension_controlled);
 
   web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators",
                                    extension_controlled);
 #endif  // defined(OS_WIN)
 }
 
 }  // namespace options