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

Side by Side 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 unified diff | 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')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

3 <h1></h1>	3 <h1></h1>

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

5 <div id="exception-column-headers">	5 <div id="exception-column-headers">

6 <div id="exception-pattern-column" i18n-content="exceptionPatternHeader">	6 <div id="exception-pattern-column" i18n-content="exceptionPatternHeader">

7 </div>	7 </div>

8 <div id="exception-behavior-column"	8 <div id="exception-behavior-column"

9 i18n-content="exceptionBehaviorHeader"	9 i18n-content="exceptionBehaviorHeader"

10 class="exception-value-column-header">	10 class="exception-value-column-header">

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

83 </div>	83 </div>

84 <div contentType="protectedContent">	84 <div contentType="protectedContent">

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

86 <div>	86 <div>

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

88 </span>	88 </span>

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

90 </div>	90 </div>

91 </div>	91 </div>

92 <div id="media-column-header" class="media-header">	92 <div contentType="media-stream-mic">

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

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

95 </div>

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

97 </div>

98 </div>

99 <div contentType="media-stream">

100 <list mode="normal"></list>	93 <list mode="normal"></list>

101 <div>	94 <div>

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

	96 </span>

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

	98 </div>

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

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

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

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

	103 </div>

	104 </div>

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

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

	107 <div>

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

103 </span>	109 </span>

104 <list mode="otr"></list>	110 <list mode="otr"></list>

105 </div>	111 </div>

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

107 <span i18n-content="mediaPepperFlashExceptionsDivergedLabel"></span>	113 <span i18n-content="mediaPepperFlashExceptionsDivergedLabel"></span>

108 <a target="_blank" i18n-content="mediaPepperFlashChangeLink"	114 <a target="_blank" i18n-content="mediaPepperFlashChangeLink"

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

110 </div>	116 </div>

111 </div>	117 </div>

112 <div contentType="ppapi-broker">	118 <div contentType="ppapi-broker">

(...skipping 39 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
152 </div>	158 </div>

153 <div class="action-area-right">	159 <div class="action-area-right">

154 <div class="button-strip">	160 <div class="button-strip">

155 <button id="content-settings-exceptions-overlay-confirm"	161 <button id="content-settings-exceptions-overlay-confirm"

156 class="default-button" i18n-content="done">	162 class="default-button" i18n-content="done">

157 </button>	163 </button>

158 </div>	164 </div>

159 </div>	165 </div>

160 </div>	166 </div>

161 </div>	167 </div>

OLD	NEW