Merge Chromium at r65505: Initial merge by git.

Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45

1 files changed, 32 insertions, 26 deletions

diff --git a/chrome/browser/resources/options/content_settings.js b/chrome/browser/resources/options/content_settings.js
index 37dec2b..1a0c89b 100644
--- a/chrome/browser/resources/options/content_settings.js
+++ b/chrome/browser/resources/options/content_settings.js
@@ -29,33 +29,23 @@ cr.define('options', function() {
 
       chrome.send('getContentFilterSettings');
 
-      // Exceptions lists. -----------------------------------------------------
-      function handleExceptionsLinkClickEvent(event) {
-        var exceptionsArea = event.target.parentNode.
-            querySelector('div[contentType][mode=normal]');
-        exceptionsArea.classList.toggle('hidden');
-        exceptionsArea.querySelector('list').redraw();
-
-        var otrExceptionsArea = event.target.parentNode.
-            querySelector('div[contentType][mode=otr]');
-        if (otrExceptionsArea && otrExceptionsArea.otrProfileExists) {
-          otrExceptionsArea.classList.toggle('hidden');
-          otrExceptionsArea.querySelector('list').redraw();
-        }
-
-        return false;
-      }
-      var exceptionsLinks =
-          this.pageDiv.querySelectorAll('.exceptionsLink');
-      for (var i = 0; i < exceptionsLinks.length; i++) {
-        exceptionsLinks[i].onclick = handleExceptionsLinkClickEvent;
-      }
-
       var exceptionsAreas = this.pageDiv.querySelectorAll('div[contentType]');
       for (var i = 0; i < exceptionsAreas.length; i++) {
         options.contentSettings.ExceptionsArea.decorate(exceptionsAreas[i]);
       }
 
+      cr.ui.decorate('.zippy', options.Zippy);
+      this.pageDiv.addEventListener('measure', function(e) {
+        if (e.target.classList.contains('zippy')) {
+          var lists = e.target.querySelectorAll('list');
+          for (var i = 0; i < lists.length; i++) {
+            if (lists[i].redraw) {
+              lists[i].redraw();
+            }
+          }
+        }
+      });
+
       // Cookies filter page ---------------------------------------------------
       $('block-third-party-cookies').onclick = function(event) {
         chrome.send('setAllowThirdPartyCookies',
@@ -116,6 +106,18 @@ cr.define('options', function() {
         document.querySelector('div[contentType=' + type + '][mode=otr]');
     exceptionsArea.otrProfileExists = true;
 
+    // Find the containing zippy, set it to show OTR profiles, and remeasure it
+    // to make it smoothly animate to the new size.
+    var zippy = exceptionsArea;
+    while (zippy &&
+           (!zippy.classList || !zippy.classList.contains('zippy'))) {
+      zippy = zippy.parentNode;
+    }
+    if (zippy) {
+      zippy.classList.add('show-otr');
+      zippy.remeasure();
+    }
+
     var exceptionsList = exceptionsArea.querySelector('list');
     exceptionsList.clear();
     for (var i = 0; i < list.length; i++) {
@@ -128,7 +130,6 @@ cr.define('options', function() {
     var parentExceptionsArea =
         document.querySelector('div[contentType=' + type + '][mode=normal]');
     if (!parentExceptionsArea.classList.contains('hidden')) {
-      exceptionsArea.classList.remove('hidden');
       exceptionsArea.querySelector('list').redraw();
     }
   };
@@ -137,12 +138,18 @@ cr.define('options', function() {
    * Clears and hides the incognito exceptions lists.
    */
   ContentSettings.OTRProfileDestroyed = function() {
+    // Find all zippies, set them to hide OTR profiles, and remeasure them
+    // to make them smoothly animate to the new size.
+    var zippies = document.querySelectorAll('.zippy');
+    for (var i = 0; i < zippies.length; i++) {
+      zippies[i].classList.remove('show-otr');
+      zippies[i].remeasure();
+    }
+
     var exceptionsAreas =
         document.querySelectorAll('div[contentType][mode=otr]');
-
     for (var i = 0; i < exceptionsAreas.length; i++) {
       exceptionsAreas[i].otrProfileExists = false;
-      exceptionsAreas[i].classList.add('hidden');
       exceptionsAreas[i].querySelector('list').clear();
     }
   };
@@ -178,4 +185,3 @@ cr.define('options', function() {
   };
 
 });
-