Consistently decorate pref values sent to the settings UI code

chrome/browser/resources/options2/pref_ui.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.
 
 // TODO(jhawkins): Add dialog-pref support to all preference controls.
 
 cr.define('options', function() {
 
   var Preferences = options.Preferences;
 
@@ skipping 37 matching lines @@
    * @param {!Event} event The pref change event.
    */
   function updateElementState_(el, event) {
     el.controlledBy = null;
 
     if (!event.value)
       return;
 
     updateDisabledState_(el, 'notUserModifiable', event.value.disabled);
 
-    el.controlledBy = event.value['controlledBy'];
+    el.controlledBy = event.value.controlledBy;
 
     OptionsPage.updateManagedBannerVisibility();
   }
 
   /////////////////////////////////////////////////////////////////////////////
   // PrefCheckbox class:
   // TODO(jhawkins): Refactor all this copy-pasted code!
 
   // Define a constructor that uses an input element as its underlying element.
   var PrefCheckbox = cr.ui.define('input');
@@ skipping 12 matching lines @@
      * Initialization function for the cr.ui framework.
      */
     decorate: function() {
       this.type = 'checkbox';
       var self = this;
 
       self.initializeValueType(self.getAttribute('value-type'));
 
       // Listen to pref changes.
       Preferences.getInstance().addEventListener(this.pref, function(event) {
-        var value = event.value && event.value['value'] != undefined ?
-            event.value['value'] : event.value;
-
-        self.prefValue_ = Boolean(value);
+        self.prefValue_ = Boolean(event.value.value);
         self.resetPrefState();
 
         updateElementState_(self, event);
       });
 
       // Listen to user events.
       this.addEventListener('change', function(e) {
         if (self.customChangeHandler(e))
           return;
 
@@ skipping 112 matching lines @@
      */
     decorate: function() {
       this.type = 'radio';
       var self = this;
 
       // Listen to preference changes.
       Preferences.getInstance().addEventListener(this.pref,
           function(event) {
             if (self.customChangeHandler(event))
               return;
-            var value = event.value && event.value['value'] != undefined ?
-                event.value['value'] : event.value;
-            self.checked = String(value) == self.value;
+            self.checked = String(event.value.value) == self.value;
             self.storedValue_ = self.checked;
 
             updateElementState_(self, event);
           });
 
       // Dialog preferences are not saved until savePrefState() is explicitly
       // called.
       if (!this.dialogPref)
         this.onchange = this.savePrefState.bind(this);
     },
@@ skipping 78 matching lines @@
 
     /**
      * Initialization function for the cr.ui framework.
      */
     decorate: function() {
       var self = this;
 
       // Listen to pref changes.
       Preferences.getInstance().addEventListener(this.pref,
           function(event) {
-            self.value = event.value && event.value['value'] != undefined ?
-                event.value['value'] : event.value;
+            self.value = event.value.value;
 
             updateElementState_(self, event);
           });
 
       // Listen to user events.
       this.addEventListener('change',
           function(e) {
             if (this.validity.valid) {
               Preferences.setIntegerPref(self.pref, self.value, self.metric);
             }
@@ skipping 100 matching lines @@
       this.onchange = this.onChange_.bind(this);
       this.onkeyup = this.onmouseup = this.onInputUp_.bind(this);
     },
 
     /**
      * Event listener that updates the UI when the underlying pref changes.
      * @param {Event} event The event that details the pref change.
      * @private
      */
     onPrefChange_: function(event) {
-      var value = event.value && event.value['value'] != undefined ?
-          event.value['value'] : event.value;
+      var value = event.value.value;
       if (value != undefined)
         this.value = this.valueMap ? this.valueMap.indexOf(value) : value;
     },
 
     /**
      * onchange handler that sets the pref when the user changes the value of
      * the input element.
      * @private
      */
     onChange_: function(event) {
@@ skipping 89 matching lines @@
     prefValue_: null,
 
     /**
     * Initialization function for the cr.ui framework.
     */
     decorate: function() {
       var self = this;
 
       // Listen to pref changes.
       Preferences.getInstance().addEventListener(this.pref, function(event) {
-        var value = event.value && event.value['value'] != undefined ?
-            event.value['value'] : event.value;
-
         // Make sure |value| is a string, because the value is stored as a
         // string in the HTMLOptionElement.
-        value = value.toString();
+        value = event.value.value.toString();
 
         updateElementState_(self, event);
         self.prefValue_ = value;
         self.resetPrefState();
       });
 
       // Listen to user events.
       this.addEventListener('change', function(event) {
         if (!self.dialogPref)
           self.updatePreference_(self.prefValue_);
@@ skipping 144 matching lines @@
 
     /**
      * Initialization function for the cr.ui framework.
      */
     decorate: function() {
       var self = this;
 
       // Listen to pref changes.
       Preferences.getInstance().addEventListener(this.pref,
           function(event) {
-            self.value = event.value && event.value['value'] != undefined ?
-                event.value['value'] : event.value;
+            self.value = event.value.value;
 
             updateElementState_(self, event);
 
             self.prefValue_ = self.value;
           });
 
       // Listen to user events.
       if (!this.dialogPref)
         this.addEventListener('change', this.savePrefState.bind(this));
 
@@ skipping 63 matching lines @@
 
       // Listen to pref changes. This element behaves like a normal button and
       // doesn't affect the underlying preference; it just becomes disabled
       // when the preference is managed, and its value is false.
       // This is useful for buttons that should be disabled when the underlying
       // boolean preference is set to false by a policy or extension.
       Preferences.getInstance().addEventListener(this.pref,
           function(event) {
             var e = {
               value: {
-                'disabled': event.value['disabled'] && !event.value['value'],
-                'controlledBy': event.value['controlledBy']
+                'disabled': event.value.disabled && !event.value.value,
+                'controlledBy': event.value.controlledBy
               }
             };
             updateElementState_(self, e);
           });
     },
 
     /**
      * See |updateDisabledState_| above.
      */
     setDisabled: function(reason, disabled) {
@@ skipping 20 matching lines @@
     PrefNumber: PrefNumber,
     PrefNumeric: PrefNumeric,
     PrefRadio: PrefRadio,
     PrefRange: PrefRange,
     PrefSelect: PrefSelect,
     PrefTextField: PrefTextField,
     PrefButton: PrefButton
   };
 
 });