Plugin Power Saver: Implement option in Settings.

chrome/browser/resources/options/content_settings_exceptions_area.js

Index: chrome/browser/resources/options/content_settings_exceptions_area.js
diff --git a/chrome/browser/resources/options/content_settings_exceptions_area.js b/chrome/browser/resources/options/content_settings_exceptions_area.js
index f92d0050ee4ddabd994d4acf8aff88aadef3a120..cef2cd8cbba357835b2587db2c70669445c6ac80 100644
--- a/chrome/browser/resources/options/content_settings_exceptions_area.js
+++ b/chrome/browser/resources/options/content_settings_exceptions_area.js
@@ -14,18 +14,15 @@ cr.define('options.contentSettings', function() {
    *
    * @param {string} contentType The type of the list.
    * @param {string} mode The browser mode, 'otr' or 'normal'.
-   * @param {boolean} enableAskOption Whether to show an 'ask every time'
-   *     option in the select.
    * @param {Object} exception A dictionary that contains the data of the
    *     exception.
    * @constructor
    * @extends {options.InlineEditableItem}
    */
-  function ExceptionsListItem(contentType, mode, enableAskOption, exception) {
+  function ExceptionsListItem(contentType, mode, exception) {
     var el = cr.doc.createElement('div');
     el.mode = mode;
     el.contentType = contentType;
-    el.enableAskOption = enableAskOption;
     el.dataItem = exception;
     el.__proto__ = ExceptionsListItem.prototype;
     el.decorate();
@@ -71,11 +68,11 @@ cr.define('options.contentSettings', function() {
       optionAllow.value = 'allow';
       select.appendChild(optionAllow);
 
-      if (this.enableAskOption) {
-        var optionAsk = cr.doc.createElement('option');
-        optionAsk.textContent = loadTimeData.getString('askException');
-        optionAsk.value = 'ask';
-        select.appendChild(optionAsk);
+      if (this.contentType == 'plugins') {
+        var optionDetect = cr.doc.createElement('option');
+        optionDetect.textContent = loadTimeData.getString('detectException');
+        optionDetect.value = 'detect';
+        select.appendChild(optionDetect);
       }
 
       if (this.contentType == 'cookies') {
@@ -284,6 +281,8 @@ cr.define('options.contentSettings', function() {
         return loadTimeData.getString('askException');
       else if (setting == 'session')
         return loadTimeData.getString('sessionException');
+      else if (setting == 'detect')
+        return loadTimeData.getString('detectException');
       else if (setting == 'default')
         return '';
 
@@ -394,16 +393,13 @@ cr.define('options.contentSettings', function() {
    *
    * @param {string} contentType The type of the list.
    * @param {string} mode The browser mode, 'otr' or 'normal'.
-   * @param {boolean} enableAskOption Whether to show an 'ask every time' option
-   *     in the select.
    * @constructor
    * @extends {options.contentSettings.ExceptionsListItem}
    */
-  function ExceptionsAddRowListItem(contentType, mode, enableAskOption) {
+  function ExceptionsAddRowListItem(contentType, mode) {
     var el = cr.doc.createElement('div');
     el.mode = mode;
     el.contentType = contentType;
-    el.enableAskOption = enableAskOption;
     el.dataItem = [];
     el.__proto__ = ExceptionsAddRowListItem.prototype;
     el.decorate();
@@ -478,10 +474,6 @@ cr.define('options.contentSettings', function() {
       }
 
       this.mode = this.getAttribute('mode');
-
-      // Whether the exceptions in this list allow an 'Ask every time' option.
-      this.enableAskOption = this.contentType == 'plugins';
-
       this.autoExpands = true;
       this.reset();
     },
@@ -495,12 +487,10 @@ cr.define('options.contentSettings', function() {
       if (entry) {
         return new ExceptionsListItem(this.contentType,
                                       this.mode,
-                                      this.enableAskOption,
                                       entry);
       } else {
         var addRowItem = new ExceptionsAddRowListItem(this.contentType,
-                                                      this.mode,
-                                                      this.enableAskOption);
+                                                      this.mode);
         addRowItem.deletable = false;
         return addRowItem;
       }