Merge Chromium at r65505: Initial merge by git.

Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45

1 files changed, 16 insertions, 11 deletions

diff --git a/chrome/browser/resources/options/pref_ui.js b/chrome/browser/resources/options/pref_ui.js
index a0a656a..4f76bc9 100644
--- a/chrome/browser/resources/options/pref_ui.js
+++ b/chrome/browser/resources/options/pref_ui.js
@@ -25,10 +25,10 @@ cr.define('options', function() {
       // Listen to pref changes.
       Preferences.getInstance().addEventListener(this.pref,
           function(event) {
-            var value = (event.value && event.value['value'] != undefined) ?
+            var value = event.value && event.value['value'] != undefined ?
                 event.value['value'] : event.value;
             self.checked = Boolean(value);
-            self.managed = (event.value && event.value['managed'] != undefined) ?
+            self.managed = event.value && event.value['managed'] != undefined ?
                 event.value['managed'] : false;
             self.disabled = self.managed;
           });
@@ -42,7 +42,7 @@ cr.define('options', function() {
                     Number(self.checked), self.metric);
                 break;
               case 'boolean':
-                Preferences.setBooleanPref(self.pref, self.checked,
+                Preferences.setBooleanPref(self.pref,
                     self.checked, self.metric);
                 break;
             }
@@ -96,9 +96,9 @@ cr.define('options', function() {
       // Listen to pref changes.
       Preferences.getInstance().addEventListener(this.pref,
           function(event) {
-            var value = (event.value && event.value['value'] != undefined) ?
+            var value = event.value && event.value['value'] != undefined ?
                 event.value['value'] : event.value;
-            self.managed = (event.value && event.value['managed'] != undefined) ?
+            self.managed = event.value && event.value['managed'] != undefined ?
                 event.value['managed'] : false;
             self.checked = String(value) == self.value;
             self.disabled = self.managed;
@@ -156,9 +156,9 @@ cr.define('options', function() {
       // Listen to pref changes.
       Preferences.getInstance().addEventListener(this.pref,
           function(event) {
-            self.value = (event.value && event.value['value'] != undefined) ?
+            self.value = event.value && event.value['value'] != undefined ?
                 event.value['value'] : event.value;
-            self.managed = (event.value && event.value['managed'] != undefined) ?
+            self.managed = event.value && event.value['managed'] != undefined ?
                 event.value['managed'] : false;
             self.disabled = self.managed;
           });
@@ -268,11 +268,16 @@ cr.define('options', function() {
       // Listen to pref changes.
       Preferences.getInstance().addEventListener(this.pref,
           function(event) {
-            var value = (event.value && event.value['value'] != undefined) ?
+            var value = event.value && event.value['value'] != undefined ?
                 event.value['value'] : event.value;
-            self.managed = (event.value && event.value['managed'] != undefined) ?
+            self.managed = event.value && event.value['managed'] != undefined ?
                 event.value['managed'] : false;
             self.disabled = self.managed;
+            // Honor manually_disabled property, so options pages can
+            // disable preferences manually when needed.
+            if (self.manually_disabled) {
+              self.disabled = true;
+            }
             for (var i = 0; i < self.options.length; i++) {
               if (self.options[i].value == value) {
                 self.selectedIndex = i;
@@ -360,9 +365,9 @@ cr.define('options', function() {
       // Listen to pref changes.
       Preferences.getInstance().addEventListener(this.pref,
           function(event) {
-            self.value = (event.value && event.value['value'] != undefined) ?
+            self.value = event.value && event.value['value'] != undefined ?
                 event.value['value'] : event.value;
-            self.managed = (event.value && event.value['managed'] != undefined) ?
+            self.managed = event.value && event.value['managed'] != undefined ?
                 event.value['managed'] : false;
             self.disabled = self.managed;
           });