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

chrome/browser/resources/options/browser_options.js

 // 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.
 
 cr.exportPath('options');
 
 /**
  * @typedef {{actionLinkText: (string|undefined),
  *            hasError: (boolean|undefined),
  *            hasUnrecoverableError: (boolean|undefined),
@@ skipping 206 matching lines @@
           this.onHomePageChanged_.bind(this));
       Preferences.getInstance().addEventListener('homepage_is_newtabpage',
           this.onHomePageIsNtpChanged_.bind(this));
 
       $('change-home-page').onclick = function(event) {
         PageManager.showPageByName('homePageOverlay');
         chrome.send('coreOptionsUserMetricsAction',
                     ['Options_Homepage_ShowSettings']);
       };
 
-      var hotwordIndicator = $('hotword-search-setting-indicator');
-      HotwordSearchSettingIndicator.decorate(hotwordIndicator);
+      HotwordSearchSettingIndicator.decorate(
+          $('hotword-search-setting-indicator'));
+      HotwordSearchSettingIndicator.decorate(
+          $('hotword-no-dsp-search-setting-indicator'));
+      HotwordSearchSettingIndicator.decorate(
+          $('hotword-always-on-search-setting-indicator'));
       chrome.send('requestHotwordAvailable');
 
       if ($('set-wallpaper')) {
         $('set-wallpaper').onclick = function(event) {
           chrome.send('openWallpaperManager');
           chrome.send('coreOptionsUserMetricsAction',
                       ['Options_OpenWallpaperManager']);
         };
       }
 
@@ skipping 881 matching lines @@
         else
           this.hideSectionWithAnimation_(section, container);
       } else {
         section.hidden = !event.value.value;
         this.onShowHomeButtonChangedCalled_ = true;
       }
     },
 
     /**
      * Activates the Hotword section from the System settings page.
-     * @param {boolean} opt_enabled Current preference state for hotwording.
+     * @param {string} section_id The id of the section to display.

[Dan Beam, 2014/11/04 02:03:46]

jsVarsLikeThis, opt_varsIsSillyButPartOfTheStyleGuide

[kcarattini, 2014/11/04 06:01:21]

Done.

+     * @param {string} indicator_id The id of the indicator to display.
      * @param {string} opt_error The error message to display.

[Dan Beam, 2014/11/04 02:03:45]

this should only be opt_ if the type is string= (i.e. the argument could be
undefined).

if it can be undefined, change to

  @param {string=} opt_error

if it's not, change to

  @param {string} error

and do the same for showHotwordSection_ and showHotwordAlwaysOnSection_ and
showHotwordNoDspSection_

[kcarattini, 2014/11/04 06:01:20]

Done.

      * @private
      */
-    showHotwordSection_: function(opt_enabled, opt_error) {
-      $('hotword-search').hidden = false;
-      $('hotword-search-setting-indicator').setError(opt_error);
-      if (opt_enabled && opt_error)
-        $('hotword-search-setting-indicator').updateBasedOnError();
+    showHotwordCheckboxAndIndicator_: function(section_id, indicator_id,
+                                               opt_error) {
+      $(section_id).hidden = false;
+      $(indicator_id).setError(opt_error);
+      if (opt_error)
+        $(indicator_id).updateBasedOnError();
+    },
+
+    /**
+     * Activates the Hotword section from the System settings page.
+     * @param {string} opt_error The error message to display.

[Dan Beam, 2014/11/04 02:03:46]

string=

[kcarattini, 2014/11/04 06:01:20]

Done.

+     * @private
+     */
+    showHotwordSection_: function(opt_error) {
+      this.showHotwordCheckboxAndIndicator_('hotword-search',

[Dan Beam, 2014/11/04 02:03:46]

nit: wrap first arg, e.g.

  this.showHotwordCheckboxAndIndicator_(
      'hotword-search',
      'hotword-search-setting-indicator',
      opt_error);

[kcarattini, 2014/11/04 06:01:21]

Done.

+          'hotword-search-setting-indicator',
+          opt_error);
     },
 
     /**
      * Activates the Audio History and Always-On Hotword sections from the
      * System settings page.
+     * @param {string} opt_error The error message to display.
      * @private
      */
-    showHotwordAlwaysOnSection_: function() {
-      $('hotword-always-on-search').hidden = false;
+    showHotwordAlwaysOnSection_: function(opt_error) {
+      this.showHotwordCheckboxAndIndicator_('hotword-always-on-search',
+          'hotword-always-on-search-setting-indicator',
+          opt_error);
       $('audio-logging').hidden = false;
     },
 
     /**
      * Activates the Hotword section on devices with no DSP
      * from the System settings page.
+     * @param {string} opt_error The error message to display.
      * @private
      */
-    showHotwordNoDSPSection_: function() {
-      $('hotword-no-dsp-search').hidden = false;
+    showHotwordNoDSPSection_: function(opt_error) {

[Dan Beam, 2014/11/04 02:03:46]

nit: showHotwordNoDspSection_ (e.g. HttpUrl instead of HTTPURL)

[kcarattini, 2014/11/04 06:01:20]

Done.

+      this.showHotwordCheckboxAndIndicator_('hotword-no-dsp-search',
+          'hotword-no-dsp-search-setting-indicator',
+          opt_error);
     },
 
     /**
      * Event listener for the 'homepage is NTP' preference. Updates the label
      * next to the 'Change' button.
      * @param {Event} event The preference change event.
      */
     onHomePageIsNtpChanged_: function(event) {
       if (!event.value.uncommitted) {
         $('home-page-url').hidden = event.value.value;
@@ skipping 948 matching lines @@
       }
       button.textContent = loadTimeData.getString(strId);
     };
   }
 
   // Export
   return {
     BrowserOptions: BrowserOptions
   };
 });