Adds the audio history and always on hotwording settings.

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

Index: chrome/browser/ui/webui/options/browser_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index 5f6285b191c8f56231ec6a6df1f536f1a50b0544..57f0ce888964bc1be6373d4cf9f1f86bb48beece 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -277,6 +277,12 @@ void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) {
     { "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 },
@@ -1593,6 +1599,11 @@ void BrowserOptionsHandler::HandleRequestHotwordAvailable(
     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));