Add error indicators to always-on andno-dsp hotword checkboxes.

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 1603 matching lines @@
       CURRENT_TAB, ui::PAGE_TRANSITION_LINK, false);
   web_ui()->GetWebContents()->OpenURL(params);
 }
 
 #endif
 
 void BrowserOptionsHandler::HandleRequestHotwordAvailable(
     const base::ListValue* args) {
   Profile* profile = Profile::FromWebUI(web_ui());
   std::string group = base::FieldTrialList::FindFullName("VoiceTrigger");
-  base::FundamentalValue enabled(
-      profile->GetPrefs()->GetBoolean(prefs::kHotwordSearchEnabled));
   if (group != "" && group != "Disabled" &&
       HotwordServiceFactory::IsHotwordAllowed(profile)) {
     // Update the current error value.
     HotwordServiceFactory::IsServiceAvailable(profile);
     int error = HotwordServiceFactory::GetCurrentError(profile);
+
+    std::string fcn_name;

[rpetterson, 2014/11/03 18:14:16]

what does "fcn" stand for? maybe a name that makes it clearer what it is?

[kcarattini, 2014/11/03 23:39:24]

Done.

     if (CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kEnableExperimentalHotwording)) {
       if (HotwordServiceFactory::IsHotwordHardwareAvailable()) {
-        web_ui()->CallJavascriptFunction(
-            "BrowserOptions.showHotwordAlwaysOnSection");
+        fcn_name = "BrowserOptions.showHotwordAlwaysOnSection";
       } else {
-        web_ui()->CallJavascriptFunction(
-            "BrowserOptions.showHotwordNoDSPSection");
+        fcn_name = "BrowserOptions.showHotwordNoDSPSection";
       }
-    } else if (!error) {
-      web_ui()->CallJavascriptFunction("BrowserOptions.showHotwordSection",
-                                       enabled);
+    } else {
+      fcn_name = "BrowserOptions.showHotwordSection";
+    }
+
+    if (!error) {
+      web_ui()->CallJavascriptFunction(fcn_name);
     } else {
       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));
       }
-      web_ui()->CallJavascriptFunction("BrowserOptions.showHotwordSection",
-                                       enabled, error_message);
+      web_ui()->CallJavascriptFunction(fcn_name, error_message);
     }
   }
 }
 
 void BrowserOptionsHandler::HandleLaunchHotwordAudioVerificationApp(
     const base::ListValue* args) {
   Profile* profile = Profile::FromWebUI(web_ui());
 
   bool retrain = false;
   bool success = args->GetBoolean(0, &retrain);
@@ skipping 322 matching lines @@
 
 void BrowserOptionsHandler::SetMetricsReportingCheckbox(bool checked,
                                                         bool disabled) {
   web_ui()->CallJavascriptFunction(
       "BrowserOptions.setMetricsReportingCheckboxState",
       base::FundamentalValue(checked),
       base::FundamentalValue(disabled));
 }
 
 }  // namespace options