Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(23)

Side by Side Diff: chrome/browser/resources/options2/content_settings.html

Issue 10479015: Pepper Flash settings integration - camera and microphone. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . 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
OLDNEW
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 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 <section> 248 <section>
249 <h3 i18n-content="webIntentsTabLabel" class="content-settings-header"> 249 <h3 i18n-content="webIntentsTabLabel" class="content-settings-header">
250 </h3> 250 </h3>
251 <div class="checkbox"> 251 <div class="checkbox">
252 <label> 252 <label>
253 <input pref="webintents.enabled" type="checkbox"> 253 <input pref="webintents.enabled" type="checkbox">
254 <span i18n-content="allowWebIntents"></span> 254 <span i18n-content="allowWebIntents"></span>
255 </label> 255 </label>
256 </div> 256 </div>
257 </section> 257 </section>
258 <!-- Pepper Flash camera and microphone filter -->
259 <section id="pepper-flash-cameramic-section" class="pepper-flash-settings">
260 <h3 i18n-content="pepper_flash_cameramic_tab_label"></h3>
csilv 2012/06/05 00:40:21 nit: Per style guide, use javaScriptCase for i18n-
yzshen1 2012/06/05 17:28:43 [ I actually noticed the name inconsistency. But a
csilv 2012/06/05 18:09:27 Your reasons are valid, but we shouldn't make the
yzshen1 2012/06/05 19:57:57 Done.
261 <div>
262 <div class="radio">
263 <label>
264 <input type="radio" name="pepper_flash_cameramic" value="ask">
csilv 2012/06/05 00:40:21 nit: probably better to use dash instead of unders
yzshen1 2012/06/05 17:28:43 Please see my comment above. On 2012/06/05 00:40:
265 <span i18n-content="pepper_flash_cameramic_ask"></span>
266 </label>
267 </div>
268 <div class="radio">
269 <label>
270 <input type="radio" name="pepper_flash_cameramic" value="block">
271 <span i18n-content="pepper_flash_cameramic_block"></span>
272 </label>
273 </div>
274 <button class="exceptions-list-button"
275 contentType="pepper_flash_cameramic"
276 i18n-content="manage_exceptions"></button>
277 </div>
278 </section>
258 <if expr="pp_ifdef('chromeos')"> 279 <if expr="pp_ifdef('chromeos')">
259 <!-- Protected Content filter --> 280 <!-- Protected Content filter -->
260 <section guest-visibility="disabled"> 281 <section guest-visibility="disabled">
261 <h3 i18n-content="protectedContentTabLabel" 282 <h3 i18n-content="protectedContentTabLabel"
262 class="content-settings-header"></h3> 283 class="content-settings-header"></h3>
263 <div> 284 <div>
264 <div class="settings-row"> 285 <div class="settings-row">
265 <span i18n-content="protectedContentInfo"></span> 286 <span i18n-content="protectedContentInfo"></span>
266 </div> 287 </div>
267 <div class="checkbox"> 288 <div class="checkbox">
268 <label> 289 <label>
269 <input pref="settings.privacy.drm_enabled" type="checkbox"> 290 <input pref="settings.privacy.drm_enabled" type="checkbox">
270 <span i18n-content="protectedContentEnable"></span> 291 <span i18n-content="protectedContentEnable"></span>
271 </label> 292 </label>
272 </div> 293 </div>
273 </div> 294 </div>
274 </section> 295 </section>
275 </if> 296 </if>
276 </div> 297 </div>
277 <div class="action-area"> 298 <div class="action-area">
278 <div class="button-strip"> 299 <div class="button-strip">
279 <button id="content-settings-overlay-confirm" i18n-content="ok"></button> 300 <button id="content-settings-overlay-confirm" i18n-content="ok"></button>
280 </div> 301 </div>
281 </div> 302 </div>
282 </div> 303 </div>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698