[MD settings] separate all-sites from site-list

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.
 
 /**
  * @fileoverview
  * 'site-list' shows a list of Allowed and Blocked sites for a given
  * category.
  */
 Polymer({
@@ skipping 38 matching lines @@
      * @type {!Array<SiteException>}
      */
     sites: {
       type: Array,
       value: function() {
         return [];
       },
     },
 
     /**
-     * Whether this list is for the All Sites category.
-     */
-    allSites: {
-      type: Boolean,
-      value: false,
-    },
-
-    /**
      * The type of category this widget is displaying data for. Normally
      * either 'allow' or 'block', representing which sites are allowed or
      * blocked respectively.
      */
     categorySubtype: {
       type: String,
       value: settings.INVALID_CATEGORY_SUBTYPE,
     },
 
     /**
@@ skipping 47 matching lines @@
         this.onIncognitoStatusChanged_.bind(this));
   },
 
   /**
    * Called when a site changes permission.
    * @param {string} category The category of the site that changed.
    * @param {string} site The site that changed.
    * @private
    */
   siteWithinCategoryChanged_: function(category, site) {
-    if (category == this.category || this.allSites)
+    if (category == this.category)
       this.configureWidget_();
   },
 
   /**
    * Called for each site list when incognito is enabled or disabled. Only
    * called on change (opening N incognito windows only fires one message).
    * Another message is sent when the *last* incognito window closes.
    * @private
    */
   onIncognitoStatusChanged_: function() {
@@ skipping 40 matching lines @@
 
   /**
    * @param {!SiteException} exception The content setting exception.
    * @param {boolean} readOnlyList Whether the site exception list is read-only.
    * @return {boolean}
    * @private
    */
   shouldHideResetButton_: function(exception, readOnlyList) {
     return exception.enforcement ==
         chrome.settingsPrivate.Enforcement.ENFORCED ||
-        this.allSites || !(readOnlyList || !!exception.embeddingOrigin);
+        !(readOnlyList || !!exception.embeddingOrigin);
   },
 
   /**
    * @param {!SiteException} exception The content setting exception.
    * @param {boolean} readOnlyList Whether the site exception list is read-only.
    * @return {boolean}
    * @private
    */
   shouldHideActionMenu_: function(exception, readOnlyList) {
     return exception.enforcement ==
         chrome.settingsPrivate.Enforcement.ENFORCED ||
-        this.allSites || readOnlyList || !!exception.embeddingOrigin;
+        readOnlyList || !!exception.embeddingOrigin;
   },
 
   /**
    * A handler for the Add Site button.
    * @param {!Event} e
    * @private
    */
   onAddSiteTap_: function(e) {
     assert(!this.readOnlyList);
     e.preventDefault();
     var dialog = document.createElement('add-site-dialog');
     dialog.category = this.category;
     dialog.contentSetting = this.categorySubtype;
     this.shadowRoot.appendChild(dialog);
 
     dialog.open(this.categorySubtype);
 
     dialog.addEventListener('close', function() {
       cr.ui.focusWithoutInk(assert(this.$.addSite));
       dialog.remove();
     }.bind(this));
   },
 
   /**
    * Populate the sites list for display.
    * @private
    */
   populateList_: function() {
-    if (this.allSites) {
-      this.getAllSitesList_().then(function(lists) {
-        this.processExceptions_(lists);
-        this.closeActionMenu_();
-      }.bind(this));
-    } else {
-      this.browserProxy_.getExceptionList(this.category).then(
-        function(exceptionList) {
+    this.browserProxy_.getExceptionList(this.category)
+        .then(function(exceptionList) {
           this.processExceptions_([exceptionList]);
           this.closeActionMenu_();
-      }.bind(this));
-    }
+        }.bind(this));
   },
 
   /**
    * Process the exception list returned from the native layer.
    * @param {!Array<!Array<RawSiteException>>} data List of sites (exceptions)
    *     to process.
    * @private
    */
   processExceptions_: function(data) {
     var sites = /** @type {!Array<RawSiteException>} */ ([]);
     for (var i = 0; i < data.length; ++i) {
       var exceptionList = data[i];
       for (var k = 0; k < exceptionList.length; ++k) {
-        if (!this.allSites &&
-            (exceptionList[k].setting == settings.PermissionValues.DEFAULT ||
-             exceptionList[k].setting != this.categorySubtype)) {
+        if (exceptionList[k].setting == settings.PermissionValues.DEFAULT ||
+            exceptionList[k].setting != this.categorySubtype) {
           continue;
         }
 
         sites.push(exceptionList[k]);
       }
     }
     this.sites = this.toSiteArray_(sites);
   },
 
   /**
-   * Retrieves a list of all known sites (any category/setting).
-   * @return {!Promise}
-   * @private
-   */
-  getAllSitesList_: function() {
-    var promiseList = [];
-    for (var type in settings.ContentSettingsTypes) {
-      if (settings.ContentSettingsTypes[type] ==
-          settings.ContentSettingsTypes.PROTOCOL_HANDLERS ||
-          settings.ContentSettingsTypes[type] ==
-          settings.ContentSettingsTypes.USB_DEVICES ||
-          settings.ContentSettingsTypes[type] ==
-          settings.ContentSettingsTypes.ZOOM_LEVELS) {
-        // Some categories store their data in a custom way.
-        continue;
-      }
-
-      promiseList.push(
-          this.browserProxy_.getExceptionList(
-              settings.ContentSettingsTypes[type]));
-    }
-
-    return Promise.all(promiseList);
-  },
-
-  /**
    * Converts a list of exceptions received from the C++ handler to
-   * full SiteException objects. If this site-list is used as an all sites
-   * view, the list is sorted by site name, then protocol and port and de-duped
-   * (by origin).
+   * full SiteException objects.
    * @param {!Array<RawSiteException>} sites A list of sites to convert.
-   * @return {!Array<SiteException>} A list of full SiteExceptions. Sorted and
-   *    deduped if allSites is set.
+   * @return {!Array<SiteException>} A list of full SiteExceptions.
    * @private
    */
   toSiteArray_: function(sites) {
-    var self = this;
-    if (this.allSites) {
-      sites.sort(function(a, b) {
-        var url1 = self.toUrl(a.origin);
-        var url2 = self.toUrl(b.origin);
-        var comparison = url1.host.localeCompare(url2.host);
-        if (comparison == 0) {
-          comparison = url1.protocol.localeCompare(url2.protocol);
-          if (comparison == 0) {
-            comparison = url1.port.localeCompare(url2.port);
-            if (comparison == 0) {
-              // Compare hosts for the embedding origins.
-              var host1 = self.toUrl(a.embeddingOrigin);
-              var host2 = self.toUrl(b.embeddingOrigin);
-              host1 = (host1 == null) ? '' : host1.host;
-              host2 = (host2 == null) ? '' : host2.host;
-              return host1.localeCompare(host2);
-            }
-          }
-        }
-        return comparison;
-      });
-    }
     var results = /** @type {!Array<SiteException>} */([]);
     var lastOrigin = '';
     var lastEmbeddingOrigin = '';
     for (var i = 0; i < sites.length; ++i) {
       /** @type {!SiteException} */
       var siteException = this.expandSiteException(sites[i]);
 
-      // The All Sites category can contain duplicates (from other categories).
-      if (this.allSites && siteException.origin == lastOrigin &&
-          siteException.embeddingOrigin == lastEmbeddingOrigin) {
-        continue;
-      }
-
       results.push(siteException);
       lastOrigin = siteException.origin;
       lastEmbeddingOrigin = siteException.embeddingOrigin;
     }
     return results;
   },
 
   /**
    * Set up the values to use for the action menu.
    * @private
@@ skipping 140 matching lines @@
   /** @private */
   closeActionMenu_: function() {
     this.actionMenuSite_ = null;
     this.activeDialogAnchor_ = null;
     var actionMenu = /** @type {!CrActionMenuElement} */ (
         this.$$('dialog[is=cr-action-menu]'));
     if (actionMenu.open)
       actionMenu.close();
   },
 });