Bug 1570959 - Update hiddenWindow.xhtml on OSX to hiddenWindowMac.xhtml. r=mkmelin
authorKhushil Mistry <khushil324@gmail.com>
Tue, 12 May 2020 20:07:33 +0300
changeset 39122 8d4c676d5d53986359ff4214141f7f50015f04ef
parent 39121 d82bed3a0d0d71f62113909ff90c5d9fdeea18ab
child 39123 d58c5ca03202c9d27ae5ccdfdb867ee442ff411d
push id402
push userclokep@gmail.com
push dateMon, 29 Jun 2020 20:48:04 +0000
reviewersmkmelin
bugs1570959
Bug 1570959 - Update hiddenWindow.xhtml on OSX to hiddenWindowMac.xhtml. r=mkmelin
mail/app/profile/all-thunderbird.js
mail/base/content/hiddenWindow.js
mail/base/content/hiddenWindow.xhtml
mail/base/content/hiddenWindowMac.js
mail/base/content/hiddenWindowMac.xhtml
mail/base/content/messenger-doctype.inc.dtd
mail/base/content/messenger.xhtml
mail/base/jar.mn
--- a/mail/app/profile/all-thunderbird.js
+++ b/mail/app/profile/all-thunderbird.js
@@ -289,17 +289,17 @@ pref("mail.default_html_action", 3);
 /////////////////////////////////////////////////////////////////
 // End core mailnews.js pref overrides
 /////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////
 // Overrides for generic app behavior from the core all.js
 /////////////////////////////////////////////////////////////////
 
-pref("browser.hiddenWindowChromeURL", "chrome://messenger/content/hiddenWindow.xhtml");
+pref("browser.hiddenWindowChromeURL", "chrome://messenger/content/hiddenWindowMac.xhtml");
 
 pref("offline.startup_state",            2);
 // 0 Ask before sending unsent messages when going online
 // 1 Always send unsent messages when going online
 // 2 Never send unsent messages when going online
 pref("offline.send.unsent_messages",            0);
 
 // 0 Ask before synchronizing the offline mail store when going offline
rename from mail/base/content/hiddenWindow.js
rename to mail/base/content/hiddenWindowMac.js
rename from mail/base/content/hiddenWindow.xhtml
rename to mail/base/content/hiddenWindowMac.xhtml
--- a/mail/base/content/hiddenWindow.xhtml
+++ b/mail/base/content/hiddenWindowMac.xhtml
@@ -1,65 +1,29 @@
 <?xml version="1.0"?>
 
 # 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/.
 
-#ifdef XP_MACOSX
 <!DOCTYPE window [
-<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
-%brandDTD;
-<!ENTITY % messengerDTD SYSTEM "chrome://messenger/locale/messenger.dtd" >
-%messengerDTD;
-<!ENTITY % utilityDTD SYSTEM "chrome://communicator/locale/utilityOverlay.dtd">
-%utilityDTD;
-<!ENTITY % msgViewPickerDTD SYSTEM "chrome://messenger/locale/msgViewPickerOverlay.dtd" >
-%msgViewPickerDTD;
-<!ENTITY % baseMenuOverlayDTD SYSTEM "chrome://messenger/locale/baseMenuOverlay.dtd">
-%baseMenuOverlayDTD;
-<!ENTITY % charsetDTD SYSTEM "chrome://global/locale/charsetMenu.dtd">
-%charsetDTD;
-<!ENTITY % viewZoomOverlayDTD SYSTEM "chrome://messenger/locale/viewZoomOverlay.dtd">
-%viewZoomOverlayDTD;
-<!ENTITY % msgReadSMIMEDTD SYSTEM "chrome://messenger-smime/locale/msgReadSMIMEOverlay.dtd">
-%msgReadSMIMEDTD;
-#ifdef MOZ_OPENPGP
-<!ENTITY % bondOpenPGPDTD SYSTEM "chrome://openpgp/content/strings/bond.dtd">
-%bondOpenPGPDTD;
-#endif
-<!ENTITY % quickFilterBarDTD SYSTEM "chrome://messenger/locale/quickFilterBar.dtd">
-%quickFilterBarDTD;
-<!ENTITY % msgViewPickerDTD SYSTEM "chrome://messenger/locale/msgViewPickerOverlay.dtd" >
-%msgViewPickerDTD;
-<!ENTITY % msgHdrViewOverlayDTD SYSTEM "chrome://messenger/locale/msgHdrViewOverlay.dtd">
-%msgHdrViewOverlayDTD;
-<!ENTITY % lightningDTD SYSTEM "chrome://lightning/locale/lightning.dtd">
-%lightningDTD;
-<!ENTITY % calendarDTD SYSTEM "chrome://calendar/locale/calendar.dtd">
-%calendarDTD;
-<!ENTITY % calendarMenuOverlayDTD SYSTEM "chrome://calendar/locale/menuOverlay.dtd">
-%calendarMenuOverlayDTD;
-<!ENTITY % toolbarDTD SYSTEM "chrome://lightning/locale/lightning-toolbar.dtd">
-%toolbarDTD;
-<!ENTITY % eventDialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd">
-%eventDialogDTD;
+#include messenger-doctype.inc.dtd
 ]>
 
 <window id="hidden-window"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         onload="hiddenWindowStartup();">
 
 <script src="chrome://global/content/globalOverlay.js"/>
 <script src="chrome://messenger/content/commandglue.js"/>
 <script src="chrome://messenger/content/mailWindow.js"/>
 <script src="chrome://messenger/content/msgMail3PaneWindow.js"/>
 <script src="chrome://messenger/content/mail3PaneWindowCommands.js"/>
 <script src="chrome://messenger/content/searchBar.js"/>
