chrome/browser/resources/options2/content_settings_exceptions_area.js - Issue 10479015: Pepper Flash settings integration - camera and microphone.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10479015: Pepper Flash settings integration - camera and microphone. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase & resolve conflicts 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

« chrome/browser/pepper_flash_settings_manager.cc ('K') | « chrome/browser/resources/options2/content_settings_exceptions_area.html ('k') | chrome/browser/ui/webui/options2/content_settings_handler2.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 909021cadd21dbca0925256647f1be3f0a4b5d9e..9bb9609173a6182ef21ca6684c9672248212bd4b 100644

--- a/chrome/browser/resources/options2/content_settings_exceptions_area.js

+++ b/chrome/browser/resources/options2/content_settings_exceptions_area.js

@@ -362,7 +362,8 @@ cr.define('options.contentSettings', function() {

var exceptionList = this;

// Whether the exceptions in this list allow an 'Ask every time' option.

- this.enableAskOption = this.contentType == 'plugins';

+ this.enableAskOption = this.contentType == 'plugins' ||

+ this.contentType == 'pepper_flash_cameramic';

this.autoExpands = true;

this.reset();