Support lists in <cr-settings-pref>

chrome/browser/resources/settings/prefs/prefs.js

 /* Copyright 2015 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. */
 
 /**
  * @fileoverview
  * 'cr-settings-prefs' models Chrome settings and preferences, listening for
  * changes to Chrome prefs whitelisted in chrome.settingsPrivate.
  * When changing prefs in this element's 'prefs' property via the UI, this
  * element tries to set those preferences in Chrome. Whether or not the calls to
@@ skipping 34 matching lines @@
 };
 
 /**
  * @constructor
  * @extends {PrefWrapper}
  * @param {!chrome.settingsPrivate.PrefObject} prefObj
  */
 function ListPrefWrapper(prefObj) {
   // Copy the array so changes to prefObj aren't reflected in this.value_.
   // TODO(michaelpg): Do a deep copy to support nested lists and objects.
-  this.value_ = prefObj.value.slice();
+  this.value_ = PrefWrapper.deepCopy(prefObj.value);
+//  this.value_ = prefObj.value.slice();
 }
 
   ListPrefWrapper.prototype = {
   __proto__: PrefWrapper.prototype,
 
   /**
    * Tests whether two ListPrefWrapper values contain the same list items.
    * @override
    */
   equals: function(other) {
-    'use strict';
     assert(this.key_ == other.key_);
-    if (this.value_.length != other.value_.length)
-      return false;
-    for (let i = 0; i < this.value_.length; i++) {
-      if (this.value_[i] != other.value_[i])
-        return false;
-    }
-    return true;
+    return PrefWrapper.objectsEqual(this.value_, other.value_);
+  },
+};
+
+/**
+ * @constructor
+ * @extends {PrefWrapper}
+ * @param {!chrome.settingsPrivate.PrefObject} prefObj
+ */
+function DictPrefWrapper(prefObj) {
+  // Copy the object so changes to prefObj aren't reflected in this.value_.
+  // TODO(michaelpg): Do a deep copy to support nested lists and objects.
+  this.value_ = prefObj.value.slice();
+}
+
+  DictPrefWrapper.prototype = {
+  __proto__: PrefWrapper.prototype,
+
+  /**
+   * Tests whether two DictPrefWrapper values contain the same list items.
+   * @override
+   */
+  equals: function(other) {
+    assert(this.key_ == other.key_);
+    return PrefWrapper.objectsEqual(this.value_, other.value_);
   },
 };
 
 (function() {
-  'use strict';
+'use strict';
+
+PrefWrapper.objectsEqual = function(obj1, obj2) {
+  if (Array.isArray(obj1)) {
+    if (!Array.isArray(obj2))
+      return false;
+    if (obj1.length != obj2.length)
+      return false;
+    if (obj1 == obj2) {
+      return true;
+    }
+    for (var i = 0; i < obj1.length; i++) {
+      if (!PrefWrapper.objectsEqual(obj1[i], obj2[i])) {
+        return false;
+      }
+      else if (typeof obj1[i] == 'object') {
+      }
+    }
+    return true;
+  }
+  if (typeof obj1 == 'object') {
+     var props1 = Object.keys(obj1);
+     var props2 = Object.keys(obj2);
+     if (props1.length != props2.length)
+       return false;
+     for (var prop of props1) {
+       if (!PrefWrapper.objectsEqual(obj1[prop], obj2[prop]))
+         return false;
+     }
+     return true;
+  }
+  return obj1 == obj2;
+};
+
+PrefWrapper.deepCopy = function(obj) {
+  if (Array.isArray(obj)) {
+    var copy = [];
+    for (let el of obj)
+      copy.push(PrefWrapper.deepCopy(el));
+    return copy;
+  }
+  if (typeof obj == 'object') {
+    var copy = {};
+    for (let prop in obj)
+      copy[prop] = PrefWrapper.deepCopy(obj[prop]);
+  }
+  return obj;
+};
+
 
   Polymer({
     is: 'cr-settings-prefs',
 
     properties: {
       /**
        * Object containing all preferences, for use by Polymer controls.
        */
       prefs: {
         type: Object,
@@ skipping 49 matching lines @@
       var prefWrapper = this.prefWrappers_[key];
       if (!prefWrapper)
         return;
 
       var prefObj = /** @type {chrome.settingsPrivate.PrefObject} */(
           this.get(key, this.prefs));
 
       // If settingsPrivate already has this value, do nothing. (Otherwise,
       // a change event from settingsPrivate could make us call
       // settingsPrivate.setPref and potentially trigger an IPC loop.)
-      if (prefWrapper.equals(this.createPrefWrapper_(prefObj)))
+      //
+      // this copy is a waste
+      if (PrefWrapper.objectsEqual(prefWrapper.value_, this.createPrefWrapper_(prefObj).value_)) {
         return;
+      }
 
       this.settingsApi_.setPref(
           key,
           prefObj.value,
           /* pageId */ '',
           /* callback */ this.setPrefCallback_.bind(this, key));
     },
 
     /**
      * Called when prefs in the underlying Chrome pref store are changed.
@@ skipping 104 matching lines @@
      * @return {PrefWrapper} An object containing a copy of the PrefObject's
      *     value.
      * @private
      */
     createPrefWrapper_: function(prefObj) {
       return prefObj.type == chrome.settingsPrivate.PrefType.LIST ?
           new ListPrefWrapper(prefObj) : new PrefWrapper(prefObj);
     },
   });
 })();