-<script src="chrome://messenger/content/hiddenWindow.js"/>
+<script src="chrome://messenger/content/hiddenWindowMac.js"/>
 <script src="chrome://messenger/content/mailCommands.js"/>
 <script src="chrome://messenger/content/junkCommands.js"/>
 <script src="chrome://messenger/content/mailWindowOverlay.js"/>
 <script src="chrome://messenger/content/mailTabs.js"/>
 <script src="chrome://messenger/content/messageDisplay.js"/>
 <script src="chrome://messenger/content/folderDisplay.js"/>
 <script src="chrome://messenger-newsblog/content/newsblogOverlay.js"/>
 <script src="chrome://messenger/content/mail-offline.js"/>
@@ -121,10 +85,8 @@
 
 #include mainNavigationToolbox.inc.xhtml
   </toolbox>
 #include mainMailToolbox.inc.xhtml
 
 <browser id="hiddenBrowser" disablehistory="true"/>
 
 </window>
-
-#endif
new file mode 100644
--- /dev/null
+++ b/mail/base/content/messenger-doctype.inc.dtd
@@ -0,0 +1,52 @@
+<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
+%brandDTD;
+<!ENTITY % msgHdrViewOverlayDTD SYSTEM "chrome://messenger/locale/msgHdrViewOverlay.dtd">
+%msgHdrViewOverlayDTD;
+<!ENTITY % messengerDTD SYSTEM "chrome://messenger/locale/messenger.dtd" >
+%messengerDTD;
+<!ENTITY % chatDTD SYSTEM "chrome://messenger/locale/chat.dtd">
+%chatDTD;
+<!ENTITY % customizeToolbarDTD SYSTEM "chrome://messenger/locale/customizeToolbar.dtd">
+%customizeToolbarDTD;
+<!ENTITY % textcontextDTD SYSTEM "chrome://global/locale/textcontext.dtd">
+%textcontextDTD;
+<!ENTITY % tabMailDTD SYSTEM "chrome://messenger/locale/tabmail.dtd" >
+%tabMailDTD;
+<!ENTITY % quickFilterBarDTD SYSTEM "chrome://messenger/locale/quickFilterBar.dtd">
+%quickFilterBarDTD;
+<!ENTITY % utilityDTD SYSTEM "chrome://communicator/locale/utilityOverlay.dtd">
+%utilityDTD;
+<!ENTITY % editContactOverlayDTD SYSTEM "chrome://messenger/locale/editContactOverlay.dtd">
+%editContactOverlayDTD;
+<!ENTITY % msgViewPickerDTD SYSTEM "chrome://messenger/locale/msgViewPickerOverlay.dtd" >
+%msgViewPickerDTD;
+<!ENTITY % baseMenuOverlayDTD SYSTEM "chrome://messenger/locale/baseMenuOverlay.dtd">
+%baseMenuOverlayDTD;
+<!ENTITY % charsetDTD SYSTEM "chrome://global/locale/charsetMenu.dtd">
+%charsetDTD;
+<!ENTITY % viewZoomOverlayDTD SYSTEM "chrome://messenger/locale/viewZoomOverlay.dtd">
+%viewZoomOverlayDTD;
+<!ENTITY % msgReadSMIMEDTD SYSTEM "chrome://messenger-smime/locale/msgReadSMIMEOverlay.dtd">
+%msgReadSMIMEDTD;
+#ifdef MOZ_OPENPGP
+<!ENTITY % bondOpenPGPDTD SYSTEM "chrome://openpgp/content/strings/bond.dtd">
+%bondOpenPGPDTD;
+#endif
+<!ENTITY % msgViewPickerDTD SYSTEM "chrome://messenger/locale/msgViewPickerOverlay.dtd" >
+%msgViewPickerDTD;
+<!ENTITY % calendarGlobalDTD SYSTEM "chrome://calendar/locale/global.dtd">
+%calendarGlobalDTD;
+<!ENTITY % calendarDTD SYSTEM "chrome://calendar/locale/calendar.dtd">
+%calendarDTD;
+<!ENTITY % calendarMenuOverlayDTD SYSTEM "chrome://calendar/locale/menuOverlay.dtd" >
+%calendarMenuOverlayDTD;
+<!ENTITY % eventDialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd">
+%eventDialogDTD;
+<!ENTITY % lightningDTD SYSTEM "chrome://lightning/locale/lightning.dtd">
+%lightningDTD;
+<!ENTITY % lightningToolbarDTD SYSTEM "chrome://lightning/locale/lightning-toolbar.dtd" >
+%lightningToolbarDTD;
+<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd" >
+%globalDTD;
+<!ENTITY % mailOverlayDTD SYSTEM "chrome://messenger/locale/mailOverlay.dtd">
+%mailOverlayDTD;
--- a/mail/base/content/messenger.xhtml
+++ b/mail/base/content/messenger.xhtml
@@ -39,69 +39,20 @@
 
 <?xml-stylesheet href="chrome://calendar/skin/calendar-views.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/skin/shared/calendar-alarms.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/skin/shared/widgets/minimonth.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/skin/widgets/calendar-widgets.css" type="text/css"?>
 
 <?xml-stylesheet href="chrome://calendar/skin/lightning-toolbar.css" type="text/css"?>
 
