chrome/browser/resources/options/content_settings_exceptions_area.html - Issue 1210173012: Split the Media settings UI into separate microphone and camera sections.

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/options/content_settings_exceptions_area.html

Issue 1210173012: Split the Media settings UI into separate microphone and camera sections. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed the policy indicator test. Created 5 years, 5 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/options/content_settings.js ('K') | « chrome/browser/resources/options/content_settings.js ('k') | chrome/browser/resources/options/content_settings_exceptions_area.js » ('j') | chrome/browser/ui/webui/options/content_settings_handler.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 3c3daefcf8a1e15639d51e3133e338b292e6a934..3037cfa696af03a1a45901ab4758ab97b8219923 100644

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

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

@@ -89,14 +89,20 @@

</div>

- <div id="media-column-header" class="media-header">

- <div id="exception-pattern-column"></div>

- <div id="media-audio-column" i18n-content=mediaAudioExceptionHeader>

+ <div contentType="media-stream-mic">

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

+ <div>

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

+ </span>

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

</div>

- <div id="media-video-column" i18n-content="mediaVideoExceptionHeader">

+ <div id="media-pepper-flash-exceptions" class="pepper-flash-settings">

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

+ <a target="_blank" i18n-content="mediaPepperFlashChangeLink"

+ i18n-values="href:mediaPepperFlashWebsitePrivacyURL"></a>

</div>

- <div contentType="media-stream">

+ <div contentType="media-stream-camera">

<div>