MD Settings: Allow deleting read-only content setting exceptions.

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 44 matching lines @@
      * @private
      */
     showEditExceptionDialog_: Boolean,
 
     /**
      * Array of sites to display in the widget.
      * @type {!Array<SiteException>}
      */
     sites: {
       type: Array,
-      value: function() { return []; },
+      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.
-      */
+     * 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,
     },
 
     /**
      * Whether to show the Allow action in the action menu.
      * @private
      */
     showAllowAction_: Boolean,
@@ skipping 30 matching lines @@
       type: Object,
       values: {
         ALLOW: 'Allow',
         BLOCK: 'Block',
         RESET: 'Reset',
         SESSION_ONLY: 'SessionOnly',
       }
     },
   },
 
-  observers: [
-    'configureWidget_(category, categorySubtype)'
-  ],
+  observers: ['configureWidget_(category, categorySubtype)'],
 
   ready: function() {
     this.addWebUIListener('contentSettingSitePermissionChanged',
         this.siteWithinCategoryChanged_.bind(this));
     this.addWebUIListener('onIncognitoStatusChanged',
         this.onIncognitoStatusChanged_.bind(this));
   },
 
   /**
    * Called when a site changes permission.
@@ skipping 63 matching lines @@
   hasSites_: function() {
     return !!this.sites.length;
   },
 
   /**
    * @param {string} source Where the setting came from.
    * @param {boolean} readOnlyList Whether the site exception list is read-only.
    * @return {boolean}
    * @private
    */
+  isResetButtonHidden_: function(source, readOnlyList) {
+    return this.isExceptionControlled_(source) || this.allSites ||
+        !readOnlyList;
+  },
+
+  /**
+   * @param {string} source Where the setting came from.
+   * @param {boolean} readOnlyList Whether the site exception list is read-only.
+   * @return {boolean}
+   * @private
+   */
   isActionMenuHidden_: function(source, readOnlyList) {
     return this.isExceptionControlled_(source) || this.allSites || readOnlyList;
   },
 
   /**
    * A handler for the Add Site button.
    * @param {!Event} e
    * @private
    */
   onAddSiteTap_: function(e) {
@@ skipping 181 matching lines @@
    * @private
    */
   onOriginTap_: function(event) {
     if (!this.enableSiteSettings_)
       return;
     settings.navigateTo(settings.Route.SITE_SETTINGS_SITE_DETAILS,
         new URLSearchParams('site=' + event.model.item.origin));
   },
 
   /**
-   * A handler for activating one of the menu action items.
-   * @param {string} action The permission to set (Allow, Block, SessionOnly,
-   *     etc).
+   * @param {?SiteException} site
    * @private
    */
-  onActionMenuActivate_: function(action) {
-    var origin = this.actionMenuSite_.origin;
-    var incognito = this.actionMenuSite_.incognito;
-    var embeddingOrigin = this.actionMenuSite_.embeddingOrigin;
-    if (action == settings.PermissionValues.DEFAULT) {
-      this.browserProxy.resetCategoryPermissionForOrigin(
-          origin, embeddingOrigin, this.category, incognito);
-    } else {
-      this.browserProxy.setCategoryPermissionForOrigin(
-          origin, embeddingOrigin, this.category, action, incognito);
-    }
+  resetPermissionForOrigin_: function(site) {
+    assert(site);
+    this.browserProxy.resetCategoryPermissionForOrigin(
+        site.origin, site.embeddingOrigin, this.category, site.incognito);
+  },
+
+  /**
+   * @param {string} permissionValue
+   * @private
+   */
+  setPermissionForActionMenuSite_: function(permissionValue) {
+    assert(this.actionMenuSite_);
+    this.browserProxy.setCategoryPermissionForOrigin(
+        this.actionMenuSite_.origin, this.actionMenuSite_.embeddingOrigin,
+        this.category, permissionValue, this.actionMenuSite_.incognito);
   },
 
   /** @private */
   onAllowTap_: function() {
-    this.onActionMenuActivate_(settings.PermissionValues.ALLOW);
+    this.setPermissionForActionMenuSite_(settings.PermissionValues.ALLOW);
     this.closeActionMenu_();
   },
 
   /** @private */
   onBlockTap_: function() {
-    this.onActionMenuActivate_(settings.PermissionValues.BLOCK);
+    this.setPermissionForActionMenuSite_(settings.PermissionValues.BLOCK);
     this.closeActionMenu_();
   },
 
   /** @private */
   onSessionOnlyTap_: function() {
-    this.onActionMenuActivate_(settings.PermissionValues.SESSION_ONLY);
+    this.setPermissionForActionMenuSite_(
+        settings.PermissionValues.SESSION_ONLY);
     this.closeActionMenu_();
   },
 
   /** @private */
   onEditTap_: function() {
     // Close action menu without resetting |this.actionMenuSite_| since it is
     // bound to the dialog.
     /** @type {!CrActionMenuElement} */ (
         this.$$('dialog[is=cr-action-menu]')).close();
     this.showEditExceptionDialog_ = true;
   },
 
   /** @private */
   onEditExceptionDialogClosed_: function() {
     this.showEditExceptionDialog_ = false;
     this.actionMenuSite_ = null;
   },
 
   /** @private */
   onResetTap_: function() {
-    this.onActionMenuActivate_(settings.PermissionValues.DEFAULT);
+    this.resetPermissionForOrigin_(this.actionMenuSite_);
     this.closeActionMenu_();
   },
 
   /**
    * Returns the appropriate site description to display. This can, for example,
    * be blank, an 'embedded on <site>' or 'Current incognito session' (or a
    * mix of the last two).
    * @param {SiteException} item The site exception entry.
    * @return {string} The site description.
    */
   computeSiteDescription_: function(item) {
     if (item.incognito && item.embeddingDisplayName.length > 0) {
       return loadTimeData.getStringF('embeddedIncognitoSite',
           item.embeddingDisplayName);
     }
 
     if (item.incognito)
       return loadTimeData.getString('incognitoSite');
     return item.embeddingDisplayName;
   },
 
   /**
    * @param {!{model: !{item: !SiteException}}} e
    * @private
    */
+  onResetButtonTap_: function(e) {
+    this.resetPermissionForOrigin_(e.model.item);
+  },
+
+  /**
+   * @param {!{model: !{item: !SiteException}}} e
+   * @private
+   */
   onShowActionMenuTap_: function(e) {
     this.actionMenuSite_ = e.model.item;
     /** @type {!CrActionMenuElement} */ (
         this.$$('dialog[is=cr-action-menu]')).showAt(
             /** @type {!Element} */ (
                 Polymer.dom(/** @type {!Event} */ (e)).localTarget));
   },
 
   /** @private */
   closeActionMenu_: function() {
     this.actionMenuSite_ = null;
     var actionMenu = /** @type {!CrActionMenuElement} */ (
         this.$$('dialog[is=cr-action-menu]'));
     if (actionMenu.open)
       actionMenu.close();
   },
 });