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

Unified 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: Fix 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/settings/privacy_page/privacy_page.html
diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html
index 0e2a19db318bcd877c095dfc7d23f6eb7c6a23b3..6665daa095e4aceecf1528021c94c4d6c08a7673 100644
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -2,7 +2,9 @@
<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classes/iron-flex-layout.html">
<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animatable.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
+<if expr="use_nss_certs">
<link rel="import" href="chrome://md-settings/certificate_manager_page/certificate_manager_page.html">
+</if>
<link rel="import" href="chrome://md-settings/clear_browsing_data_dialog/clear_browsing_data_dialog.html">
<link rel="import" href="chrome://md-settings/controls/settings_checkbox.html">
<link rel="import" href="chrome://md-settings/settings_page/settings_animated_pages.html">
@@ -71,7 +73,13 @@
</settings-checkbox>
</if>
</div>
- <div class="settings-box two-line" on-tap="onManageCertificatesTap_">
+ <div class="settings-box two-line"
+<if expr="use_nss_certs">
+ on-tap="onManageCertificatesWebUiTap_">
+</if>
+<if expr="not use_nss_certs">
+ on-tap="onManageCertificatesNativeTap_">
+</if>
Dan Beam 2016/03/25 02:21:18 can you just do this in the javascript instead?
dpapad 2016/03/25 16:56:55 Done.
<div class="start">
<div i18n-content="manageCertificates"></div>
<div class="secondary">
@@ -95,12 +103,14 @@
</paper-button>
</div>
</neon-animatable>
+<if expr="use_nss_certs">
<neon-animatable id="manage-certificates">
<settings-subheader i18n-values="page-title:manageCertificates">
</settings-subheader>
<settings-certificate-manager-page>
</settings-certificate-manager-page>
</neon-animatable>
+</if>
<neon-animatable id="site-settings">
<settings-subheader i18n-values="page-title:siteSettings">
</settings-subheader>

Powered by Google App Engine
This is Rietveld 408576698