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

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

Issue 10458069: Reland: Fix imported server certs being distrusted in NSS 3.13. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix the test failures 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="settings" class="page" hidden> 1 <div id="settings" class="page" hidden>
2 <header> 2 <header>
3 <h1 i18n-content="settingsTitle"></h1> 3 <h1 i18n-content="settingsTitle"></h1>
4 </header> 4 </header>
5 <if expr="not pp_ifdef('chromeos')"> 5 <if expr="not pp_ifdef('chromeos')">
6 <include src="sync_section.html"> 6 <include src="sync_section.html">
7 </if> 7 </if>
8 <if expr="pp_ifdef('chromeos')"> 8 <if expr="pp_ifdef('chromeos')">
9 <section> 9 <section>
10 <h3 i18n-content="sectionTitleInternet"></h3> 10 <h3 i18n-content="sectionTitleInternet"></h3>
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 <button id="autoOpenFileTypesResetToDefault" 424 <button id="autoOpenFileTypesResetToDefault"
425 i18n-content="autoOpenFileTypesResetToDefault"></button> 425 i18n-content="autoOpenFileTypesResetToDefault"></button>
426 </div> 426 </div>
427 </div> 427 </div>
428 </if> 428 </if>
429 </div> 429 </div>
430 </section> 430 </section>
431 <section> 431 <section>
432 <h3 i18n-content="advancedSectionTitleSecurity"></h3> 432 <h3 i18n-content="advancedSectionTitleSecurity"></h3>
433 <div> 433 <div>
434 <if expr="pp_ifdef('use_nss') or is_win or is_macosx">
434 <div class="settings-row"> 435 <div class="settings-row">
435 <button id="certificatesManageButton" 436 <button id="certificatesManageButton"
436 i18n-content="certificatesManageButton"></button> 437 i18n-content="certificatesManageButton"></button>
437 </div> 438 </div>
439 </if>
438 <div class="checkbox"> 440 <div class="checkbox">
439 <label> 441 <label>
440 <input id="sslCheckRevocation" type="checkbox"> 442 <input id="sslCheckRevocation" type="checkbox">
441 <span i18n-content="sslCheckRevocation"></span> 443 <span i18n-content="sslCheckRevocation"></span>
442 </label> 444 </label>
443 </div> 445 </div>
444 </div> 446 </div>
445 </section> 447 </section>
446 <if expr="not pp_ifdef('chromeos')"> 448 <if expr="not pp_ifdef('chromeos')">
447 <section id="cloud-print-connector-section"> 449 <section id="cloud-print-connector-section">
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
510 </section> 512 </section>
511 </if> 513 </if>
512 </div> <!-- advanced-settings-container --> 514 </div> <!-- advanced-settings-container -->
513 </div> <!-- advanced-settings --> 515 </div> <!-- advanced-settings -->
514 <footer> 516 <footer>
515 <button id="advanced-settings-expander" class="link-button" 517 <button id="advanced-settings-expander" class="link-button"
516 i18n-content="showAdvancedSettings"> 518 i18n-content="showAdvancedSettings">
517 </button> 519 </button>
518 </footer> 520 </footer>
519 </div> 521 </div>
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/cros/onc_network_parser_unittest.cc ('k') | chrome/browser/resources/options2/options.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698