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

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

Issue 1085923002: Rename use_nss to use_nss_certs in gyp and grit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: wrapping Created 5 years, 8 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 | « build/secondary/tools/grit/grit_rule.gni ('k') | chrome/browser/resources/options/options.html » ('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="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 <include src="reset_profile_settings_banner.html"> 5 <include src="reset_profile_settings_banner.html">
6 <include src="automatic_settings_reset_banner.html"> 6 <include src="automatic_settings_reset_banner.html">
7 <if expr="chromeos"> 7 <if expr="chromeos">
8 <link rel="import" href="chrome://resources/cr_elements/cr_network_icon/cr_net work_icon.html"> 8 <link rel="import" href="chrome://resources/cr_elements/cr_network_icon/cr_net work_icon.html">
9 <link rel="import" href="chrome://resources/cr_elements/cr_onc/cr_onc_data.htm l"> 9 <link rel="import" href="chrome://resources/cr_elements/cr_onc/cr_onc_data.htm l">
10 <include src="secondary_user_banner.html"> 10 <include src="secondary_user_banner.html">
(...skipping 735 matching lines...) Expand 10 before | Expand all | Expand 10 after
746 <button id="autoOpenFileTypesResetToDefault" 746 <button id="autoOpenFileTypesResetToDefault"
747 i18n-content="autoOpenFileTypesResetToDefault"></button> 747 i18n-content="autoOpenFileTypesResetToDefault"></button>
748 </div> 748 </div>
749 </div> 749 </div>
750 </div> 750 </div>
751 </div> 751 </div>
752 </section> 752 </section>
753 <section> 753 <section>
754 <h3 i18n-content="advancedSectionTitleCertificates"></h3> 754 <h3 i18n-content="advancedSectionTitleCertificates"></h3>
755 <div> 755 <div>
756 <if expr="use_nss or is_win or is_macosx"> 756 <if expr="use_nss_certs or is_win or is_macosx">
757 <div class="settings-row"> 757 <div class="settings-row">
758 <button id="certificatesManageButton" 758 <button id="certificatesManageButton"
759 i18n-content="certificatesManageButton"></button> 759 i18n-content="certificatesManageButton"></button>
760 </div> 760 </div>
761 </if> 761 </if>
762 </div> 762 </div>
763 </section> 763 </section>
764 <if expr="enable_service_discovery"> 764 <if expr="enable_service_discovery">
765 <section id="cloudprint-options-mdns"> 765 <section id="cloudprint-options-mdns">
766 <h3 i18n-content="advancedSectionTitleCloudPrint"></h3> 766 <h3 i18n-content="advancedSectionTitleCloudPrint"></h3>
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
1011 </button> 1011 </button>
1012 </div> 1012 </div>
1013 </section> 1013 </section>
1014 </div> <!-- advanced-settings-container --> 1014 </div> <!-- advanced-settings-container -->
1015 </div> <!-- advanced-settings --> 1015 </div> <!-- advanced-settings -->
1016 <footer id="advanced-settings-footer"> 1016 <footer id="advanced-settings-footer">
1017 <a is="action-link" id="advanced-settings-expander" 1017 <a is="action-link" id="advanced-settings-expander"
1018 i18n-content="showAdvancedSettings"></a> 1018 i18n-content="showAdvancedSettings"></a>
1019 </footer> 1019 </footer>
1020 </div> 1020 </div>
OLDNEW
« no previous file with comments | « build/secondary/tools/grit/grit_rule.gni ('k') | chrome/browser/resources/options/options.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698