options: fix content settings exceptions dialog regression.

chrome/browser/resources/options/content_settings.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() {
   /** @const */ var OptionsPage = options.OptionsPage;
 
   //////////////////////////////////////////////////////////////////////////////
   // ContentSettings class:
 
@@ skipping 97 matching lines @@
           'span.controlled-setting-indicator[content-setting=' + group + ']');
       if (indicators.length == 0)
         continue;
       // Create a synthetic pref change event decorated as
       // CoreOptionsHandler::CreateValueForPref() does.
       var event = new Event(group);
       event.value = {
         value: dict[group].value,
         controlledBy: controlledBy,
       };
-      for (var i = 0; i < indicators.length; i++)
+      for (var i = 0; i < indicators.length; i++) {
         indicators[i].handlePrefChange(event);
+      }
     }
   };
 
   /**
    * Updates the labels and indicators for the Media settings. Those require
    * special handling because they are backed by multiple prefs and can change
    * their scope based on the managed state of the backing prefs.
    * @param {Object} mediaSettings A dictionary containing the following fields:
    *     {String} askText The label for the ask radio button.
    *     {String} blockText The label for the block radio button.
@@ skipping 30 matching lines @@
 
     $('media-indicator').handlePrefChange(event);
   };
 
   /**
    * Initializes an exceptions list.
    * @param {string} type The content type that we are setting exceptions for.
    * @param {Array} list An array of pairs, where the first element of each pair
    *     is the filter string, and the second is the setting (allow/block).
    */
   ContentSettings.setExceptions = function(type, list) {

[Evan Stade, 2014/05/02 01:18:33]

s/list/exceptions please

[Dan Beam, 2014/05/02 18:28:05]

Done.

-    var exceptionsList =
-        document.querySelector('div[contentType=' + type + ']' +
-                               ' list[mode=normal]');
-    exceptionsList.setExceptions(list);
+    this.getExceptionsList(type, 'normal').setExceptions(list);
   };
 
   ContentSettings.setHandlers = function(list) {
     $('handlers-list').setHandlers(list);
   };
 
   ContentSettings.setIgnoredHandlers = function(list) {
     $('ignored-handlers-list').setHandlers(list);
   };
 
   ContentSettings.setOTRExceptions = function(type, list) {

[Evan Stade, 2014/05/02 01:18:33]

ditto

[Dan Beam, 2014/05/02 18:28:05]

Done.

-    var exceptionsList =
-        document.querySelector('div[contentType=' + type + ']' +
-                               ' list[mode=otr]');
-
+    var exceptionsList = this.getExceptionsList(type, 'otr');
     exceptionsList.parentNode.hidden = false;
     exceptionsList.setExceptions(list);
   };
 
   /**
+   * @param {string} type The type of exceptions (e.g. "location") to get.
+   * @param {string} mode The mode of the desired exceptions list (e.g. otr).
+   * @return {?ExceptionsList} The corresponding exceptions list or null.
+   */
+  ContentSettings.getExceptionsList = function(type, mode) {
+    return document.querySelector(
+        'div[contentType=' + type + '] list[mode=' + mode + ']');
+  };
+
+  /**
    * The browser's response to a request to check the validity of a given URL
    * pattern.
    * @param {string} type The content type.
    * @param {string} mode The browser mode.
    * @param {string} pattern The pattern.
    * @param {bool} valid Whether said pattern is valid in the context of
    *     a content exception setting.
    */
   ContentSettings.patternValidityCheckComplete =
       function(type, mode, pattern, valid) {
-    var exceptionsList =
-        document.querySelector('div[contentType=' + type + '] ' +
-                               'list[mode=' + mode + ']');
-    exceptionsList.patternValidityCheckComplete(pattern, valid);
+    this.getExceptionsList(type, mode).patternValidityCheckComplete(pattern,
+                                                                    valid);
   };
 
   /**
    * Shows/hides the link to the Pepper Flash camera and microphone default
    * settings.
    * Please note that whether the link is actually showed or not is also
    * affected by the style class pepper-flash-settings.
    */
   ContentSettings.showMediaPepperFlashDefaultLink = function(show) {
     $('media-pepper-flash-default').hidden = !show;
-  }
+  };
 
   /**
    * Shows/hides the link to the Pepper Flash camera and microphone
    * site-specific settings.
    * Please note that whether the link is actually showed or not is also
    * affected by the style class pepper-flash-settings.
    */
   ContentSettings.showMediaPepperFlashExceptionsLink = function(show) {
     $('media-pepper-flash-exceptions').hidden = !show;
-  }
+  };
 
   /**
    * Shows/hides the whole Web MIDI settings.
    * @param {bool} show Wether to show the whole Web MIDI settings.
    */
   ContentSettings.showExperimentalWebMIDISettings = function(show) {
     $('experimental-web-midi-settings').hidden = !show;
-  }
+  };
 
   /**
    * Updates the microphone/camera devices menu with the given entries.
    * @param {string} type The device type.
    * @param {Array} devices List of available devices.
    * @param {string} defaultdevice The unique id of the current default device.
    */
   ContentSettings.updateDevicesMenu = function(type, devices, defaultdevice) {
     var deviceSelect = '';
     if (type == 'mic') {
@@ skipping 20 matching lines @@
     if (defaultIndex >= 0)
       deviceSelect.selectedIndex = defaultIndex;
   };
 
   /**
    * Enables/disables the protected content exceptions button.
    * @param {bool} enable Whether to enable the button.
    */
   ContentSettings.enableProtectedContentExceptions = function(enable) {
     var exceptionsButton = $('protected-content-exceptions');
-    if (exceptionsButton) {
+    if (exceptionsButton)
       exceptionsButton.disabled = !enable;
-    }
-  }
+  };
 
   /**
    * Set the default microphone device based on the popup selection.
    * @private
    */
   ContentSettings.setDefaultMicrophone_ = function() {
     var deviceSelect = $('media-select-mic');
     chrome.send('setDefaultCaptureDevice', ['mic', deviceSelect.value]);
   };
 
   /**
    * Set the default camera device based on the popup selection.
    * @private
    */
   ContentSettings.setDefaultCamera_ = function() {
     var deviceSelect = $('media-select-camera');
     chrome.send('setDefaultCaptureDevice', ['camera', deviceSelect.value]);
   };
 
   // Export
   return {
     ContentSettings: ContentSettings
   };
 
 });