Bug 1531067 - Stop preprocessing chat files for Thunderbird. r=florian

chat/content/account.xml

@@ -305,9 +305,6 @@
                   command="cmd_connect"
                   anonid="connect"/>
       <xul:spacer flex="1"/>
-#ifndef MOZ_THUNDERBIRD
-      <xul:button command="cmd_delete"/>
-#endif
       <xul:button command="cmd_edit"/>
     </content>
     <implementation>

chat/content/jar.mn

@@ -5,7 +5,7 @@
 chat.jar:
 % content chat %content/chat/
 	content/chat/accounts.css
-*	content/chat/account.xml
+	content/chat/account.xml
 	content/chat/browserRequest.js
 	content/chat/browserRequest.xul
 	content/chat/imAccountOptionsHelper.js

chat/modules/hiddenWindow.jsm

@@ -10,11 +10,11 @@ const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm")
 XPCOMUtils.defineLazyGetter(this, "hiddenWindow", () =>
   Services.appShell.hiddenDOMWindow
 );
-#ifndef XP_MACOSX
-function getHiddenHTMLWindow() { return hiddenWindow; }
-#else
+
 function getHiddenHTMLWindow() {
+  if (Services.appinfo.OS == "Darwin") {
     let browser = hiddenWindow.document.getElementById("hiddenBrowser");
     return browser.docShell ? browser.contentWindow : hiddenWindow;
+  }
+  return hiddenWindow;
 }
-#endif

chat/modules/moz.build

@@ -9,6 +9,7 @@ EXTRA_JS_MODULES += [
     'ArrayBufferUtils.jsm',
     'BigInteger.jsm',
     'DNS.jsm',
+    'hiddenWindow.jsm',
     'imContentSink.jsm',
     'imServices.jsm',
     'imSmileys.jsm',
@@ -21,7 +22,3 @@ EXTRA_JS_MODULES += [
     'socket.jsm',
     'ToLocaleFormat.jsm',
 ]
-
-EXTRA_PP_JS_MODULES += [
-    'hiddenWindow.jsm',
-]