Adds the audio history and always on hotwording settings.

chrome/browser/ui/webui/options/browser_options_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

[Matt Giuca, 2014/08/12 08:37:39]

Don't know where to put this comment but: I have a crash opening the settings
page on Linux (non-ChromeOS) after compiling this patch. Please investigate.

[kcarattini, 2014/08/13 03:51:54]

Is this still happening for you? I can't reproduce after the updates.

[Matt Giuca, 2014/08/13 05:21:09]

Yep, it's fixed; it was probably my fault (when I quick-fixed it yesterday to
get it compiling on non-ChromeOS builds, I disabled the pref registration but
something was still looking for that pref -- now the pref is available on all
builds).

 // 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 "apps/app_window.h"
 #include "apps/app_window_registry.h"
@@ skipping 258 matching lines @@
     { "fontSizeLabelLarge", IDS_OPTIONS_FONT_SIZE_LABEL_LARGE },
     { "fontSizeLabelMedium", IDS_OPTIONS_FONT_SIZE_LABEL_MEDIUM },
     { "fontSizeLabelSmall", IDS_OPTIONS_FONT_SIZE_LABEL_SMALL },
     { "fontSizeLabelVeryLarge", IDS_OPTIONS_FONT_SIZE_LABEL_VERY_LARGE },
     { "fontSizeLabelVerySmall", IDS_OPTIONS_FONT_SIZE_LABEL_VERY_SMALL },
     { "hideAdvancedSettings", IDS_SETTINGS_HIDE_ADVANCED_SETTINGS },
     { "homePageNtp", IDS_OPTIONS_HOMEPAGE_NTP },
     { "homePageShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON },
     { "homePageUseNewTab", IDS_OPTIONS_HOMEPAGE_USE_NEWTAB },
     { "homePageUseURL", IDS_OPTIONS_HOMEPAGE_USE_URL },
+    { "hotwordAlwaysOnSearchEnable", IDS_HOTWORD_ALWAYS_ON_SEARCH_PREF_CHKBOX },
+    { "hotwordAlwaysOnSearchDescription",
+      IDS_HOTWORD_ALWAYS_ON_SEARCH_PREF_DESCRIPTION },
+    { "hotwordAudioHistoryEnable", IDS_HOTWORD_AUDIO_HISTORY_PREF_CHKBOX },
+    { "hotwordAudioHistoryDescription",
+      IDS_HOTWORD_AUDIO_HISTORY_PREF_DESCRIPTION },
     { "hotwordSearchEnable", IDS_HOTWORD_SEARCH_PREF_CHKBOX },
     { "hotwordConfirmEnable", IDS_HOTWORD_CONFIRM_BUBBLE_ENABLE },
     { "hotwordConfirmDisable", IDS_HOTWORD_CONFIRM_BUBBLE_DISABLE },
     { "hotwordConfirmMessage", IDS_HOTWORD_SEARCH_PREF_DESCRIPTION },
     { "hotwordAudioLoggingEnable", IDS_HOTWORD_AUDIO_LOGGING_ENABLE },
     { "importData", IDS_OPTIONS_IMPORT_DATA_BUTTON },
     { "improveBrowsingExperience", IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE },
     { "languageAndSpellCheckSettingsButton",
       IDS_OPTIONS_SETTINGS_LANGUAGE_AND_INPUT_SETTINGS },
     { "linkDoctorPref", IDS_OPTIONS_LINKDOCTOR_PREF },
@@ skipping 1295 matching lines @@
 void BrowserOptionsHandler::HandleRequestHotwordAvailable(
     const base::ListValue* args) {
   Profile* profile = Profile::FromWebUI(web_ui());
   std::string group = base::FieldTrialList::FindFullName("VoiceTrigger");
   if (group != "" && group != "Disabled" &&
       HotwordServiceFactory::IsHotwordAllowed(profile)) {
     // Update the current error value.
     HotwordServiceFactory::IsServiceAvailable(profile);
     int error = HotwordServiceFactory::GetCurrentError(profile);
     if (!error) {
       web_ui()->CallJavascriptFunction("BrowserOptions.showHotwordSection");

[Matt Giuca, 2014/08/12 08:37:39]

While you're here: there's a little "bug" here that |enabled| is not passed to
showHotwordSection in the non-error case. Technically it doesn't matter, because
showHotwordSection ignores |enabled| if |error_message| is undefined, but it's
still good to pass the correct argument values.

Could you move GetBoolean(prefs::kHotwordSearchEnabled) up above this if
statement, and pass |enabled| as an argument here. Thanks.

[kcarattini, 2014/08/13 03:51:53]

Done.

+      if (CommandLine::ForCurrentProcess()->HasSwitch(

[Matt Giuca, 2014/08/12 08:37:39]

This should not be here -- move it after this if/else statement. (It should be
shown in the error case too.)

Note that *before* my CL (https://codereview.chromium.org/463823002/) these new
checkboxes should be greyed out in the error case, but after my CL, it is fine
to leave them enabled.

[kcarattini, 2014/08/13 03:51:54]

Done.

+          switches::kEnableExperimentalHotwording)) {
+        web_ui()->CallJavascriptFunction(
+            "BrowserOptions.showHotwordAlwaysOnSection");
+      }
     } else {
       base::FundamentalValue enabled(
           profile->GetPrefs()->GetBoolean(prefs::kHotwordSearchEnabled));
       base::string16 hotword_help_url =
           base::ASCIIToUTF16(chrome::kHotwordLearnMoreURL);
       base::StringValue error_message(l10n_util::GetStringUTF16(error));
       if (error == IDS_HOTWORD_GENERIC_ERROR_MESSAGE) {
         error_message = base::StringValue(
             l10n_util::GetStringFUTF16(error, hotword_help_url));
       }
@@ skipping 260 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