Bug 1603537 - Port bug 1596869: Migrate .xul files in security/manager/pki/ to .xhtml. r+a=mkmelin
authorRichard Marti <richard.marti@gmail.com>
Mon, 16 Dec 2019 14:48:09 +0200
changeset 37663 d4499372d4412e54d36531e03f64fc38c6a2b133
parent 37662 f66c2ed5241cd32076ecadd0ee1f4b6c8671a9f4
child 37664 731f03ac2843b1249879005c236a872b9c220d57
push id396
push userclokep@gmail.com
push dateMon, 06 Jan 2020 23:11:57 +0000
bugs1603537, 1596869
Bug 1603537 - Port bug 1596869: Migrate .xul files in security/manager/pki/ to .xhtml. r+a=mkmelin
calendar/base/modules/utils/calProviderUtils.jsm
mail/base/content/mailWindow.js
mail/components/accountcreation/content/emailWizard.js
mail/components/accountcreation/content/verifyConfig.js
mail/components/enterprisepolicies/tests/browser/browser_policy_disable_masterpassword.js
mail/components/im/content/imAccounts.js
mail/components/preferences/privacy.js
mail/themes/shared/mail/incontentprefs/dialog.css
mailnews/extensions/newsblog/content/feed-subscriptions.js
mailnews/extensions/smime/content/am-smime.js
mailnews/extensions/smime/content/msgCompSecurityInfo.js
mailnews/extensions/smime/content/msgReadSecurityInfo.js
--- a/calendar/base/modules/utils/calProviderUtils.jsm
+++ b/calendar/base/modules/utils/calProviderUtils.jsm
@@ -189,17 +189,17 @@ var calprovider = {
         notify: function(timer) {
           let params = {
             exceptionAdded: false,
             securityInfo: secInfo,
             prefetchCert: true,
             location: targetSite,
           };
           calWindow.openDialog(
-            "chrome://pippki/content/exceptionDialog.xul",
+            "chrome://pippki/content/exceptionDialog.xhtml",
             "",
             "chrome,centerscreen,modal",
             params
           );
           if (this.thisProvider.canRefresh && params.exceptionAdded) {
             // Refresh the provider if the
             // exception certificate was added
             this.thisProvider.refresh();
--- a/mail/base/content/mailWindow.js
+++ b/mail/base/content/mailWindow.js
@@ -678,17 +678,17 @@ function UpdateFullZoomMenu() {
 function InformUserOfCertError(socketInfo, secInfo, targetSite) {
   let params = {
     exceptionAdded: false,
     securityInfo: secInfo,
     prefetchCert: true,
     location: targetSite,
   };
   window.openDialog(
-    "chrome://pippki/content/exceptionDialog.xul",
+    "chrome://pippki/content/exceptionDialog.xhtml",
     "",
     "chrome,centerscreen,modal",
     params
   );
 }
 
 function nsBrowserAccess() {}
 
--- a/mail/components/accountcreation/content/emailWizard.js
+++ b/mail/components/accountcreation/content/emailWizard.js
@@ -2427,17 +2427,17 @@ SecurityWarningDialog.prototype = {
       config.incoming.badCert
     ) {
       let params = {
         exceptionAdded: false,
         prefetchCert: true,
         location: config.incoming.targetSite,
       };
       window.openDialog(
-        "chrome://pippki/content/exceptionDialog.xul",
+        "chrome://pippki/content/exceptionDialog.xhtml",
         "",
         "chrome,centerscreen,modal",
         params
       );
       if (params.exceptionAdded) {
         // set by dialog
         config.incoming.badCert = false;
       } else {
@@ -2450,17 +2450,17 @@ SecurityWarningDialog.prototype = {
         config.outgoing.badCert
       ) {
         let params = {
           exceptionAdded: false,
           prefetchCert: true,
           location: config.outgoing.targetSite,
         };
         window.openDialog(
-          "chrome://pippki/content/exceptionDialog.xul",
+          "chrome://pippki/content/exceptionDialog.xhtml",
           "",
           "chrome,centerscreen,modal",
           params
         );
         if (params.exceptionAdded) {
           // set by dialog
           config.outgoing.badCert = false;
         } else {
--- a/mail/components/accountcreation/content/verifyConfig.js
+++ b/mail/components/accountcreation/content/verifyConfig.js
@@ -384,17 +384,17 @@ urlListener.prototype = {
   informUserOfCertError(socketInfo, secInfo, targetSite) {
     var params = {
       exceptionAdded: false,
       securityInfo: secInfo,
       prefetchCert: true,
       location: targetSite,
     };
     window.openDialog(
-      "chrome://pippki/content/exceptionDialog.xul",
+      "chrome://pippki/content/exceptionDialog.xhtml",
       "",
       "chrome,centerscreen,modal",
       params
     );
     this._log.info("cert exception dialog closed");
     this._log.info("cert exceptionAdded = " + params.exceptionAdded);
     if (!params.exceptionAdded) {
       this._cleanup();
--- a/mail/components/enterprisepolicies/tests/browser/browser_policy_disable_masterpassword.js
+++ b/mail/components/enterprisepolicies/tests/browser/browser_policy_disable_masterpassword.js
@@ -5,17 +5,17 @@
 
 const MASTER_PASSWORD = "omgsecret!";
 const mpToken = Cc["@mozilla.org/security/pk11tokendb;1"]
   .getService(Ci.nsIPK11TokenDB)
   .getInternalKeyToken();
 
 async function checkDeviceManager({ buttonIsDisabled }) {
   let deviceManagerWindow = window.openDialog(
-    "chrome://pippki/content/device_manager.xul",
+    "chrome://pippki/content/device_manager.xhtml",
     "",
     ""
   );
   await BrowserTestUtils.waitForEvent(deviceManagerWindow, "load");
 
   let tree = deviceManagerWindow.document.getElementById("device_tree");
   ok(tree, "The device tree exists");
 
--- a/mail/components/im/content/imAccounts.js
+++ b/mail/components/im/content/imAccounts.js
@@ -270,17 +270,17 @@ var gAccountManager = {
     // Open the Gecko SSL exception dialog.
     let params = {
       exceptionAdded: false,
       securityInfo: prplAccount.secInfo,
       prefetchCert: true,
       location: prplAccount.connectionTarget,
     };
     window.openDialog(
-      "chrome://pippki/content/exceptionDialog.xul",
+      "chrome://pippki/content/exceptionDialog.xhtml",
       "",
       "chrome,centerscreen,modal",
       params
     );
     // Reconnect the account if an exception was added.
     if (params.exceptionAdded) {
       account.connect();
     }
--- a/mail/components/preferences/privacy.js
+++ b/mail/components/preferences/privacy.js
@@ -399,17 +399,17 @@ var gPrivacyPane = {
       );
     }
   },
 
   /**
    * Display the user's certificates and associated options.
    */
   showCertificates() {
-    gSubDialog.open("chrome://pippki/content/certManager.xul");
+    gSubDialog.open("chrome://pippki/content/certManager.xhtml");
   },
 
   /**
    * security.OCSP.enabled is an integer value for legacy reasons.
    * A value of 1 means OCSP is enabled. Any other value means it is disabled.
    */
   readEnableOCSP() {
     var preference = Preferences.get("security.OCSP.enabled");
@@ -427,17 +427,17 @@ var gPrivacyPane = {
     var checkbox = document.getElementById("enableOCSP");
     return checkbox.checked ? 1 : 0;
   },
 
   /**
    * Display a dialog from which the user can manage his security devices.
    */
   showSecurityDevices() {
-    gSubDialog.open("chrome://pippki/content/device_manager.xul");
+    gSubDialog.open("chrome://pippki/content/device_manager.xhtml");
   },
 };
 
 Preferences.get("mailnews.message_display.disable_remote_image").on(
   "change",
   gPrivacyPane.reloadMessageInOpener
 );
 Preferences.get("mail.phishing.detection.enabled").on(
--- a/mail/themes/shared/mail/incontentprefs/dialog.css
+++ b/mail/themes/shared/mail/incontentprefs/dialog.css
@@ -27,17 +27,17 @@ prefpane {
   padding: 4px;
 }
 
 .contentPane.doScroll {
   overflow-y: auto;
 }
 
 tabbox {
-  /* override the rule in certManager.xul */
+  /* override the rule in certManager.xhtml */
   margin: 0 0 5px !important;
 }
 
 tabpanels {
   font-size: 1em;
 }
 
 tabs,
--- a/mailnews/extensions/newsblog/content/feed-subscriptions.js
+++ b/mailnews/extensions/newsblog/content/feed-subscriptions.js
@@ -2190,17 +2190,17 @@ var FeedSubscriptions = {
     let locationValue = document.getElementById("locationValue");
     let feedURL = locationValue.value.trim();
     let params = {
       exceptionAdded: false,
       location: feedURL,
       prefetchCert: true,
     };
     window.openDialog(
-      "chrome://pippki/content/exceptionDialog.xul",
+      "chrome://pippki/content/exceptionDialog.xhtml",
       "",
       "chrome,centerscreen,modal",
       params
     );
     if (params.exceptionAdded) {
       this.clearStatusInfo();
     }
 
--- a/mailnews/extensions/smime/content/am-smime.js
+++ b/mailnews/extensions/smime/content/am-smime.js
@@ -490,34 +490,34 @@ function smimeClearCert(smime_cert) {
 function openCertManager() {
   // Check for an existing certManager window and focus it; it's not
   // application modal.
   let lastCertManager = Services.wm.getMostRecentWindow("mozilla:certmanager");
   if (lastCertManager) {
     lastCertManager.focus();
   } else {
     window.openDialog(
-      "chrome://pippki/content/certManager.xul",
+      "chrome://pippki/content/certManager.xhtml",
       "",
       "centerscreen,resizable=yes,dialog=no"
     );
   }
 }
 
 function openDeviceManager() {
   // Check for an existing deviceManager window and focus it; it's not
   // application modal.
   let lastCertManager = Services.wm.getMostRecentWindow(
     "mozilla:devicemanager"
   );
   if (lastCertManager) {
     lastCertManager.focus();
   } else {
     window.openDialog(
-      "chrome://pippki/content/device_manager.xul",
+      "chrome://pippki/content/device_manager.xhtml",
       "",
       "centerscreen,resizable=yes,dialog=no"
     );
   }
 }
 
 function smimeOnLoadEditor() {
   smimeInitializeFields();
--- a/mailnews/extensions/smime/content/msgCompSecurityInfo.js
+++ b/mailnews/extensions/smime/content/msgCompSecurityInfo.js
@@ -278,17 +278,17 @@ function onSelectionChange(event) {
   gViewButton.disabled = !(
     gListBox.selectedItems.length == 1 && certForRow(gListBox.selectedIndex)
   );
 }
 
 function viewCertHelper(parent, cert) {
   Services.ww.openWindow(
     parent,
-    "chrome://pippki/content/certViewer.xul",
+    "chrome://pippki/content/certViewer.xhtml",
     "_blank",
     "centerscreen,chrome,titlebar",
     cert
   );
 }
 
 function certForRow(aRowIndex) {
   return gCerts.value[aRowIndex];
--- a/mailnews/extensions/smime/content/msgReadSecurityInfo.js
+++ b/mailnews/extensions/smime/content/msgReadSecurityInfo.js
@@ -211,17 +211,17 @@ function onLoad() {
     }
   }
 }
 /* eslint-enable complexity */
 
 function viewCertHelper(parent, cert) {
   Services.ww.openWindow(
     parent,
-    "chrome://pippki/content/certViewer.xul",
+    "chrome://pippki/content/certViewer.xhtml",
     "_blank",
     "centerscreen,chrome,titlebar",
     cert
   );
 }
 
 function viewSignatureCert() {
   if (gSignerCert) {