Content settings lists moved to sub-sub pages.

chrome/browser/resources/options/content_settings_exceptions_area.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.contentSettings', function() {
   const List = cr.ui.List;
   const ListItem = cr.ui.ListItem;
   const ArrayDataModel = cr.ui.ArrayDataModel;
   const DeletableItemList = options.DeletableItemList;
 
@@ skipping 291 matching lines @@
       // Empty edit - do nothing.
       if (newPattern == this.pattern && newSetting == this.setting)
         return;
 
       this.patternLabel.textContent = newPattern;
       this.settingLabel.textContent = this.settingForDisplay();
       var oldPattern = this.pattern;
       this.pattern = newPattern;
       this.setting = newSetting;
 
+      // TODO(estade): this will need to be updated if geolocation/notifications
+      // become editable.
       if (oldPattern != newPattern) {
         chrome.send('removeExceptions',
                     [this.contentType, this.mode, oldPattern]);
       }
 
       chrome.send('setException',
                   [this.contentType, this.mode, newPattern, newSetting]);
     }
   };
 
@@ skipping 72 matching lines @@
 
   ExceptionsList.prototype = {
     __proto__: DeletableItemList.prototype,
 
     /**
      * Called when an element is decorated as a list.
      */
     decorate: function() {
       DeletableItemList.prototype.decorate.call(this);
 
-      this.contentType = this.parentNode.getAttribute('contentType');
+      for (var parentNode = this.parentNode; parentNode;
+           parentNode = parentNode.parentNode) {
+        if (parentNode.hasAttribute('contentType')) {
+          this.contentType = parentNode.getAttribute('contentType');
+          break;
+        }
+      }
+
       this.mode = this.getAttribute('mode');
 
       var exceptionList = this;
       function handleBlur(e) {
         // When the blur event happens we do not know who is getting focus so we
         // delay this a bit until we know if the new focus node is outside the
         // list.
         var doc = e.target.ownerDocument;
         window.setTimeout(function() {
           var activeElement = doc.activeElement;
@@ skipping 80 matching lines @@
         // The null creates the Add New Exception row.
         this.dataModel = new ArrayDataModel([null]);
       } else {
         this.dataModel = new ArrayDataModel([]);
       }
     },
 
     /** @inheritDoc */
     deleteItemAtIndex: function(index) {
       var listItem = this.getListItemByIndex(index).contentItem;
+
       if (listItem.undeletable) {
         console.log('Tried to delete an undeletable row.');
         return;
       }
-      chrome.send(
-          'removeExceptions',
-          [listItem.contentType, listItem.mode, listItem.pattern]);
+
+      var dataItem = listItem.dataItem;
+      var args = [listItem.contentType];
+      if (listItem.contentType == 'location') {
+        args.push(dataItem['origin']);
+        args.push(dataItem['embeddingOrigin']);
+      } else if (listItem.contentType == 'notifications') {
+        args.push(dataItem['origin']);
+        args.push(dataItem['setting']);
+      } else {
+        args.push(listItem.mode);
+        args.push(listItem.pattern);
+      }
+
+      chrome.send('removeException', args);
     },
 
     /**
-     * Removes all selected rows from browser's model.
-     */
-    removeSelectedRows: function() {
-      // The first member is the content type; the rest of the values describe
-      // the patterns we are removing.
-      var args = [this.contentType];
-      var selectedItems = this.selectedItems;
-      for (var i = 0; i < selectedItems.length; i++) {
-        if (this.contentType == 'location') {
-          args.push(selectedItems[i]['origin']);
-          args.push(selectedItems[i]['embeddingOrigin']);
-        } else if (this.contentType == 'notifications') {
-          args.push(selectedItems[i]['origin']);
-          args.push(selectedItems[i]['setting']);
-        } else {
-          args.push(this.mode);
-          args.push(selectedItems[i]['displayPattern']);
-        }
-      }
-
-      chrome.send('removeExceptions', args);
-    },
-
-    /**
      * Puts the selected row in editing mode.
      */
     editSelectedRow: function() {
       var li = this.getListItem(this.selectedItem);
       if (li)
         li.editing = true;
     }
   };
 
+  var OptionsPage = options.OptionsPage;
+
+  function ContentSettingsExceptionsArea() {
+    OptionsPage.call(this, 'contentExceptions',
+                     '', 'contentSettingsExceptionsArea');
+  }
+
+  cr.addSingletonGetter(ContentSettingsExceptionsArea);
+
+  ContentSettingsExceptionsArea.prototype = {
+    __proto__: OptionsPage.prototype,
+
+    initializePage: function() {
+      OptionsPage.prototype.initializePage.call(this);
+
+      var exceptionsLists = this.pageDiv.querySelectorAll('list');
+      for (var i = 0; i < exceptionsLists.length; i++) {
+        options.contentSettings.ExceptionsList.decorate(exceptionsLists[i]);
+      }
+
+      this.addEventListener('visibleChange', function(event) {
+        for (var i = 0; i < exceptionsLists.length; i++) {
+          exceptionsLists[i].redraw();

[stuartmorgan, 2010/12/20 22:55:37]

Do you still need this? The expectation for autoexpanding lists is that redraw
shouldn't be necessary.

[Evan Stade, 2010/12/20 23:09:02]

I'll check

+        }
+      });
+
+      ContentSettingsExceptionsArea.hideOTRLists();
+    },
+
+    /**
+     * Shows one list and hides all others.
+     * @param {string} type The content type.
+     */
+    showList: function(type) {
+      var divs = this.pageDiv.querySelectorAll('div[contentType]');
+      for (var i = 0; i < divs.length; i++) {
+        if (divs[i].getAttribute('contentType') == type)
+          divs[i].classList.remove('hidden');
+        else
+          divs[i].classList.add('hidden');
+      }
+    },
+  };
+
+  /**
+   * Called when the last incognito window is closed.
+   */
+  ContentSettingsExceptionsArea.OTRProfileDestroyed = function() {
+    this.hideOTRLists();
+  };
+
+  /**
+   * Clears and hides the incognito exceptions lists.
+   */
+  ContentSettingsExceptionsArea.hideOTRLists = function() {
+    var otrLists = document.querySelectorAll('list[mode=otr]');
+
+    for (var i = 0; i < otrLists.length; i++) {
+      otrLists[i].reset();
+      otrLists[i].parentNode.classList.add('hidden');
+    }
+  };
+
   return {
     ExceptionsListItem: ExceptionsListItem,
     ExceptionsAddRowListItem: ExceptionsAddRowListItem,
     ExceptionsList: ExceptionsList,
+    ContentSettingsExceptionsArea: ContentSettingsExceptionsArea,
   };
 });