chrome/browser/resources/options2/content_settings.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.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: addressed comments from joaodasilva and bauerb, added support to Incognito mode. 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/media/media_stream_devices_controller.cc ('K') | « chrome/browser/policy/configuration_policy_handler_list.cc ('k') | chrome/browser/resources/options2/content_settings_exceptions_area.html » ('j') | chrome/browser/ui/media_stream_infobar_delegate.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 606080089e7da13a9f9c5de191eb48446a8f975e..739cc861ba238c1fa4c054fa5d7f34960db499d8 100644

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

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

@@ -296,6 +296,26 @@

</div>

</section>

</if>

+

+ <section>

+ <h3 i18n-content="mediaStreamTabLabel"></h3>

+ <div>

+ <div class="radio">

+ <label>

+ <input type="radio" name="media-stream" value="ask">

+ <span i18n-content="mediaStreamAsk"></span>

+ </label>

+ </div>

+ <div class="radio">

+ <label>

+ <input type="radio" name="media-stream" value="block">

+ <span i18n-content="mediaStreamBlock"></span>

+ </label>

+ </div>

+ <button class="exceptions-list-button" contentType="media-stream"

+ i18n-content="manage_exceptions"></button>

+ </div>

+ </section>

</div>