[Hotword] Add error message display back in. Add error messages for NaCl. Add metrics for errors.

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.define('options', function() {
   var OptionsPage = options.OptionsPage;
   var ArrayDataModel = cr.ui.ArrayDataModel;
   var RepeatingButton = cr.ui.RepeatingButton;
   var HotwordSearchSettingIndicator = options.HotwordSearchSettingIndicator;
 
@@ skipping 160 matching lines @@
       Preferences.getInstance().addEventListener('homepage_is_newtabpage',
           this.onHomePageIsNtpChanged_.bind(this));
 
       $('change-home-page').onclick = function(event) {
         OptionsPage.navigateToPage('homePageOverlay');
         chrome.send('coreOptionsUserMetricsAction',
                     ['Options_Homepage_ShowSettings']);
       };
 
       chrome.send('requestHotwordAvailable');
+      var hotwordIndicator = $('hotword-search-setting-indicator');
+      HotwordSearchSettingIndicator.decorate(hotwordIndicator);
+      hotwordIndicator.disabledOnErrorSection = $('hotword-search-enable');
 
       if ($('set-wallpaper')) {
         $('set-wallpaper').onclick = function(event) {
           chrome.send('openWallpaperManager');
           chrome.send('coreOptionsUserMetricsAction',
                       ['Options_OpenWallpaperManager']);
         };
       }
 
       $('themes-gallery').onclick = function(event) {
@@ skipping 792 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 {string} opt_error The error message to display.
+     * @param {string} opt_help_link The link to a troubleshooting page.
      * @private
      */
-    showHotwordSection_: function(opt_error) {
+    showHotwordSection_: function(opt_error, opt_help_link) {
       $('hotword-search').hidden = false;
+      $('hotword-search-setting-indicator').errorText = opt_error;
+      $('hotword-search-setting-indicator').helpLink = opt_help_link;
     },
 
     /**
      * 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 815 matching lines @@
     BrowserOptions.getLoggedInUsername = function() {
       return BrowserOptions.getInstance().username_;
     };
   }
 
   // Export
   return {
     BrowserOptions: BrowserOptions
   };
 });