MD Settings: Hooking up native certificate manager.

chrome/browser/resources/settings/privacy_page/privacy_page.html

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 801b47a95c79a0b6aa7999a937c381becde9d739..e1ad079863789bf768e49c7c52b8b805c051c30c 100644
--- a/chrome/browser/resources/settings/privacy_page/privacy_page.html
+++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html
@@ -2,9 +2,6 @@
 <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">
@@ -14,6 +11,13 @@
 <link rel="import" href="chrome://md-settings/site_settings/constants.html">
 <link rel="import" href="chrome://md-settings/site_settings_page/site_settings_page.html">
 
+<if expr="use_nss_certs">

[Dan Beam, 2016/03/31 00:24:40]

note: there actually is an <else> if you want to use it, btw

<if expr="use_nss_certs">
  <then>
    ...
  </then>
  <else><if expr="is_win or is_macosx">
      ...
  </if></else>
</if>

it's a little verbose, though... (also don't know if there's a better way to do
elseif)

[dpapad, 2016/03/31 01:15:03]

As discussed, the this only seems to work for grd files, but not for HTML.

+<link rel="import" href="chrome://md-settings/certificate_manager_page/certificate_manager_page.html">
+</if>
+<if expr="is_win or is_macosx">
+<link rel="import" href="chrome://md-settings/privacy_page/privacy_page_browser_proxy.html">
+</if>
+
 <dom-module id="settings-privacy-page">
   <link rel="import" type="css" href="privacy_page.css">
   <template>
@@ -73,7 +77,9 @@
           </settings-checkbox>
 </if>
         </div>
-        <div class="settings-box two-line" on-tap="onManageCertificatesTap_">
+<if expr="use_nss_certs or is_win or is_macosx">

[dpapad, 2016/03/30 23:52:03]

Fixed.

+        <div id="manageCertificates" class="settings-box two-line"
+            on-tap="onManageCertificatesTap_">
           <div class="start">
             <div i18n-content="manageCertificates"></div>
             <div class="secondary">
@@ -82,6 +88,7 @@
             </div>
           </div>
         </div>
+</if>
         <div class="settings-box two-line" on-tap="onSiteSettingsTap_">
           <div class="start">
             <div i18n-content="siteSettings"></div>