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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/resources/options/content_settings.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: Reintroduced the label, but as hidden. Created 5 years, 4 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
« no previous file with comments | « chrome/browser/resources/options/content_settings.css ('k') | chrome/browser/resources/options/content_settings.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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="cookiesTabLabel"></h3> 7 <h3 i18n-content="cookiesTabLabel"></h3>
8 <div> 8 <div>
9 <div class="radio controlled-setting-with-label"> 9 <div class="radio controlled-setting-with-label">
10 <label> 10 <label>
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 <if expr="chromeos"> 386 <if expr="chromeos">
387 <div class="settings-row"> 387 <div class="settings-row">
388 <button id="protected-content-exceptions" 388 <button id="protected-content-exceptions"
389 class="exceptions-list-button" contentType="protectedContent" 389 class="exceptions-list-button" contentType="protectedContent"
390 i18n-content="manageExceptions"></button> 390 i18n-content="manageExceptions"></button>
391 </div> 391 </div>
392 </if> 392 </if>
393 </div> 393 </div>
394 </section> 394 </section>
395 </if> 395 </if>
396 <!-- Media Stream capture device filter --> 396 <!-- Microphone filter -->
397 <section id="media-stream-settings"> 397 <section>
398 <div class="section-header"> 398 <h3 i18n-content="mediaStreamMicTabLabel"></h3>
399 <h3 i18n-content="mediaStreamTabLabel"></h3>
400 <span id="media-indicator"
401 class="controlled-setting-indicator group-indicator"></span>
402 </div>
403 <div> 399 <div>
404 <div class="media-device-control"> 400 <span id="media-select-mic-label"
405 <span id="media-select-mic-label" i18n-content="mediaSelectMicLabel"> 401 i18n-content="mediaSelectMicLabel" hidden></span>
406 </span> 402 <select id="media-select-mic" class="weakrtl media-device-control"
407 <select id="media-select-mic" class="weakrtl" 403 aria-labelledby="media-select-mic-label"></select>
408 aria-labelledby="media-select-mic-label"></select>
409 </div>
410 <div class="media-device-control">
411 <span id="media-select-camera-label"
412 i18n-content="mediaSelectCameraLabel"></span>
413 <select id="media-select-camera" class="weakrtl"
414 aria-labelledby="media-select-camera-label"></select>
415 </div>
416 <div class="radio controlled-setting-with-label"> 404 <div class="radio controlled-setting-with-label">
417 <label> 405 <label>
418 <input type="radio" name="media-stream" value="ask"> 406 <input type="radio" name="media-stream-mic" value="ask">
419 <span> 407 <span>
420 <span id="media-stream-ask-label" i18n-content="mediaStreamAsk"> 408 <span i18n-content="mediaStreamMicAsk"></span>
421 </span>
422 <span class="controlled-setting-indicator" 409 <span class="controlled-setting-indicator"
423 content-setting="media-stream" value="ask"></span> 410 content-setting="media-stream-mic" value="ask"></span>
424 </span> 411 </span>
425 </label> 412 </label>
426 </div> 413 </div>
427 <div class="radio controlled-setting-with-label"> 414 <div class="radio controlled-setting-with-label">
428 <label> 415 <label>
429 <input id="media-stream-block" type="radio" name="media-stream" 416 <input type="radio" name="media-stream-mic" value="block">
430 value="block">
431 <span> 417 <span>
432 <span id="media-stream-block-label" 418 <span i18n-content="mediaStreamMicBlock"></span>
433 i18n-content="mediaStreamBlock"></span>
434 <span class="controlled-setting-indicator" 419 <span class="controlled-setting-indicator"
435 content-setting="media-stream" value="block"></span> 420 content-setting="media-stream-mic" value="block"></span>
436 </span> 421 </span>
437 </label> 422 </label>
438 </div> 423 </div>
439 <div class="settings-row"> 424 <div class="settings-row">
440 <button class="exceptions-list-button" contentType="media-stream" 425 <button class="exceptions-list-button" contentType="media-stream-mic"
441 i18n-content="manageExceptions"></button> 426 i18n-content="manageExceptions"></button>
442 </div> 427 </div>
443 <div id="media-pepper-flash-default" class="pepper-flash-settings"> 428 <div id="media-pepper-flash-default" class="pepper-flash-settings">
444 <span i18n-content="mediaPepperFlashDefaultDivergedLabel"></span> 429 <span i18n-content="mediaPepperFlashDefaultDivergedLabel"></span>
445 <a target="_blank" i18n-content="mediaPepperFlashChangeLink" 430 <a target="_blank" i18n-content="mediaPepperFlashChangeLink"
446 i18n-values="href:mediaPepperFlashGlobalPrivacyURL"></a> 431 i18n-values="href:mediaPepperFlashGlobalPrivacyURL"></a>
447 </div> 432 </div>
448 </div> 433 </div>
449 </section> 434 </section>
435 <!-- Camera filter -->
436 <section>
437 <h3 i18n-content="mediaStreamCameraTabLabel"></h3>
438 <div>
439 <span id="media-select-camera-label"
440 i18n-content="mediaSelectCameraLabel" hidden></span>
441 <select id="media-select-camera" class="weakrtl media-device-control"
442 aria-labelledby="media-select-camera-label"></select>
443 <div class="radio controlled-setting-with-label">
444 <label>
445 <input type="radio" name="media-stream-camera" value="ask">
446 <span>
447 <span i18n-content="mediaStreamCameraAsk"></span>
448 <span class="controlled-setting-indicator"
449 content-setting="media-stream-camera" value="ask"></span>
450 </span>
451 </label>
452 </div>
453 <div class="radio controlled-setting-with-label">
454 <label>
455 <input type="radio" name="media-stream-camera" value="block">
456 <span>
457 <span i18n-content="mediaStreamCameraBlock"></span>
458 <span class="controlled-setting-indicator"
459 content-setting="media-stream-camera" value="block"></span>
460 </span>
461 </label>
462 </div>
463 <div class="settings-row">
464 <button class="exceptions-list-button"
465 contentType="media-stream-camera" i18n-content="manageExceptions">
466 </button>
467 </div>
468 <div id="media-pepper-flash-default" class="pepper-flash-settings">
469 <span i18n-content="mediaPepperFlashDefaultDivergedLabel"></span>
470 <a target="_blank" i18n-content="mediaPepperFlashChangeLink"
471 i18n-values="href:mediaPepperFlashGlobalPrivacyURL"></a>
472 </div>
473 </div>
474 </section>
450 <!-- PPAPI broker --> 475 <!-- PPAPI broker -->
451 <section> 476 <section>
452 <h3 i18n-content="ppapiBrokerTabLabel"></h3> 477 <h3 i18n-content="ppapiBrokerTabLabel"></h3>
453 <div> 478 <div>
454 <div class="radio"> 479 <div class="radio">
455 <label> 480 <label>
456 <input type="radio" name="ppapi-broker" value="allow"> 481 <input type="radio" name="ppapi-broker" value="allow">
457 <span> 482 <span>
458 <span i18n-content="ppapiBrokerAllow"></span> 483 <span i18n-content="ppapiBrokerAllow"></span>
459 <span class="controlled-setting-indicator" 484 <span class="controlled-setting-indicator"
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
601 </section> 626 </section>
602 </div> 627 </div>
603 <div class="action-area"> 628 <div class="action-area">
604 <div class="button-strip"> 629 <div class="button-strip">
605 <button id="content-settings-overlay-confirm" class="default-button" 630 <button id="content-settings-overlay-confirm" class="default-button"
606 i18n-content="done"> 631 i18n-content="done">
607 </button> 632 </button>
608 </div> 633 </div>
609 </div> 634 </div>
610 </div> 635 </div>
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/content_settings.css ('k') | chrome/browser/resources/options/content_settings.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698