Bug 1604727 - Migrate .xul files in preferences to .xhtml. r=mkmelin
authorRichard Marti <richard.marti@gmail.com>
Wed, 18 Dec 2019 13:17:49 +0200
changeset 37774 0b394917cc2eb23974ef3b2cc42e622d6ebb1f54
parent 37773 b15f1848fa6a1772347e71ea6d6453ebdba6fd4f
child 37775 9b1de1fb20081c56c7037ca6c31024e2ed663c3f
push id397
push userclokep@gmail.com
push dateMon, 10 Feb 2020 21:16:13 +0000
reviewersmkmelin
bugs1604727
Bug 1604727 - Migrate .xul files in preferences to .xhtml. r=mkmelin
mail/base/content/macMessengerMenu.js
mail/base/content/msgMail3PaneWindow.js
mail/base/content/newTagDialog.xhtml
mail/base/content/newTagDialog.xul
mail/base/content/systemIntegrationDialog.xhtml
mail/base/content/systemIntegrationDialog.xul
mail/base/jar.mn
mail/components/preferences/aboutPreferences.xhtml
mail/components/preferences/aboutPreferences.xul
mail/components/preferences/applicationManager.xhtml
mail/components/preferences/applicationManager.xul
mail/components/preferences/attachmentReminder.xhtml
mail/components/preferences/attachmentReminder.xul
mail/components/preferences/chat.inc.xhtml
mail/components/preferences/chat.inc.xul
mail/components/preferences/colors.xhtml
mail/components/preferences/colors.xul
mail/components/preferences/compose.inc.xhtml
mail/components/preferences/compose.inc.xul
mail/components/preferences/compose.js
mail/components/preferences/connection.xhtml
mail/components/preferences/connection.xul
mail/components/preferences/cookies.xhtml
mail/components/preferences/cookies.xul
mail/components/preferences/dockoptions.xhtml
mail/components/preferences/dockoptions.xul
mail/components/preferences/fonts.xhtml
mail/components/preferences/fonts.xul
mail/components/preferences/general.inc.xhtml
mail/components/preferences/general.inc.xul
mail/components/preferences/general.js
mail/components/preferences/jar.mn
mail/components/preferences/messengerLanguages.xhtml
mail/components/preferences/messengerLanguages.xul
mail/components/preferences/notifications.xhtml
mail/components/preferences/notifications.xul
mail/components/preferences/offline.xhtml
mail/components/preferences/offline.xul
mail/components/preferences/passwordManager.xhtml
mail/components/preferences/passwordManager.xul
mail/components/preferences/permissions.xhtml
mail/components/preferences/permissions.xul
mail/components/preferences/privacy.inc.xhtml
mail/components/preferences/privacy.inc.xul
mail/components/preferences/privacy.js
mail/components/preferences/receipts.xhtml
mail/components/preferences/receipts.xul
mail/components/preferences/sendoptions.xhtml
mail/components/preferences/sendoptions.xul
mail/test/browser/pref-window/browser_fontChooser.js
mail/test/mozmill/pref-window/test-font-chooser.js
mail/test/mozmill/shared-modules/PrefTabHelpers.jsm
mailnews/addrbook/prefs/content/pref-editdirectories.xhtml
mailnews/addrbook/prefs/content/pref-editdirectories.xul
mailnews/jar.mn
--- a/mail/base/content/macMessengerMenu.js
+++ b/mail/base/content/macMessengerMenu.js
@@ -32,17 +32,17 @@ addEventListener(
 /**
  * When the Preferences window is actually loaded, this Listener is called.
  * Not doing this way could make DOM elements not available.
  */
 function loadListener(event) {
   setTimeout(function() {
     let prefWin = Services.wm.getMostRecentWindow("Mail:Preferences");
     prefWin.gSubDialog.open(
-      "chrome://messenger/content/preferences/dockoptions.xul"
+      "chrome://messenger/content/preferences/dockoptions.xhtml"
     );
   });
 }
 
 /**
  * When the Preferences window is opened/closed, this observer will be called.
  * This is done so subdialog opens as a child of it.
  */
@@ -63,17 +63,17 @@ function PrefWindowObserver() {
  * If Preference window was already opened, this will select General pane before
  * opening Dock Options sub-dialog.
  */
 function openDockOptions() {
   let win = Services.wm.getMostRecentWindow("Mail:Preferences");
 
   if (win) {
     openOptionsDialog("paneGeneral");
-    win.gSubDialog("chrome://messenger/content/preferences/dockoptions.xul");
+    win.gSubDialog("chrome://messenger/content/preferences/dockoptions.xhtml");
   } else {
     Services.ww.registerNotification(new PrefWindowObserver());
     openOptionsDialog("paneGeneral");
   }
 }
 
 /**
  * Open a new window for writing a new message
--- a/mail/base/content/msgMail3PaneWindow.js
+++ b/mail/base/content/msgMail3PaneWindow.js
@@ -680,17 +680,17 @@ function LoadPostAccountWizard() {
           shellService.shouldCheckDefaultClient &&
           !shellService.isDefaultClient(true, nsIShellService.MAIL)) ||
         (SearchIntegration &&
           !SearchIntegration.osVersionTooLow &&
           !SearchIntegration.osComponentsNotRunning &&
           !SearchIntegration.firstRunDone)
       ) {
         window.openDialog(
-          "chrome://messenger/content/systemIntegrationDialog.xul",
+          "chrome://messenger/content/systemIntegrationDialog.xhtml",
           "SystemIntegration",
           "modal,centerscreen,chrome,resizable=no"
         );
         // On windows, there seems to be a delay between setting TB as the
         // default client, and the isDefaultClient check succeeding.
         if (shellService.isDefaultClient(true, nsIShellService.MAIL)) {
           Services.obs.notifyObservers(window, "mail:setAsDefault");
         }
rename from mail/base/content/newTagDialog.xul
rename to mail/base/content/newTagDialog.xhtml
rename from mail/base/content/systemIntegrationDialog.xul
rename to mail/base/content/systemIntegrationDialog.xhtml
--- a/mail/base/jar.mn
+++ b/mail/base/jar.mn
@@ -53,34 +53,34 @@ messenger.jar:
     content/messenger/FilterListDialog.js           (content/FilterListDialog.js)
     content/messenger/specialTabs.js                (content/specialTabs.js)
     content/messenger/aboutAddonsExtra.css          (content/aboutAddonsExtra.css)
     content/messenger/aboutAddonsExtra.js           (content/aboutAddonsExtra.js)
     content/messenger/aboutDialog-appUpdater.js     (content/aboutDialog-appUpdater.js)
 *   content/messenger/aboutDialog.xul               (content/aboutDialog.xul)
     content/messenger/aboutDialog.js                (content/aboutDialog.js)
 *   content/messenger/aboutRights.xhtml             (content/aboutRights.xhtml)
-*   content/messenger/systemIntegrationDialog.xul   (content/systemIntegrationDialog.xul)
+*   content/messenger/systemIntegrationDialog.xhtml (content/systemIntegrationDialog.xhtml)
     content/messenger/systemIntegrationDialog.js    (content/systemIntegrationDialog.js)
     content/messenger/folderPane.js                 (content/folderPane.js)
     content/messenger/messenger-customization.js    (content/messenger-customization.js)
     content/messenger/searchBar.js                  (content/searchBar.js)
     content/messenger/phishingDetector.js           (content/phishingDetector.js)
     content/messenger/mail-offline.js               (content/mail-offline.js)
     content/messenger/aboutDialog.css               (content/aboutDialog.css)
     content/messenger/converterDialog.css           (content/converterDialog.css)
     content/messenger/notification.css              (content/notification.css)
 *   content/messenger/messenger.css                 (content/messenger.css)
     content/messenger/gloda-autocomplete-input.js   (content/gloda-autocomplete-input.js)
     content/messenger/tabmail.js                    (content/tabmail.js)
     content/messenger/tabmail-tabs.js               (content/tabmail-tabs.js)
     content/messenger/tabbrowser-tab.js             (content/tabbrowser-tab.js)
     content/messenger/tabmail.css                   (content/tabmail.css)
     content/messenger/statuspanel.js                (content/statuspanel.js)
-    content/messenger/newTagDialog.xul              (content/newTagDialog.xul)
+    content/messenger/newTagDialog.xhtml            (content/newTagDialog.xhtml)
     content/messenger/newTagDialog.js               (content/newTagDialog.js)
     content/messenger/composerOverlay.css           (content/composerOverlay.css)
     content/messenger/threadPane.js                 (content/threadPane.js)
     content/messenger/protovis-r2.6-modded.js       (content/protovis-r2.6-modded.js)
 #ifdef XP_MACOSX
     content/messenger/macMessengerMenu.js           (content/macMessengerMenu.js)
 #endif
     content/messenger/selectionsummaries.js         (content/selectionsummaries.js)
rename from mail/components/preferences/aboutPreferences.xul
rename to mail/components/preferences/aboutPreferences.xhtml
--- a/mail/components/preferences/aboutPreferences.xul
+++ b/mail/components/preferences/aboutPreferences.xhtml
@@ -101,20 +101,20 @@
               <label class="sidebar-footer-label" flex="1">&addonsButton.label;</label>
             </hbox>
           </label>
         </hbox>
       </vbox>
       <hbox id="preferencesContainer" flex="1">
         <hbox class="paneDeckContainer" flex="1">
           <hbox id="paneDeck" flex="1">
-#include general.inc.xul
-#include compose.inc.xul
-#include privacy.inc.xul
-#include chat.inc.xul
+#include general.inc.xhtml
+#include compose.inc.xhtml
+#include privacy.inc.xhtml
+#include chat.inc.xhtml
             <prefpane id="paneLightning" label="&paneLightning.title;"/>
           </hbox>
         </hbox>
       </hbox>
     </hbox>
     <stack id="dialogStack" hidden="true"/>
     <vbox id="dialogTemplate"
           class="dialogOverlay"
rename from mail/components/preferences/applicationManager.xul
rename to mail/components/preferences/applicationManager.xhtml
rename from mail/components/preferences/attachmentReminder.xul
rename to mail/components/preferences/attachmentReminder.xhtml
rename from mail/components/preferences/chat.inc.xul
rename to mail/components/preferences/chat.inc.xhtml
rename from mail/components/preferences/colors.xul
rename to mail/components/preferences/colors.xhtml
rename from mail/components/preferences/compose.inc.xul
rename to mail/components/preferences/compose.inc.xhtml
--- a/mail/components/preferences/compose.js
+++ b/mail/components/preferences/compose.js
@@ -79,22 +79,22 @@ var gComposePane = {
       cloudFileBox.hidden = true;
       return;
     }
 
     gCloudFile.init();
   },
 
   sendOptionsDialog() {
-    gSubDialog.open("chrome://messenger/content/preferences/sendoptions.xul");
+    gSubDialog.open("chrome://messenger/content/preferences/sendoptions.xhtml");
   },
 
   attachmentReminderOptionsDialog() {
     gSubDialog.open(
-      "chrome://messenger/content/preferences/attachmentReminder.xul",
+      "chrome://messenger/content/preferences/attachmentReminder.xhtml",
       "resizable=no"
     );
   },
 
   updateAutosave() {
     gComposePane.enableElement(
       document.getElementById("autoSaveInterval"),
       Preferences.get("mail.compose.autosave").value
@@ -151,17 +151,17 @@ var gComposePane = {
     gComposePane.enableElement(
       document.getElementById("editButton"),
       acLDAPPref
     );
   },
 
   editDirectories() {
     gSubDialog.open(
-      "chrome://messenger/content/addressbook/pref-editdirectories.xul"
+      "chrome://messenger/content/addressbook/pref-editdirectories.xhtml"
     );
   },
 
   initAbDefaultStartupDir() {
     if (!this.startupDirListener.inited) {
       this.startupDirListener.load();
     }
 
rename from mail/components/preferences/connection.xul
rename to mail/components/preferences/connection.xhtml
rename from mail/components/preferences/cookies.xul
rename to mail/components/preferences/cookies.xhtml
rename from mail/components/preferences/dockoptions.xul
rename to mail/components/preferences/dockoptions.xhtml
rename from mail/components/preferences/fonts.xul
rename to mail/components/preferences/fonts.xhtml
rename from mail/components/preferences/general.inc.xul
rename to mail/components/preferences/general.inc.xhtml
--- a/mail/components/preferences/general.js
+++ b/mail/components/preferences/general.js
@@ -471,24 +471,24 @@ var gGeneralPane = {
     return Services.urlFormatter.formatURL(this.mStartPageUrl) ==
       startPage.value
       ? this.mStartPageUrl
       : startPage.value;
   },
 
   customizeMailAlert() {
     gSubDialog.open(
-      "chrome://messenger/content/preferences/notifications.xul",
+      "chrome://messenger/content/preferences/notifications.xhtml",
       "resizable=no"
     );
   },
 
   configureDockOptions() {
     gSubDialog.open(
-      "chrome://messenger/content/preferences/dockoptions.xul",
+      "chrome://messenger/content/preferences/dockoptions.xhtml",
       "resizable=no"
     );
   },
 
   convertURLToLocalFile(aFileURL) {
     // convert the file url into a nsIFile
     if (aFileURL) {
       return Services.io
@@ -738,17 +738,17 @@ var gGeneralPane = {
    */
   checkDefaultNow(aAppType) {
     if (!this.mShellServiceWorking) {
       return;
     }
 
     // otherwise, bring up the default client dialog
     gSubDialog.open(
-      "chrome://messenger/content/systemIntegrationDialog.xul",
+      "chrome://messenger/content/systemIntegrationDialog.xhtml",
       "resizable=no",
       "calledFromPrefs"
     );
   },
 
   // FONTS
 
   /**
@@ -844,26 +844,26 @@ var gGeneralPane = {
     })().catch(Cu.reportError);
   },
 
   /**
    * Displays the fonts dialog, where web page font names and sizes can be
    * configured.
    */
   configureFonts() {
-    gSubDialog.open("chrome://messenger/content/preferences/fonts.xul");
+    gSubDialog.open("chrome://messenger/content/preferences/fonts.xhtml");
   },
 
   /**
    * Displays the colors dialog, where default web page/link/etc. colors can be
    * configured.
    */
   configureColors() {
     gSubDialog.open(
-      "chrome://messenger/content/preferences/colors.xul",
+      "chrome://messenger/content/preferences/colors.xhtml",
       "resizable=no"
     );
   },
 
   /**
    * Returns the type of the current default font for the language denoted by
    * aLanguageGroup.
    */
@@ -1021,17 +1021,17 @@ var gGeneralPane = {
     menulist.value = selected;
 
     document.getElementById("messengerLanguagesBox").hidden = false;
   },
 
   showMessengerLanguages({ search }) {
     let opts = { selected: gGeneralPane.selectedLocales, search };
     gSubDialog.open(
-      "chrome://messenger/content/preferences/messengerLanguages.xul",
+      "chrome://messenger/content/preferences/messengerLanguages.xhtml",
       null,
       opts,
       this.messengerLanguagesClosed
     );
   },
 
   /* Show or hide the confirm change message bar based on the updated ordering. */
   messengerLanguagesClosed() {
@@ -1193,27 +1193,27 @@ var gGeneralPane = {
     if (index >= 0) {
       var tagElToEdit = this.mTagListBox.getItemAtIndex(index);
       var args = {
         result: "",
         keyToEdit: tagElToEdit.getAttribute("value"),
         okCallback: editTagCallback,
       };
       gSubDialog.open(
-        "chrome://messenger/content/newTagDialog.xul",
+        "chrome://messenger/content/newTagDialog.xhtml",
         "resizable=no",
         args
       );
     }
   },
 
   addTag() {
     var args = { result: "", okCallback: addTagCallback };
     gSubDialog.open(
-      "chrome://messenger/content/newTagDialog.xul",
+      "chrome://messenger/content/newTagDialog.xhtml",
       "resizable=no",
       args
     );
   },
 
   onSelectTag() {
     let btnEdit = document.getElementById("editTagButton");
     let listBox = document.getElementById("tagList");
@@ -1264,38 +1264,38 @@ var gGeneralPane = {
     }
   },
 
   /**
    * Display the return receipts configuration dialog.
    */
   showReturnReceipts() {
     gSubDialog.open(
-      "chrome://messenger/content/preferences/receipts.xul",
+      "chrome://messenger/content/preferences/receipts.xhtml",
       "resizable=no"
     );
   },
 
   showConfigEdit() {
     gSubDialog.open("chrome://global/content/config.xhtml");
   },
 
   /**
    * Display the the connection settings dialog.
    */
   showConnections() {
-    gSubDialog.open("chrome://messenger/content/preferences/connection.xul");
+    gSubDialog.open("chrome://messenger/content/preferences/connection.xhtml");
   },
 
   /**
    * Display the the offline settings dialog.
    */
   showOffline() {
     gSubDialog.open(
-      "chrome://messenger/content/preferences/offline.xul",
+      "chrome://messenger/content/preferences/offline.xhtml",
       "resizable=no"
     );
   },
 
   /*
    * browser.cache.disk.capacity
    * - the size of the browser cache in KB
    */
@@ -2043,17 +2043,17 @@ var gGeneralPane = {
       // or "Always ask" if the previous default application has been removed.
       this.rebuildActionsMenu();
 
       // Update the richlistitem too. Will be visible when selecting another row.
       this.selectedHandlerListItem.refreshAction();
     };
 
     gSubDialog.open(
-      "chrome://messenger/content/preferences/applicationManager.xul",
+      "chrome://messenger/content/preferences/applicationManager.xhtml",
       "resizable=no",
       handlerInfo,
       closingCallback
     );
   },
 
   chooseApp(aEvent) {
     // Don't let the normal "on select action" handler get this event,
--- a/mail/components/preferences/jar.mn
+++ b/mail/components/preferences/jar.mn
@@ -1,49 +1,49 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 messenger.jar:
-*   content/messenger/preferences/aboutPreferences.xul
+*   content/messenger/preferences/aboutPreferences.xhtml
     content/messenger/preferences/preferences.js
     content/messenger/preferences/preferencesTab.js
     content/messenger/preferences/general.js
 #ifdef XP_MACOSX
     content/messenger/preferences/dockoptions.js
-    content/messenger/preferences/dockoptions.xul
+    content/messenger/preferences/dockoptions.xhtml
 #endif
     content/messenger/preferences/chat.js
     content/messenger/preferences/messagestyle.js
     content/messenger/preferences/messengerLanguages.js
-    content/messenger/preferences/messengerLanguages.xul
+    content/messenger/preferences/messengerLanguages.xhtml
     content/messenger/preferences/colors.js
-*   content/messenger/preferences/colors.xul
+*   content/messenger/preferences/colors.xhtml
     content/messenger/preferences/compose.js
     content/messenger/preferences/privacy.js
-    content/messenger/preferences/sendoptions.xul
+    content/messenger/preferences/sendoptions.xhtml
     content/messenger/preferences/sendoptions.js
     content/messenger/preferences/receipts.js
-    content/messenger/preferences/receipts.xul
+    content/messenger/preferences/receipts.xhtml
     content/messenger/preferences/connection.js
-*   content/messenger/preferences/connection.xul
+*   content/messenger/preferences/connection.xhtml
     content/messenger/preferences/downloads.js
     content/messenger/preferences/attachmentReminder.js
-    content/messenger/preferences/attachmentReminder.xul
-    content/messenger/preferences/applicationManager.xul
+    content/messenger/preferences/attachmentReminder.xhtml
+    content/messenger/preferences/applicationManager.xhtml
     content/messenger/preferences/applicationManager.js
     content/messenger/preferences/handlers.css
     content/messenger/preferences/actionsshared.js
     content/messenger/preferences/fonts.js
-    content/messenger/preferences/fonts.xul
+    content/messenger/preferences/fonts.xhtml
 #ifndef XP_MACOSX
     content/messenger/preferences/notifications.js
-    content/messenger/preferences/notifications.xul
+    content/messenger/preferences/notifications.xhtml
 #endif
     content/messenger/preferences/offline.js
-    content/messenger/preferences/offline.xul
+    content/messenger/preferences/offline.xhtml
     content/messenger/preferences/cookies.js
-*   content/messenger/preferences/cookies.xul
+*   content/messenger/preferences/cookies.xhtml
     content/messenger/preferences/passwordManager.js
-    content/messenger/preferences/passwordManager.xul
+    content/messenger/preferences/passwordManager.xhtml
     content/messenger/preferences/permissions.js
-    content/messenger/preferences/permissions.xul
+    content/messenger/preferences/permissions.xhtml
     content/messenger/preferences/subdialogs.js
rename from mail/components/preferences/messengerLanguages.xul
rename to mail/components/preferences/messengerLanguages.xhtml
rename from mail/components/preferences/notifications.xul
rename to mail/components/preferences/notifications.xhtml
rename from mail/components/preferences/offline.xul
rename to mail/components/preferences/offline.xhtml
rename from mail/components/preferences/passwordManager.xul
rename to mail/components/preferences/passwordManager.xhtml
rename from mail/components/preferences/permissions.xul
rename to mail/components/preferences/permissions.xhtml
rename from mail/components/preferences/privacy.inc.xul
rename to mail/components/preferences/privacy.inc.xhtml
--- a/mail/components/preferences/privacy.js
+++ b/mail/components/preferences/privacy.js
@@ -146,27 +146,27 @@ var gPrivacyPane = {
       sessionVisible: true,
       allowVisible: true,
       prefilledHost: "",
       permissionType: "cookie",
       windowTitle: bundle.getString("cookiepermissionstitle"),
       introText: bundle.getString("cookiepermissionstext"),
     };
     gSubDialog.open(
-      "chrome://messenger/content/preferences/permissions.xul",
+      "chrome://messenger/content/preferences/permissions.xhtml",
       null,
       params
     );
   },
 
   /**
    * Displays all the user's cookies in a dialog.
    */
   showCookies(aCategory) {
-    gSubDialog.open("chrome://messenger/content/preferences/cookies.xul");
+    gSubDialog.open("chrome://messenger/content/preferences/cookies.xhtml");
   },
 
   /**
    * Converts between network.cookie.cookieBehavior and the third-party cookie UI
    */
   readAcceptThirdPartyCookies() {
     let pref = Preferences.get("network.cookie.cookieBehavior");
     switch (pref.value) {
@@ -209,17 +209,17 @@ var gPrivacyPane = {
       sessionVisible: false,
       allowVisible: true,
       prefilledHost: "",
       permissionType: "image",
       windowTitle: bundle.getString("imagepermissionstitle"),
       introText: bundle.getString("imagepermissionstext"),
     };
     gSubDialog.open(
-      "chrome://messenger/content/preferences/permissions.xul",
+      "chrome://messenger/content/preferences/permissions.xhtml",
       null,
       params
     );
   },
   updateManualMarkMode(aEnableRadioGroup) {
     document.getElementById("manualMarkMode").disabled = !aEnableRadioGroup;
   },
 
@@ -324,17 +324,17 @@ var gPrivacyPane = {
   },
 
   /**
    * Shows the sites where the user has saved passwords and the associated
    * login information.
    */
   showPasswords() {
     gSubDialog.open(
-      "chrome://messenger/content/preferences/passwordManager.xul"
+      "chrome://messenger/content/preferences/passwordManager.xhtml"
     );
   },
 
   updateDownloadedPhishingListState() {
     document.getElementById(
       "useDownloadedList"
     ).disabled = !document.getElementById("enablePhishingDetector").checked;
   },
rename from mail/components/preferences/receipts.xul
rename to mail/components/preferences/receipts.xhtml
rename from mail/components/preferences/sendoptions.xul
rename to mail/components/preferences/sendoptions.xhtml
--- a/mail/test/browser/pref-window/browser_fontChooser.js
+++ b/mail/test/browser/pref-window/browser_fontChooser.js
@@ -171,17 +171,17 @@ function _verify_fonts_displayed(aDefaul
   );
 
   // Now open the advanced dialog.
   mc.click(content_tab_eid(prefTab, "advancedFonts"));
   let fontc = wait_for_frame_load(
     prefTab.browser.contentDocument
       .getElementById("dialogOverlay-0")
       .querySelector("browser"),
-    "chrome://messenger/content/preferences/fonts.xul"
+    "chrome://messenger/content/preferences/fonts.xhtml"
   );
 
   // The font pickers are populated async so we need to wait for it.
   for (let fontElemId of ["serif", "sans-serif", "monospace"]) {
     fontc.waitFor(
       () => fontc.e(fontElemId).label != "",
       "Timeout waiting for font picker '" + fontElemId + "' to populate."
     );
--- a/mail/test/mozmill/pref-window/test-font-chooser.js
+++ b/mail/test/mozmill/pref-window/test-font-chooser.js
@@ -130,17 +130,17 @@ function _verify_fonts_displayed(aDefaul
   );
 
   // Now open the advanced dialog.
   mc.click(content_tab_eid(prefTab, "advancedFonts"));
   let fontc = wait_for_frame_load(
     prefTab.browser.contentDocument
       .getElementById("dialogOverlay-0")
       .querySelector("browser"),
-    "chrome://messenger/content/preferences/fonts.xul"
+    "chrome://messenger/content/preferences/fonts.xhtml"
   );
 
   // The font pickers are populated async so we need to wait for it.
   for (let fontElemId of ["serif", "sans-serif", "monospace"]) {
     fontc.waitFor(
       () => fontc.e(fontElemId).label != "",
       "Timeout waiting for font picker '" + fontElemId + "' to populate."
     );
--- a/mail/test/mozmill/shared-modules/PrefTabHelpers.jsm
+++ b/mail/test/mozmill/shared-modules/PrefTabHelpers.jsm
@@ -17,17 +17,17 @@ var fdh = ChromeUtils.import(
   "resource://testing-common/mozmill/FolderDisplayHelpers.jsm"
 );
 var cth = ChromeUtils.import(
   "resource://testing-common/mozmill/ContentTabHelpers.jsm"
 );
 
 /**
  * Open the preferences tab with the given pane displayed. The pane needs to
- * be one of the prefpane ids in mail/components/preferences/aboutPreferences.xul.
+ * be one of the prefpane ids in mail/components/preferences/aboutPreferences.xhtml.
  *
  * @param aPaneID The ID of the pref pane to display (see
  *     mail/components/preferences/aboutPreferences.xul for valid IDs.)
  */
 function open_pref_tab(aPaneID, aScrollTo) {
   let tab = cth.open_content_tab_with_click(
     function() {
       fdh.mc.window.openOptionsDialog(aPaneID, aScrollTo);
rename from mailnews/addrbook/prefs/content/pref-editdirectories.xul
rename to mailnews/addrbook/prefs/content/pref-editdirectories.xhtml
--- a/mailnews/jar.mn
+++ b/mailnews/jar.mn
@@ -1,17 +1,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 messenger.jar:
     content/messenger/addressbook/pref-directory-add.js                        (addrbook/prefs/content/pref-directory-add.js)
     content/messenger/addressbook/pref-directory-add.xul                       (addrbook/prefs/content/pref-directory-add.xul)
     content/messenger/addressbook/pref-editdirectories.js                      (addrbook/prefs/content/pref-editdirectories.js)
-    content/messenger/addressbook/pref-editdirectories.xul                     (addrbook/prefs/content/pref-editdirectories.xul)
+    content/messenger/addressbook/pref-editdirectories.xhtml                   (addrbook/prefs/content/pref-editdirectories.xhtml)
     content/messenger/addressbook/abAddressBookNameDialog.js                   (addrbook/content/abAddressBookNameDialog.js)
     content/messenger/addressbook/abAddressBookNameDialog.xul                  (addrbook/content/abAddressBookNameDialog.xul)
     content/messenger/addressbook/abResultsPane.js                             (addrbook/content/abResultsPane.js)
     content/messenger/addressbook/abDragDrop.js                                (addrbook/content/abDragDrop.js)
     content/messenger/addressbook/abMailListDialog.js                          (addrbook/content/abMailListDialog.js)
     content/messenger/addressbook/map-list.js                                  (addrbook/content/map-list.js)
     content/messagebody/addressbook/print.css                                  (addrbook/content/print.css)
 *   content/messenger/AccountManager.xul                                       (base/prefs/content/AccountManager.xul)