Tweak preference code to work with or without the 'managed' property, makes f...

chrome/browser/resources/options/pref_ui.js

 // Copyright (c) 2010 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 Preferences = options.Preferences;
   /////////////////////////////////////////////////////////////////////////////
   // PrefCheckbox class:
 
   // Define a constructor that uses an input element as its underlying element.
   var PrefCheckbox = cr.ui.define('input');
 
   PrefCheckbox.prototype = {
     // Set up the prototype chain
     __proto__: HTMLInputElement.prototype,
 
     /**
      * Initialization function for the cr.ui framework.
      */
     decorate: function() {
       this.type = 'checkbox';
       var self = this;
 
       // Listen to pref changes.
       Preferences.getInstance().addEventListener(this.pref,
           function(event) {
-            self.managed = event.value['managed']
+            self.checked = event.value['value'] ? event.value['value']
+                                                : event.value;
+            self.managed = event.value['managed'] ? event.value['managed']
+                                                  : false;
             self.disabled = self.managed;
-            self.checked = event.value['value'];
           });
 
       // Listen to user events.
       this.addEventListener('click',
           function(e) {
             Preferences.setBooleanPref(self.pref, self.checked);
           });
     }
   };
 
@@ skipping 16 matching lines @@
     /**
      * Initialization function for the cr.ui framework.
      */
     decorate: function() {
       this.type = 'radio';
       var self = this;
 
       // Listen to pref changes.
       Preferences.getInstance().addEventListener(this.pref,
           function(event) {
-            self.managed = event.value['managed']
+            var value = event.value['value'] ? event.value['value']
+                                             : event.value;
+            self.managed = event.value['managed'] ? event.value['managed']
+                                                  : false;
+            self.checked = String(value) == self.value;
             self.disabled = self.managed;
-            self.checked = String(event.value['value']) == self.value;
           });
 
       // Listen to user events.
       this.addEventListener('change',
           function(e) {
             if(self.value == 'true' || self.value == 'false') {
               Preferences.setBooleanPref(self.pref,
                   self.value == 'true');
             } else {
               Preferences.setIntegerPref(self.pref,
@@ skipping 29 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.managed = event.value['managed']
+            self.value = event.value['value'] ? event.value['value']
+                                              : event.value;
+            self.managed = event.value['managed'] ? event.value['managed']
+                                                  : false;
             self.disabled = self.managed;
-            self.value = event.value['value'];
           });
 
       // Listen to user events.
       this.addEventListener('change',
           function(e) {
             Preferences.setIntegerPref(self.pref, self.value);
           });
     }
   };
 
@@ skipping 52 matching lines @@
     __proto__: HTMLSelectElement.prototype,
 
     /**
     * Initialization function for the cr.ui framework.
     */
     decorate: function() {
       var self = this;
       // Listen to pref changes.
       Preferences.getInstance().addEventListener(this.pref,
           function(event) {
-            self.managed = event.value['managed']
+            var value = event.value['value'] ? event.value['value']
+                                             : event.value;
+            self.managed = event.value['managed'] ? event.value['managed']
+                                                  : false;
             self.disabled = self.managed;
             for (var i = 0; i < self.options.length; i++) {
-              if (self.options[i].value == event.value['value']) {
+              if (self.options[i].value == value) {
                 self.selectedIndex = i;
                 return;
               }
             }
             // Item not found, select first item.
             self.selectedIndex = 0;
           });
 
       // Listen to user events.
       this.addEventListener('change',
@@ skipping 59 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.managed = event.value['managed']
+            self.value = event.value['value'] ? event.value['value']
+                                              : event.value;
+            self.managed = event.value['managed'] ? event.value['managed']
+                                                  : false;
             self.disabled = self.managed;
-            self.value = event.value['value'];
           });
 
       // Listen to user events.
       this.addEventListener('change',
           function(e) {
             Preferences.setStringPref(self.pref, self.value);
           });
 
       window.addEventListener('unload',
           function() {
@@ skipping 15 matching lines @@
     PrefNumber: PrefNumber,
     PrefNumeric: PrefNumeric,
     PrefRadio: PrefRadio,
     PrefRange: PrefRange,
     PrefSelect: PrefSelect,
     PrefTextField: PrefTextField
   };
 
 });