Merge 132375 - Fix cookies list.

chrome/browser/resources/options2/cookies_list.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.
 
 cr.define('options', function() {
   /** @const */ var DeletableItemList = options.DeletableItemList;
   /** @const */ var DeletableItem = options.DeletableItem;
   /** @const */ var ArrayDataModel = cr.ui.ArrayDataModel;
   /** @const */ var ListSingleSelectionModel = cr.ui.ListSingleSelectionModel;
 
@@ skipping 596 matching lines @@
    */
   var CookiesList = cr.ui.define('list');
 
   CookiesList.prototype = {
     __proto__: DeletableItemList.prototype,
 
     /** @inheritDoc */
     decorate: function() {
       DeletableItemList.prototype.decorate.call(this);
       this.classList.add('cookie-list');
-      this.data_ = [];
-      this.dataModel = new ArrayDataModel(this.data_);
+      this.dataModel = new ArrayDataModel([]);
       this.addEventListener('keydown', this.handleKeyLeftRight_.bind(this));
       var sm = new ListSingleSelectionModel();
       sm.addEventListener('change', this.cookieSelectionChange_.bind(this));
       sm.addEventListener('leadIndexChange', this.cookieLeadChange_.bind(this));
       this.selectionModel = sm;
       this.infoNodes = {};
       this.fixedHeight = false;
       var doc = this.ownerDocument;
       // Create a table for each type of site data (e.g. cookies, databases,
       // etc.) and save it so that we can reuse it for all origins.
@@ skipping 103 matching lines @@
       // We use the cached expanded item in order to allow it to maintain some
       // state (like its fixed height, and which bubble is selected).
       if (this.expandedItem && this.expandedItem.origin == data)
         return this.expandedItem;
       return new CookieListItem(data, this);
     },
 
     // from options.DeletableItemList
     /** @inheritDoc */
     deleteItemAtIndex: function(index) {
-      var item = this.data_[index];
+      var item = this.dataModel.item(index);
       if (item) {
         var pathId = item.pathId;
         if (pathId)
           chrome.send('removeCookie', [pathId]);
       }
     },
 
     /**
      * Insert the given list of cookie tree nodes at the given index.
      * Both CookiesList and CookieTreeNode implement this API.
      * @param {Array.<Object>} data The data objects for the nodes to add.
      * @param {number} start The index at which to start inserting the nodes.
      */
     insertAt: function(data, start) {
       spliceTreeNodes(data, start, this.dataModel);
     },
 
     /**
      * Remove a cookie tree node from the given index.
      * Both CookiesList and CookieTreeNode implement this API.
      * @param {number} index The index of the tree node to remove.
      */
     remove: function(index) {
-      if (index < this.data_.length)
+      if (index < this.dataModel.length)
         this.dataModel.splice(index, 1);
     },
 
     /**
      * Clears the list.
      * Both CookiesList and CookieTreeNode implement this API.
      * It is used by CookiesList.loadChildren().
      */
     clear: function() {
       parentLookup = {};
-      this.data_ = [];
-      this.dataModel = new ArrayDataModel(this.data_);
+      this.dataModel.splice(0, this.dataModel.length);
       this.redraw();
     },
 
     /**
      * Add tree nodes by given parent.
      * @param {Object} parent The parent node.
      * @param {number} start The index at which to start inserting the nodes.
      * @param {Array} nodesData Nodes data array.
      * @private
      */
@@ skipping 57 matching lines @@
       parent.clear();
       this.addByParent_(parent, 0, children);
       parent.endBatchUpdates();
     },
   };
 
   return {
     CookiesList: CookiesList
   };
 });