Site Settings Desktop: Implement tri-state 'Delete local data on exit'.

chrome/browser/resources/settings/site_settings/site_settings_category.js

Index: chrome/browser/resources/settings/site_settings/site_settings_category.js
diff --git a/chrome/browser/resources/settings/site_settings/site_settings_category.js b/chrome/browser/resources/settings/site_settings/site_settings_category.js
index 1ac0e50328a31c6a94dc4ca82b03b4c6e46fba64..92798e7e350b8e8af1412cc121687474e559754e 100644
--- a/chrome/browser/resources/settings/site_settings/site_settings_category.js
+++ b/chrome/browser/resources/settings/site_settings/site_settings_category.js
@@ -42,7 +42,17 @@ Polymer({
     flashAskFirst_: {
       type: Boolean,
       value: true,
-    }
+    },
+
+    /**
+     * Used only for Cookies to persist the Session Only checkbox state.

[dschuyler, 2016/09/06 18:36:43]

nit: Not sure, but something seems off in this sentence.
Maybe add 'in' (or 'during')?

Used only for Cookies to persist in the Session Only checkbox state.

[Finnur, 2016/09/08 09:59:39]

Done.

+     * Defaults to true, as the checkbox should be checked unless the user
+     * has explicitly unchecked it or has the ALLOW setting on Cookies.
+     */
+    cookiesSessionOnly_: {
+      type: Boolean,
+      value: true,
+    },
   },
 
   observers: [
@@ -71,7 +81,6 @@ Polymer({
   onChangePermissionControl_: function(event) {
     switch (this.category) {
       case settings.ContentSettingsTypes.BACKGROUND_SYNC:
-      case settings.ContentSettingsTypes.COOKIES:
       case settings.ContentSettingsTypes.IMAGES:
       case settings.ContentSettingsTypes.JAVASCRIPT:
       case settings.ContentSettingsTypes.KEYGEN:
@@ -97,6 +106,17 @@ Polymer({
                 settings.PermissionValues.ASK :
                 settings.PermissionValues.BLOCK);
         break;
+      case settings.ContentSettingsTypes.COOKIES:
+        // This category is tri-state: "Allow", "Block", "Keep data until
+        // browser quits".
+        var value = settings.PermissionValues.BLOCK;
+        if (this.categoryEnabled) {
+          value = this.cookiesSessionOnly_ ?
+              settings.PermissionValues.SESSION_ONLY :
+              settings.PermissionValues.ALLOW;
+        }
+        this.browserProxy.setDefaultValueForContentType(this.category, value);
+        break;
       case settings.ContentSettingsTypes.PLUGINS:
         // This category is tri-state: "Allow", "Block", "Ask before running".
         var value = settings.PermissionValues.BLOCK;
@@ -128,15 +148,27 @@ Polymer({
               if (this.category == settings.ContentSettingsTypes.PLUGINS &&
                   setting == settings.PermissionValues.IMPORTANT_CONTENT) {
                 sliderSetting = settings.PermissionValues.ALLOW;
+              } else if (
+                  this.category == settings.ContentSettingsTypes.COOKIES &&
+                  setting == settings.PermissionValues.SESSION_ONLY) {
+                sliderSetting = settings.PermissionValues.ALLOW;
               }
               this.sliderDescription_ =
                   this.computeCategoryDesc(this.category, sliderSetting, true);
 
-              // The checkbox should only be cleared when the Flash setting
-              // is explicitly set to ALLOW.
-              if (this.category == settings.ContentSettingsTypes.PLUGINS &&
-                  setting == settings.PermissionValues.ALLOW) {
-                this.flashAskFirst_ = false;
+              if (this.category == settings.ContentSettingsTypes.PLUGINS) {

[Finnur, 2016/09/06 13:10:02]

The Flash section is changing because I noticed a bug. If you go to the old
content settings UI and select the equivalent of IMPORTANT_CONTENT there, then
the new UI is not updated (checkbox not checked). You need a refresh to see it
change.

+                // The checkbox should only be cleared when the Flash setting
+                // is explicitly set to ALLOW.
+                if (setting == settings.PermissionValues.ALLOW)
+                  this.flashAskFirst_ = false;
+                if (setting == settings.PermissionValues.IMPORTANT_CONTENT)
+                  this.flashAskFirst_ = true;
+              } else if (
+                  this.category == settings.ContentSettingsTypes.COOKIES) {
+                if (setting == settings.PermissionValues.ALLOW)
+                  this.cookiesSessionOnly_ = false;
+                else if (setting == settings.PermissionValues.SESSION_ONLY)
+                  this.cookiesSessionOnly_ = true;
               }
             }.bind(this));
   },
@@ -146,6 +178,11 @@ Polymer({
     return category == settings.ContentSettingsTypes.PLUGINS;
   },
 
+  /** @private */
+  isCookiesCategory_: function(category) {
+    return category == settings.ContentSettingsTypes.COOKIES;
+  },
+
   /**
    * Returns whether this is the Plugins category.
    * @param {string} category The current category.