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

chrome/browser/resources/options/pref_ui.js

Index: chrome/browser/resources/options/pref_ui.js
===================================================================
--- chrome/browser/resources/options/pref_ui.js	(revision 57118)
+++ chrome/browser/resources/options/pref_ui.js	(working copy)
@@ -25,9 +25,11 @@
       // 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.
@@ -64,9 +66,12 @@
       // 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.
@@ -116,9 +121,11 @@
       // 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.
@@ -191,10 +198,13 @@
       // 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;
               }
@@ -274,9 +284,11 @@
       // 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.