Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2452)

Unified Diff: chrome/browser/resources/options2/content_settings_exceptions_area.js

Issue 10537099: add "always allow" option to the mediastream infobar and allow user to allow/not allow acces to devi (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/options2/content_settings_exceptions_area.js
diff --git a/chrome/browser/resources/options2/content_settings_exceptions_area.js b/chrome/browser/resources/options2/content_settings_exceptions_area.js
index ef4fa6bbd4b818de2408f6e2bf152dbfa9f77471..243ac4b85fe719a4091eebc695e10626440e8916 100644
--- a/chrome/browser/resources/options2/content_settings_exceptions_area.js
+++ b/chrome/browser/resources/options2/content_settings_exceptions_area.js
@@ -111,9 +111,10 @@ cr.define('options.contentSettings', function() {
this.updateEditables();
- // Editing notifications and geolocation is disabled for now.
+ // Editing notifications, geolocation and mediastream is disabled for now.
if (this.contentType == 'notifications' ||
- this.contentType == 'location') {
+ this.contentType == 'location' ||
+ this.contentType == 'mediastream') {
this.editable = false;
}
@@ -441,10 +442,11 @@ cr.define('options.contentSettings', function() {
* Returns whether the rows are editable in this list.
*/
isEditable: function() {
- // Editing notifications and geolocation is disabled for now.
+ // Editing notifications, geolocation and mediastream is disabled for now.
return !(this.contentType == 'notifications' ||
this.contentType == 'location' ||
- this.contentType == 'fullscreen');
+ this.contentType == 'fullscreen' ||
+ this.contentType == 'mediastream');
},
/**

Powered by Google App Engine
This is Rietveld 408576698