add "always allow" option to the mediastream infobar and allow user to allow/not allow acces to devi

chrome/browser/resources/options2/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 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 {boolean} enableAskOption Whether to show an 'ask every time' option
+   *          in the select.

[Evan Stade, 2012/06/18 19:12:58]

I believe the indentation was correct before.

[no longer working on chromium, 2012/06/19 12:23:17]

Sorry, mistake made by eclipse, correct now.

    * @param {Object} exception A dictionary that contains the data of the
-   *     exception.
+   *          exception.
    * @constructor
    * @extends {options.InlineEditableItem}
    */
   function ExceptionsListItem(contentType, mode, enableAskOption, exception) {
     var el = cr.doc.createElement('div');
     el.mode = mode;
     el.contentType = contentType;
     el.enableAskOption = enableAskOption;
     el.dataItem = exception;
     el.__proto__ = ExceptionsListItem.prototype;
@@ skipping 76 matching lines @@
       // This one tracks the actual validity of the pattern in the input. This
       // starts off as true so as not to annoy the user when he adds a new and
       // empty input.
       this.inputIsValid = true;
 
       this.input = input;
       this.select = select;
 
       this.updateEditables();
 
-      // Editing notifications and geolocation is disabled for now.
+      // Editing notifications, geolocation and media-stream is disabled for
+      // now.
       if (this.contentType == 'notifications' ||
-          this.contentType == 'location') {
+          this.contentType == 'location' ||
+          this.contentType == 'media-stream') {
         this.editable = false;
       }
 
       // If the source of the content setting exception is not the user
       // preference, then the content settings exception is managed and the user
       // can't edit it.
       if (this.dataItem.source &&
           this.dataItem.source != 'preference') {
         this.setAttribute('managedby', this.dataItem.source);
         this.deletable = false;
@@ skipping 21 matching lines @@
                     [listItem.contentType, listItem.mode, input.value]);
       };
 
       // Listen for edit events.
       this.addEventListener('canceledit', this.onEditCancelled_);
       this.addEventListener('commitedit', this.onEditCommitted_);
     },
 
     /**
      * The pattern (e.g., a URL) for the exception.
+     *
      * @type {string}
      */
     get pattern() {
       return this.dataItem['displayPattern'];
     },
     set pattern(pattern) {
       this.dataItem['displayPattern'] = pattern;
     },
 
     /**
      * The setting (allow/block) for the exception.
+     *
      * @type {string}
      */
     get setting() {
       return this.dataItem['setting'];
     },
     set setting(setting) {
       this.dataItem['setting'] = setting;
     },
 
     /**
      * Gets a human-readable setting string.
+     *
      * @type {string}
      */
     settingForDisplay: function() {
       var setting = this.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');
     },
 
     /**
      * Update this list item to reflect whether the input is a valid pattern.
-     * @param {boolean} valid Whether said pattern is valid in the context of
-     *     a content exception setting.
+     *
+     * @param {boolean} valid Whether said pattern is valid in the context of a
+     *          content exception setting.
      */
     setPatternValid: function(valid) {
       if (valid || !this.input.value)
         this.input.setCustomValidity('');
       else
         this.input.setCustomValidity(' ');
       this.inputIsValid = valid;
       this.inputValidityKnown = true;
     },
 
