Site Settings Desktop: Implement the 'Clear on exit' menu for Cookies.

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
  * 'settings-site-list' shows a list of Allowed and Blocked sites for a given
  * category.
  */
 Polymer({
@@ skipping 61 matching lines @@
      * Whether to show the Allow action in the action menu.
      */
     showAllowAction_: Boolean,
 
     /**
      * Whether to show the Block action in the action menu.
      */
     showBlockAction_: Boolean,
 
     /**
+     * Whether to show the 'Clear on exit' action in the action
+     * menu.
+     */
+    showSessionOnlyAction_: Boolean,
+
+    /**
      * All possible actions in the action menu.
      */
     actions_: {
       readOnly: true,
       type: Object,
       values: {
         ALLOW: 'Allow',
         BLOCK: 'Block',
         RESET: 'Reset',
+        SESSION_ONLY: 'SessionOnly',
       }
     },
 
     i18n_: {

[michaelpg, 2016/06/09 18:43:42]

do you still need this in the JS? if not, remove and use $i18n{} in HTML

[Finnur, 2016/06/10 14:20:46]

Good catch. Done.

       readOnly: true,
       type: Object,
       value: function() {
         return {
           allowAction: loadTimeData.getString('siteSettingsActionAllow'),
           blockAction: loadTimeData.getString('siteSettingsActionBlock'),
           resetAction: loadTimeData.getString('siteSettingsActionReset'),
+          sessionOnlyAction:
+              loadTimeData.getString('siteSettingsActionSessionOnly'),
         };
       },
     },
   },
 
   observers: [
     'configureWidget_(category, categorySubtype, categoryEnabled, allSites)'
   ],
 
   ready: function() {
+    this.PermissionValues = settings.PermissionValues;

[michaelpg, 2016/06/09 18:43:42]

consider making this a readOnly property of SiteSettingsBehavior to avoid
duplication

[Finnur, 2016/06/10 14:20:46]

Done.

     this.addWebUIListener('contentSettingSitePermissionChanged',
         this.siteWithinCategoryChanged_.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
    */
@@ skipping 17 matching lines @@
     this.setUpActionMenu_();
     this.ensureOpened_();
     this.populateList_();
   },
 
   /**
    * Ensures the widget is |opened| when needed when displayed initially.
    * @private
    */
   ensureOpened_: function() {
-    // Allowed list is always shown opened by default and All Sites is presented
-    // all in one list (nothing closed by default).
+    // 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 ||
-        this.categorySubtype == settings.PermissionValues.ALLOW) {
+        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 allowed list.
+    // the other lists.
     if (this.category != settings.INVALID_CATEGORY_SUBTYPE) {
       this.browserProxy_.getExceptionList(this.category).then(
         function(exceptionList) {
-          var allowExists = exceptionList.some(function(exception) {
-            return exception.setting == settings.PermissionValues.ALLOW;
+          var othersExists = exceptionList.some(function(exception) {
+            return exception.setting == settings.PermissionValues.ALLOW ||
+                exception.setting == settings.PermissionValues.SESSION_ONLY;
           });
-          if (allowExists)
+          if (othersExists)
             return;
           this.$.category.opened = true;
       }.bind(this));
     } else {
       this.$.category.opened = true;
     }
   },
 
   /**
    * Makes sure the visibility is correct for this widget (e.g. hidden if the
@@ skipping 70 matching lines @@
    *     add.
    * @return {!Array<SiteException>} The list of sites.
    * @private
    */
   appendSiteList_: function(sites, exceptionList) {
     for (var i = 0; i < exceptionList.length; ++i) {
       if (this.category != settings.ALL_SITES) {
         if (exceptionList[i].setting == settings.PermissionValues.DEFAULT)
           continue;
 
-        // Filter out 'Block' values if this list is handling 'Allow' items.
-        if (exceptionList[i].setting == settings.PermissionValues.BLOCK &&
-            this.categorySubtype != settings.PermissionValues.BLOCK) {
+        if (exceptionList[i].setting != this.categorySubtype)
           continue;
-        }
-        // Filter out 'Allow' values if this list is handling 'Block' items.
-        if (exceptionList[i].setting == settings.PermissionValues.ALLOW &&
-            this.categorySubtype != settings.PermissionValues.ALLOW) {
-          continue;
-        }
       }
 
       sites.push(exceptionList[i]);
     }
     return sites;
   },
 
   /**
    * Converts a string origin/pattern to a URL.
    * @param {string} originOrPattern The origin/pattern to convert to URL.
@@ skipping 74 matching lines @@
     }
     return results;
   },
 
   /**
    * Setup the values to use for the action menu.
    * @private
    */
   setUpActionMenu_: function() {
     this.showAllowAction_ =
-        this.categorySubtype == settings.PermissionValues.BLOCK;
+        this.categorySubtype != settings.PermissionValues.ALLOW;
     this.showBlockAction_ =
-        this.categorySubtype == settings.PermissionValues.ALLOW;
+        this.categorySubtype != settings.PermissionValues.BLOCK;
+    this.showSessionOnlyAction_ =
+        this.categorySubtype != settings.PermissionValues.SESSION_ONLY &&
+        this.category == settings.ContentSettingsTypes.COOKIES;
   },
 
   /**
    * A handler for selecting a site (by clicking on the origin).
    * @private
    */
   onOriginTap_: function(event) {
     this.selectedSite = event.model.item;
     var categorySelected =
         this.allSites ?
         'all-sites' :
         'site-settings-category-' + this.computeCategoryTextId(this.category);
     this.currentRoute = {
       page: this.currentRoute.page,
       section: 'privacy',
       subpage: ['site-settings', categorySelected, 'site-details'],
     };
   },
 
   /**
    * A handler for activating one of the menu action items.
    * @param {!{model: !{item: !{origin: string}},
-   *           detail: !{item: !{textContent: string}}}} event
+   *           detail: !{selected: string}}} event
    * @private
    */
   onActionMenuIronActivate_: function(event) {
     var origin = event.model.item.origin;
     var embeddingOrigin = event.model.item.embeddingOrigin;
-    var action = event.detail.item.textContent;
-    if (action == this.i18n_.resetAction) {
+    var action = event.detail.selected;
+    if (action == settings.PermissionValues.DEFAULT) {
       this.resetCategoryPermissionForOrigin(
           origin, embeddingOrigin, this.category);
     } else {
-      var value = (action == this.i18n_.allowAction) ?
-          settings.PermissionValues.ALLOW :
-          settings.PermissionValues.BLOCK;
       this.setCategoryPermissionForOrigin(
-          origin, embeddingOrigin, this.category, value);
+          origin, embeddingOrigin, this.category, action);
     }
   },
 
   /**
    * Returns the appropriate header value for display.
    * @param {Array<string>} siteList The list of all sites to display for this
    *     category subtype.
    * @param {boolean} toggleState The state of the global toggle for this
    *     category.
    * @private
    */
   computeSiteListHeader_: function(siteList, toggleState) {
     if (this.categorySubtype == settings.PermissionValues.ALLOW) {

[michaelpg, 2016/06/09 18:43:42]

suggested cleanup:

var title = '';
if (this.categorySubtype == settings.PermissionValues.ALLOW)
  title = toggleState ? 'siteSettingsAllow' : 'siteSettingsExceptions';
else if (...)
  title = 'siteSettingsBlock';
else if (...)
  title = 'siteSettingsSessionOnly';
else
  return title;
return loadTimeData.getStringF(
    'titleAndCount', loadTimeData.getString(title), siteList.length);

[Finnur, 2016/06/10 14:20:46]

Done.

       return loadTimeData.getStringF(
           'titleAndCount',
           loadTimeData.getString(
               toggleState ? 'siteSettingsAllow' : 'siteSettingsExceptions'),
           siteList.length);
-    } else {
+    } else if (this.categorySubtype == settings.PermissionValues.BLOCK) {
       return loadTimeData.getStringF(
           'titleAndCount',
           loadTimeData.getString('siteSettingsBlock'),
           siteList.length);
+    } else if (this.categorySubtype == settings.PermissionValues.SESSION_ONLY) {
+      return loadTimeData.getStringF(
+          'titleAndCount',
+          loadTimeData.getString('siteSettingsSessionOnly'),
+          siteList.length);
     }
   },
 
   /**
-   * Returns true if this widget is showing the allow list.
+   * Returns true if this widget is showing the Block list.
    * @private
    */
-  isAllowList_: function() {
-    return this.categorySubtype == settings.PermissionValues.ALLOW;
+  isBlockList_: function() {
+    return this.categorySubtype == settings.PermissionValues.BLOCK;
   },
 
   /**
    * Returns whether to show the site list.
    * @param {Array} siteList The list of all sites to display for this category
    *     subtype.
    * @param {boolean} toggleState The state of the global toggle for this
    *     category.
    * @private
    */
   showSiteList_: function(siteList, toggleState) {
     if (siteList.length == 0)
       return false;
 
     // The Block list is only shown when the category is set to Allow since it
     // is redundant to also list all the sites that are blocked.
-    if (this.isAllowList_())
+    if (!this.isBlockList_())
       return true;
 
     return toggleState;
   },
 });