chrome/browser/resources/options2/content_settings_exceptions_area.html - Issue 10537099: add "always allow" option to the mediastream infobar and allow user to allow/not allow acces to devi

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.html

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: rebased, addressed comments from Ivan, let "block" apply before exceptions 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/resources/options2/content_settings.html ('K') | « chrome/browser/resources/options2/content_settings.html ('k') | chrome/browser/resources/options2/content_settings_exceptions_area.js » ('j') | chrome/browser/resources/options2/content_settings_exceptions_area.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/options2/content_settings_exceptions_area.html

diff --git a/chrome/browser/resources/options2/content_settings_exceptions_area.html b/chrome/browser/resources/options2/content_settings_exceptions_area.html

index a2b2f0d5042043777c0d7dac72aa543440b5b12c..48554aa8491f76fae85c12fc0c48195bdd0981cc 100644

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

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

@@ -76,6 +76,14 @@

</div>

+ <div contentType="mediastream">

+ <list mode="normal"></list>

+ <div>

+ <span class="otr-explanation" i18n-content="otr_exceptions_explanation">

+ </span>

+ <list mode="otr"></list>

+ </div>

<div id="pepper-flash-cameramic-exceptions-div"

contentType="pepper-flash-cameramic" class="pepper-flash-settings">