+# All DTD information is stored in a separate file so that it can be shared by
+# hiddenWindowMac.xhtml.
 <!DOCTYPE window [
-<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
-%brandDTD;
-<!ENTITY % msgHdrViewOverlayDTD SYSTEM "chrome://messenger/locale/msgHdrViewOverlay.dtd">
-%msgHdrViewOverlayDTD;
-<!ENTITY % messengerDTD SYSTEM "chrome://messenger/locale/messenger.dtd" >
-%messengerDTD;
-<!ENTITY % chatDTD SYSTEM "chrome://messenger/locale/chat.dtd">
-%chatDTD;
-<!ENTITY % customizeToolbarDTD SYSTEM "chrome://messenger/locale/customizeToolbar.dtd">
-%customizeToolbarDTD;
-<!ENTITY % textcontextDTD SYSTEM "chrome://global/locale/textcontext.dtd">
-%textcontextDTD;
-<!ENTITY % tabMailDTD SYSTEM "chrome://messenger/locale/tabmail.dtd" >
-%tabMailDTD;
-<!ENTITY % quickFilterBarDTD SYSTEM "chrome://messenger/locale/quickFilterBar.dtd">
-%quickFilterBarDTD;
-<!ENTITY % utilityDTD SYSTEM "chrome://communicator/locale/utilityOverlay.dtd">
-%utilityDTD;
-<!ENTITY % editContactOverlayDTD SYSTEM "chrome://messenger/locale/editContactOverlay.dtd">
-%editContactOverlayDTD;
-<!ENTITY % msgViewPickerDTD SYSTEM "chrome://messenger/locale/msgViewPickerOverlay.dtd" >
-%msgViewPickerDTD;
-<!ENTITY % baseMenuOverlayDTD SYSTEM "chrome://messenger/locale/baseMenuOverlay.dtd">
-%baseMenuOverlayDTD;
-<!ENTITY % charsetDTD SYSTEM "chrome://global/locale/charsetMenu.dtd">
-%charsetDTD;
-<!ENTITY % viewZoomOverlayDTD SYSTEM "chrome://messenger/locale/viewZoomOverlay.dtd">
-%viewZoomOverlayDTD;
-<!ENTITY % msgReadSMIMEDTD SYSTEM "chrome://messenger-smime/locale/msgReadSMIMEOverlay.dtd">
-%msgReadSMIMEDTD;
-#ifdef MOZ_OPENPGP
-<!ENTITY % bondOpenPGPDTD SYSTEM "chrome://openpgp/content/strings/bond.dtd">
-%bondOpenPGPDTD;
-#endif
-<!ENTITY % msgViewPickerDTD SYSTEM "chrome://messenger/locale/msgViewPickerOverlay.dtd" >
-%msgViewPickerDTD;
-<!ENTITY % calendarGlobalDTD SYSTEM "chrome://calendar/locale/global.dtd">
-%calendarGlobalDTD;
-<!ENTITY % calendarDTD SYSTEM "chrome://calendar/locale/calendar.dtd">
-%calendarDTD;
-<!ENTITY % calendarMenuOverlayDTD SYSTEM "chrome://calendar/locale/menuOverlay.dtd" >
-%calendarMenuOverlayDTD;
-<!ENTITY % eventDialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd">
-%eventDialogDTD;
-<!ENTITY % lightningDTD SYSTEM "chrome://lightning/locale/lightning.dtd">
-%lightningDTD;
-<!ENTITY % lightningToolbarDTD SYSTEM "chrome://lightning/locale/lightning-toolbar.dtd" >
-%lightningToolbarDTD;
-<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd" >
-%globalDTD;
-<!ENTITY % mailOverlayDTD SYSTEM "chrome://messenger/locale/mailOverlay.dtd">
-%mailOverlayDTD;
+#include messenger-doctype.inc.dtd
 ]>
 
 <!--
   - The 'what you think of when you think of thunderbird' window;
   -  3-pane view inside of tabs.
   -->
 <window id="messengerWindow"
         xmlns:html="http://www.w3.org/1999/xhtml"
