[MD settings] content settings add site button; layout fixes

chrome/browser/resources/settings/site_settings/site_list.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.
 
 /**
  * Enumeration mapping all possible controlled-by values for exceptions to
  * icons.
  * @enum {string}
  */
 var iconControlledBy = {
@@ skipping 151 matching lines @@
    */
   configureWidget_: function() {
     // The observer for All Sites fires before the attached/ready event, so
     // initialize this here.
     if (this.browserProxy_ === undefined) {
       this.browserProxy_ =
           settings.SiteSettingsPrefsBrowserProxyImpl.getInstance();
     }
 
     this.setUpActionMenu_();
-    this.ensureOpened_();
     this.populateList_();
   },
 
   /**
-   * Ensures the widget is |opened| when needed when displayed initially.
-   * @private
-   */
-  ensureOpened_: function() {
-    // Allowed list and Clear on Exit lists are always shown opened by default
-    // and All Sites is presented all in one list (nothing closed by default).
-    if (this.allSites ||

[dpapad, 2016/10/19 19:40:13]

Are we removing the all sites view in this CL?

[dschuyler, 2016/10/20 00:06:09]

We put all sites behind a flag in an earlier CL.
In this CL we are removing category.opened, so the status
of this.allSites is no longer valuable to test (since 
the effect would be ignored).

-        this.categorySubtype == settings.PermissionValues.ALLOW ||
-        this.categorySubtype == settings.PermissionValues.SESSION_ONLY) {
-      this.$.category.opened = true;
-      return;
-    }
-
-    // Block list should only be shown opened if there is nothing to show in
-    // the other lists.
-    if (this.category != settings.INVALID_CATEGORY_SUBTYPE) {
-      this.browserProxy_.getExceptionList(this.category).then(
-        function(exceptionList) {
-          var othersExists = exceptionList.some(function(exception) {
-            return exception.setting == settings.PermissionValues.ALLOW ||
-                exception.setting == settings.PermissionValues.SESSION_ONLY;
-          });
-          if (othersExists)
-            return;
-          this.$.category.opened = true;
-      }.bind(this));
-    } else {
-      this.$.category.opened = true;
-    }
-  },
-
-  /**
    * Returns which icon, if any, should represent the fact that this exception
    * is controlled.
    * @param {!SiteException} item The item from the list we're computing the
    *    icon for.
    * @return {string} The icon to show (or blank, if none).
    */
   computeIconControlledBy_: function(item) {
     if (this.allSites)
       return '';
     return iconControlledBy[item.source] || '';
@@ skipping 27 matching lines @@
     this.shadowRoot.appendChild(dialog);
 
     dialog.open(this.categorySubtype);
 
     dialog.addEventListener('close', function() {
       dialog.remove();
     });
   },
 
   /**
-   * Handles the expanding and collapsing of the sites list.
-   * @private
-   */
-  onToggle_: function(e) {
-    if (this.$.category.opened)
-      this.$.icon.icon = 'cr:expand-less';
-    else
-      this.$.icon.icon = 'cr:expand-more';
-  },
-
-  /**
    * Populate the sites list for display.
    * @private
    */
   populateList_: function() {
     if (this.allSites) {
       this.getAllSitesList_().then(function(lists) {
         this.processExceptions_(lists);
       }.bind(this));
     } else {
       this.browserProxy_.getExceptionList(this.category).then(
@@ skipping 243 matching lines @@
     // is redundant to also list all the sites that are blocked.
     if (this.isAllowList_())
       return true;
 
     if (this.isSessionOnlyList_())
       return siteList.length > 0;
 
     return toggleState;
   },
 });