Plugin Power Saver: Implement option in Settings.

chrome/browser/resources/options/content_settings_exceptions_area.js

 // Copyright (c) 2012 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.
 
 cr.define('options.contentSettings', function() {
   /** @const */ var ControlledSettingIndicator =
                     options.ControlledSettingIndicator;
   /** @const */ var InlineEditableItemList = options.InlineEditableItemList;
   /** @const */ var InlineEditableItem = options.InlineEditableItem;
   /** @const */ var ArrayDataModel = cr.ui.ArrayDataModel;
 
   /**
    * Creates a new exceptions list item.
    *
    * @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();
 
     return el;
   }
 
   ExceptionsListItem.prototype = {
     __proto__: InlineEditableItem.prototype,
 
@@ skipping 25 matching lines @@
         this.settingLabel = settingLabel;
       }
 
       // Setting select element for edit mode.
       var select = cr.doc.createElement('select');
       var optionAllow = cr.doc.createElement('option');
       optionAllow.textContent = loadTimeData.getString('allowException');
       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') {
         var optionSession = cr.doc.createElement('option');
         optionSession.textContent = loadTimeData.getString('sessionException');
         optionSession.value = 'session';
         select.appendChild(optionSession);
       }
 
       if (this.contentType != 'fullscreen') {
@@ skipping 188 matching lines @@
      */
     getDisplayStringForSetting: function(setting) {
       if (setting == 'allow')
         return loadTimeData.getString('allowException');
       else if (setting == 'block')
         return loadTimeData.getString('blockException');
       else if (setting == 'ask')
         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 '';
 
       console.error('Unknown setting: [' + setting + ']');
       return '';
     },
 
     /**
      * Update this list item to reflect whether the input is a valid pattern.
      *
@@ skipping 90 matching lines @@
     },
   };
 
   /**
    * Creates a new list item for the Add New Item row, which doesn't represent
    * an actual entry in the exceptions list but allows the user to add new
    * exceptions.
    *
    * @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();
 
     return el;
   }
 
   ExceptionsAddRowListItem.prototype = {
     __proto__: ExceptionsListItem.prototype,
 
@@ skipping 54 matching lines @@
 
       for (var parentNode = this.parentNode; parentNode;
            parentNode = parentNode.parentNode) {
         if (parentNode.hasAttribute('contentType')) {
           this.contentType = parentNode.getAttribute('contentType');
           break;
         }
       }
 
       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();
     },
 
     /**
      * Creates an item to go in the list.
      *
      * @param {Object} entry The element from the data model for this row.
      */
     createItem: function(entry) {
       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;
       }
     },
 
     /**
      * Sets the exceptions in the js model.
      *
      * @param {Array.<options.Exception>} entries A list of dictionaries of
      *     values, each dictionary represents an exception.
@@ skipping 165 matching lines @@
     }
   };
 
   return {
     ExceptionsListItem: ExceptionsListItem,
     ExceptionsAddRowListItem: ExceptionsAddRowListItem,
     ExceptionsList: ExceptionsList,
     ContentSettingsExceptionsArea: ContentSettingsExceptionsArea,
   };
 });