Content settings lists moved to sub-sub pages.

chrome/browser/resources/options/content_settings.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', function() {
 
   var OptionsPage = options.OptionsPage;
 
   //////////////////////////////////////////////////////////////////////////////
   // ContentSettings class:
@@ skipping 11 matching lines @@
   cr.addSingletonGetter(ContentSettings);
 
   ContentSettings.prototype = {
     __proto__: OptionsPage.prototype,
 
     initializePage: function() {
       OptionsPage.prototype.initializePage.call(this);
 
       chrome.send('getContentFilterSettings');
 
-      var exceptionsLists = this.pageDiv.querySelectorAll('list');
-      for (var i = 0; i < exceptionsLists.length; i++) {
-        options.contentSettings.ExceptionsList.decorate(exceptionsLists[i]);
+      var exceptionsButtons =
+          this.pageDiv.querySelectorAll('.exceptionsListButton');
+      for (var i = 0; i < exceptionsButtons.length; i++) {
+        exceptionsButtons[i].onclick = function(event) {
+          ContentSettingsExceptionsArea.getInstance().showList(
+              event.target.getAttribute('contentType'));
+          OptionsPage.showPageByName('contentExceptions');
+        };
       }
-      ContentSettings.hideOTRLists();
-
-      this.addEventListener('visibleChange', function(event) {
-        for (var i = 0; i < exceptionsLists.length; i++) {
-          exceptionsLists[i].redraw();
-        }
-      });
 
       // Cookies filter page ---------------------------------------------------
       $('block-third-party-cookies').onclick = function(event) {
         chrome.send('setAllowThirdPartyCookies',
                     [String($('block-third-party-cookies').checked)]);
       };
 
       $('show-cookies-button').onclick = function(event) {
         chrome.send('coreOptionsUserMetricsAction', ['Options_ShowCookies']);
         OptionsPage.showPageByName('cookiesView');
       };
 
       $('plugins-tab').onclick = function(event) {
         chrome.send('openPluginsTab');
       };
 
       if (!templateData.enable_click_to_play)
         $('click_to_play').style.display = 'none';
     },
 
     /**
      * Handles a hash value in the URL (such as bar in
-     * chrome://options/foo#bar). Overrides the default action of showing an
-     * overlay by instead navigating to a particular subtab.
+     * chrome://options/foo#bar).
      * @param {string} hash The hash value.
      */
     handleHash: function(hash) {
-      // TODO(estade): show subpage for hash.
+      ContentSettingsExceptionsArea.getInstance().showList(hash);
+      OptionsPage.showPageByName('contentExceptions');
     },
   };
 
   /**
    * Sets the values for all the content settings radios.
    * @param {Object} dict A mapping from radio groups to the checked value for
    *     that group.
    */
   ContentSettings.setContentFilterSettingsValue = function(dict) {
     for (var group in dict) {
@@ skipping 21 matching lines @@
     exceptionsList.reset();
     for (var i = 0; i < list.length; i++) {
       exceptionsList.addException(list[i]);
     }
     exceptionsList.redraw();
   };
 
   ContentSettings.setOTRExceptions = function(type, list) {
     var exceptionsList =
         document.querySelector('div[contentType=' + type + ']' +
-                               ' div list[mode=normal]');
+                               ' list[mode=otr]');
 
     exceptionsList.parentNode.classList.remove('hidden');
 
     exceptionsList.reset();
     for (var i = 0; i < list.length; i++) {
       exceptionsList.addException(list[i]);
     }
     exceptionsList.redraw();
   };
 
   /**
-   * Called when the last incognito window is closed.
-   */
-  ContentSettings.OTRProfileDestroyed = function() {
-    this.hideOTRLists();
-  };
-
-  /**
-   * Clears and hides the incognito exceptions lists.
-   */
-  ContentSettings.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');
-    }
-  };
-
-  /**
    * Sets the initial value for the Third Party Cookies checkbox.
    * @param {boolean=} block True if we are blocking third party cookies.
    */
   ContentSettings.setBlockThirdPartyCookies = function(block) {
     $('block-third-party-cookies').checked = block;
   };
 
   /**
    * The browser's response to a request to check the validity of a given URL
    * pattern.
@@ skipping 10 matching lines @@
                                'list[mode=' + mode + ']');
     exceptionsList.patternValidityCheckComplete(pattern, valid);
   };
 
   // Export
   return {
     ContentSettings: ContentSettings
   };
 
 });