@@ skipping 24 matching lines @@
 
     /** @inheritDoc */
     get hasBeenEdited() {
       var livePattern = this.input.value;
       var liveSetting = this.select.value;
       return livePattern != this.pattern || liveSetting != this.setting;
     },
 
     /**
      * Called when committing an edit.
+     *
      * @param {Event} e The end event.
      * @private
      */
     onEditCommitted_: function(e) {
       var newPattern = this.input.value;
       var newSetting = this.select.value;
 
       this.finishEdit(newPattern, newSetting);
     },
 
     /**
      * Called when cancelling an edit; resets the control states.
+     *
      * @param {Event} e The cancel event.
      * @private
      */
     onEditCancelled_: function() {
       this.updateEditables();
       this.setPatternValid(true);
     },
 
     /**
      * Editing is complete; update the model.
+     *
      * @param {string} newPattern The pattern that the user entered.
      * @param {string} newSetting The setting the user chose.
      */
     finishEdit: function(newPattern, newSetting) {
       this.patternLabel.textContent = newPattern;
       this.settingLabel.textContent = this.settingForDisplay();
       var oldPattern = this.pattern;
       this.pattern = newPattern;
       this.setting = newSetting;
 
       // TODO(estade): this will need to be updated if geolocation/notifications
       // become editable.
       if (oldPattern != newPattern) {
         chrome.send('removeException',
                     [this.contentType, this.mode, oldPattern]);
       }
 
       chrome.send('setException',
                   [this.contentType, this.mode, newPattern, newSetting]);
     }
   };
 
   /**
    * 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.
+   * @param {boolean} enableAskOption Whether to show an 'ask every time' option
+   *          in the select.
    * @constructor
    * @extends {cr.ui.ExceptionsListItem}
    */
   function ExceptionsAddRowListItem(contentType, mode, enableAskOption) {
     var el = cr.doc.createElement('div');
     el.mode = mode;
     el.contentType = contentType;
     el.enableAskOption = enableAskOption;
     el.dataItem = [];
     el.__proto__ = ExceptionsAddRowListItem.prototype;
@@ skipping 23 matching lines @@
     },
 
     /** @inheritDoc */
     get hasBeenEdited() {
       return this.input.value != '';
     },
 
     /**
      * Editing is complete; update the model. As long as the pattern isn't
      * empty, we'll just add it.
+     *
      * @param {string} newPattern The pattern that the user entered.
      * @param {string} newSetting The setting the user chose.
      */
     finishEdit: function(newPattern, newSetting) {
       this.resetInput();
       chrome.send('setException',
                   [this.contentType, this.mode, newPattern, newSetting]);
     },
   };
 
   /**
    * Creates a new exceptions list.
+   *
    * @constructor
    * @extends {cr.ui.List}
    */
   var ExceptionsList = cr.ui.define('list');
 
   ExceptionsList.prototype = {
     __proto__: InlineEditableItemList.prototype,
 
     /**
      * Called when an element is decorated as a list.
@@ skipping 18 matching lines @@
       // Whether the exceptions in this list allow an 'Ask every time' option.
       this.enableAskOption = this.contentType == 'plugins' ||
                              this.contentType == 'pepper-flash-cameramic';
 
       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);
         addRowItem.deletable = false;
         return addRowItem;
       }
     },
 
     /**
      * Sets the exceptions in the js model.
+     *
      * @param {Object} entries A list of dictionaries of values, each dictionary
-     *     represents an exception.
+     *          represents an exception.
      */
     setExceptions: function(entries) {
       var deleteCount = this.dataModel.length;
 
       if (this.isEditable()) {
         // We don't want to remove the Add New Exception row.
         deleteCount = deleteCount - 1;
       }
 
       var args = [0, deleteCount];
       args.push.apply(args, entries);
       this.dataModel.splice.apply(this.dataModel, args);
     },
 
     /**
-     * The browser has finished checking a pattern for validity. Update the
-     * list item to reflect this.
+     * The browser has finished checking a pattern for validity. Update the list
+     * item to reflect this.
+     *
      * @param {string} pattern The pattern.
-     * @param {bool} valid Whether said pattern is valid in the context of
-     *     a content exception setting.
+     * @param {bool} valid Whether said pattern is valid in the context of a
+     *          content exception setting.
      */
     patternValidityCheckComplete: function(pattern, valid) {
       var listItems = this.items;
       for (var i = 0; i < listItems.length; i++) {
         var listItem = listItems[i];
         // Don't do anything for messages for the item if it is not the intended
         // recipient, or if the response is stale (i.e. the input value has
         // changed since we sent the request to analyze it).
         if (pattern == listItem.input.value)
           listItem.setPatternValid(valid);
       }
     },
 
     /**
      * Returns whether the rows are editable in this list.
      */
     isEditable: function() {
-      // Editing notifications and geolocation is disabled for now.
+      // Exceptions of the following lists are not editable for now.
       return !(this.contentType == 'notifications' ||
                this.contentType == 'location' ||
-               this.contentType == 'fullscreen');
+               this.contentType == 'fullscreen' ||
+               this.contentType == 'media-stream');
     },
 
     /**
      * Removes all exceptions from the js model.
      */
     reset: function() {
       if (this.isEditable()) {
         // The null creates the Add New Exception row.
         this.dataModel = new ArrayDataModel([null]);
       } else {
@@ skipping 17 matching lines @@
         args.push(listItem.mode, listItem.pattern);
 
       chrome.send('removeException', args);
     },
   };
 
   var OptionsPage = options.OptionsPage;
 
   /**
    * Encapsulated handling of content settings list subpage.
+   *
    * @constructor
    */
   function ContentSettingsExceptionsArea() {
     OptionsPage.call(this, 'contentExceptions',
                      loadTimeData.getString('contentSettingsPageTabTitle'),
                      'content-settings-exceptions-area');
   }
 
   cr.addSingletonGetter(ContentSettingsExceptionsArea);
 
@@ skipping 12 matching lines @@
 
       // If the user types in the URL without a hash, show just cookies.
       this.showList('cookies');
 
       $('content-settings-exceptions-overlay-confirm').onclick =
           OptionsPage.closeOverlay.bind(OptionsPage);
     },
 
     /**
      * Shows one list and hides all others.
+     *
      * @param {string} type The content type.
      */
     showList: function(type) {
       var header = this.pageDiv.querySelector('h1');
       header.textContent = loadTimeData.getString(type + '_header');
 
       var divs = this.pageDiv.querySelectorAll('div[contentType]');
       for (var i = 0; i < divs.length; i++) {
         if (divs[i].getAttribute('contentType') == type)
           divs[i].hidden = false;
@@ skipping 32 matching lines @@
     }
   };
 
   return {
     ExceptionsListItem: ExceptionsListItem,
     ExceptionsAddRowListItem: ExceptionsAddRowListItem,
     ExceptionsList: ExceptionsList,
     ContentSettingsExceptionsArea: ContentSettingsExceptionsArea,
   };
 });