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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side 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: use only content settings, added a device controller, addressed all the comments 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 unified diff | Download patch | Annotate | Revision Log

« chrome/browser/media/media_stream_devices_menu_model.cc ('K') | « chrome/browser/policy/configuration_policy_handler_list.cc ('k') | chrome/browser/resources/options2/content_settings_exceptions_area.html » ('j') | chrome/browser/resources/options2/content_settings_exceptions_area.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <div id="content-settings-page" class="page" hidden>	1 <div id="content-settings-page" class="page" hidden>

2 <div class="close-button"></div>	2 <div class="close-button"></div>

3 <h1 i18n-content="contentSettingsPage"></h1>	3 <h1 i18n-content="contentSettingsPage"></h1>

4 <div class="content-area">	4 <div class="content-area">

5 <!-- Cookie filter tab contents -->	5 <!-- Cookie filter tab contents -->

6 <section>	6 <section>

7 <h3 i18n-content="cookies_tab_label"></h3>	7 <h3 i18n-content="cookies_tab_label"></h3>

8 <div>	8 <div>

9 <div class="radio">	9 <div class="radio">

10 <label>	10 <label>

(...skipping 257 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
268 </div>	268 </div>

269 <div class="checkbox">	269 <div class="checkbox">

270 <label>	270 <label>

271 <input pref="settings.privacy.drm_enabled" type="checkbox">	271 <input pref="settings.privacy.drm_enabled" type="checkbox">

272 <span i18n-content="protectedContentEnable"></span>	272 <span i18n-content="protectedContentEnable"></span>

273 </label>	273 </label>

274 </div>	274 </div>

275 </div>	275 </div>

276 </section>	276 </section>

277 </if>	277 </if>

	278 <!-- MediaStream capture device filter -->

	279 <section>

	280 <h3 i18n-content="mediastream_tab_label"></h3>

	281 <div>

	282 <div class="radio">

	283 <label>

	284 <input type="radio" name="mediastream" value="ask">

	285 <span i18n-content="mediastream_ask"></span>

	286 </label>

	287 </div>

	288 <div class="radio">

	289 <label>

	290 <input type="radio" name="mediastream" value="block">

	291 <span i18n-content="mediastream_block"></span>

	292 </label>

	293 </div>

	294 <button class="exceptions-list-button" contentType="mediastream"

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

	296 </div>

	297 </section>

278 </div>	298 </div>

279 <div class="action-area">	299 <div class="action-area">

280 <div class="button-strip">	300 <div class="button-strip">

281 <button id="content-settings-overlay-confirm" i18n-content="ok"></button>	301 <button id="content-settings-overlay-confirm" i18n-content="ok"></button>

282 </div>	302 </div>

283 </div>	303 </div>

284 </div>	304 </div>

OLD	NEW