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

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

Issue 1047793002: Web MIDI API: disallow to add custom exceptions on content settings UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 12004a53efdaf3658adecae84492dbefeb1a3c32..f2ec4c3457c5292ed744a065427c04f713c4e5e8 100644
--- a/chrome/browser/resources/options/content_settings_exceptions_area.js
+++ b/chrome/browser/resources/options/content_settings_exceptions_area.js
@@ -152,11 +152,12 @@ cr.define('options.contentSettings', function() {
this.updateEditables();
- // Editing notifications, geolocation and media-stream is disabled for
- // now.
+ // Editing notifications, geolocation, media-stream, and midi-sysex is
+ // disabled for now.
if (this.contentType == 'notifications' ||
this.contentType == 'location' ||
- this.contentType == 'media-stream') {
+ this.contentType == 'media-stream' ||
+ this.contentType == 'midi-sysex') {
Dan Beam 2015/03/30 22:10:27 any idea why zoomlevels isn't in this list? if it
this.editable = false;
}
@@ -544,6 +545,7 @@ cr.define('options.contentSettings', function() {
this.contentType == 'location' ||
this.contentType == 'fullscreen' ||
this.contentType == 'media-stream' ||
+ this.contentType == 'midi-sysex' ||
this.contentType == 'zoomlevels');
},
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698