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

Side by Side Diff: chrome/browser/resources/settings/privacy_page/privacy_page.html

Issue 1831093002: MD Settings: Certificate manager, respect USE_NSS_CERTS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move ifdef to JS file. Created 4 years, 9 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
OLDNEW
1 <link rel="import" href="chrome://resources/html/polymer.html"> 1 <link rel="import" href="chrome://resources/html/polymer.html">
2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">
3 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 3 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
5 <if expr="use_nss_certs">
5 <link rel="import" href="chrome://md-settings/certificate_manager_page/certifica te_manager_page.html"> 6 <link rel="import" href="chrome://md-settings/certificate_manager_page/certifica te_manager_page.html">
7 </if>
6 <link rel="import" href="chrome://md-settings/clear_browsing_data_dialog/clear_b rowsing_data_dialog.html"> 8 <link rel="import" href="chrome://md-settings/clear_browsing_data_dialog/clear_b rowsing_data_dialog.html">
7 <link rel="import" href="chrome://md-settings/controls/settings_checkbox.html"> 9 <link rel="import" href="chrome://md-settings/controls/settings_checkbox.html">
8 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html"> 10 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html">
9 <link rel="import" href="chrome://md-settings/settings_page/settings_subheader.h tml"> 11 <link rel="import" href="chrome://md-settings/settings_page/settings_subheader.h tml">
10 <link rel="import" href="chrome://md-settings/settings_shared_css.html"> 12 <link rel="import" href="chrome://md-settings/settings_shared_css.html">
11 <link rel="import" href="chrome://md-settings/site_settings/all_sites.html"> 13 <link rel="import" href="chrome://md-settings/site_settings/all_sites.html">
12 <link rel="import" href="chrome://md-settings/site_settings/constants.html"> 14 <link rel="import" href="chrome://md-settings/site_settings/constants.html">
13 <link rel="import" href="chrome://md-settings/site_settings_page/site_settings_p age.html"> 15 <link rel="import" href="chrome://md-settings/site_settings_page/site_settings_p age.html">
14 16
15 <dom-module id="settings-privacy-page"> 17 <dom-module id="settings-privacy-page">
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 Contrary to popular belief, Lorem Ipsum is not simply random text. 90 Contrary to popular belief, Lorem Ipsum is not simply random text.
89 </div> 91 </div>
90 </div> 92 </div>
91 </div> 93 </div>
92 <div class="settings-box"> 94 <div class="settings-box">
93 <paper-button on-tap="onClearBrowsingDataTap_" class="primary-button" 95 <paper-button on-tap="onClearBrowsingDataTap_" class="primary-button"
94 i18n-content="clearBrowsingData"> 96 i18n-content="clearBrowsingData">
95 </paper-button> 97 </paper-button>
96 </div> 98 </div>
97 </neon-animatable> 99 </neon-animatable>
100 <if expr="use_nss_certs">
98 <neon-animatable id="manage-certificates"> 101 <neon-animatable id="manage-certificates">
99 <settings-subheader i18n-values="page-title:manageCertificates"> 102 <settings-subheader i18n-values="page-title:manageCertificates">
100 </settings-subheader> 103 </settings-subheader>
101 <settings-certificate-manager-page> 104 <settings-certificate-manager-page>
102 </settings-certificate-manager-page> 105 </settings-certificate-manager-page>
103 </neon-animatable> 106 </neon-animatable>
107 </if>
104 <neon-animatable id="site-settings"> 108 <neon-animatable id="site-settings">
105 <settings-subheader i18n-values="page-title:siteSettings"> 109 <settings-subheader i18n-values="page-title:siteSettings">
106 </settings-subheader> 110 </settings-subheader>
107 <settings-site-settings-page current-route="{{currentRoute}}" 111 <settings-site-settings-page current-route="{{currentRoute}}"
108 prefs="{{prefs}}" category-selected="{{categorySelected}}"> 112 prefs="{{prefs}}" category-selected="{{categorySelected}}">
109 </settings-site-settings-page> 113 </settings-site-settings-page>
110 </neon-animatable> 114 </neon-animatable>
111 115
112 <neon-animatable id="all-sites"> 116 <neon-animatable id="all-sites">
113 <settings-subheader 117 <settings-subheader
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 <neon-animatable id="site-details"> 214 <neon-animatable id="site-details">
211 <site-details prefs="{{prefs}}" origin="{{originSelected}}" 215 <site-details prefs="{{prefs}}" origin="{{originSelected}}"
212 current-route="{{currentRoute}}" 216 current-route="{{currentRoute}}"
213 category-selected="{{categorySelected}}"> 217 category-selected="{{categorySelected}}">
214 </site-details> 218 </site-details>
215 </neon-animatable> 219 </neon-animatable>
216 </settings-animated-pages> 220 </settings-animated-pages>
217 </template> 221 </template>
218 <script src="privacy_page.js"></script> 222 <script src="privacy_page.js"></script>
219 </dom-module> 223 </dom-module>
OLDNEW
« no previous file with comments | « chrome/app/settings_strings.grdp ('k') | chrome/browser/resources/settings/privacy_page/privacy_page.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698