--- a/mail/base/jar.mn
+++ b/mail/base/jar.mn
@@ -13,18 +13,16 @@ messenger.jar:
     content/messenger/folderDisplay.js              (content/folderDisplay.js)
     content/messenger/foldersummary.js              (content/foldersummary.js)
     content/messenger/mailWindowOverlay.js          (content/mailWindowOverlay.js)
 *   content/messenger/messageWindow.xhtml           (content/messageWindow.xhtml)
     content/messenger/messageWindow.js              (content/messageWindow.js)
     content/messenger/mailContextMenus.js           (content/mailContextMenus.js)
     content/messenger/nsContextMenu.js              (content/nsContextMenu.js)
 *   content/messenger/messenger.xhtml               (content/messenger.xhtml)
-*   content/messenger/hiddenWindow.xhtml            (content/hiddenWindow.xhtml)
-    content/messenger/hiddenWindow.js               (content/hiddenWindow.js)
     content/messenger/msgHdrView.js                 (content/msgHdrView.js)
     content/messenger/msgViewNavigation.js          (content/msgViewNavigation.js)
     content/messenger/mailWidgets.js                (content/mailWidgets.js)
     content/messenger/button-menu-button.js         (content/button-menu-button.js)
     content/messenger/toolbarbutton-menu-button.js  (content/toolbarbutton-menu-button.js)
     content/messenger/customElements.js             (content/customElements.js)
     content/messenger/customizeToolbar.css          (../../common/src/customizeToolbar.css)
     content/messenger/customizeToolbar.js           (../../common/src/customizeToolbar.js)
@@ -77,16 +75,18 @@ messenger.jar:
     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)
     content/messenger/newInstall.xhtml              (content/newInstall.xhtml)
     content/messenger/newInstall.js                 (content/newInstall.js)
 #ifdef XP_MACOSX
     content/messenger/macMessengerMenu.js           (content/macMessengerMenu.js)
+*   content/messenger/hiddenWindowMac.xhtml         (content/hiddenWindowMac.xhtml)
+    content/messenger/hiddenWindowMac.js            (content/hiddenWindowMac.js)
 #endif
 #ifdef XP_WIN
     content/messenger/minimizeToTray.js             (content/minimizeToTray.js)
 #endif
     content/messenger/selectionsummaries.js         (content/selectionsummaries.js)
     content/messenger/multimessageview.css          (content/multimessageview.css)
     content/messenger/multimessageview_print.css    (content/multimessageview_print.css)
     content/messenger/sharedsummary.css             (content/sharedsummary.css)