From 71fbbf72f92273e72a05d37c7bf5765c8c36567c Mon Sep 17 00:00:00 2001
From: Magnus Melin <mkmelin+mozilla@iki.fi>
Date: Fri, 17 Apr 2015 21:27:14 +0300
Subject: [PATCH] Bug 1154799 - "this._browser.messageManager is undefined"
 error just by starting Thunderbird. r=florian

---
 chat/content/convbrowser.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/chat/content/convbrowser.xml b/chat/content/convbrowser.xml
index d360f87e2b..48d727c64b 100644
--- a/chat/content/convbrowser.xml
+++ b/chat/content/convbrowser.xml
@@ -84,6 +84,19 @@
                 onget="return this._docShell || (this._docShell = this.boxObject.docShell);"
                 readonly="true"/>
 
+      <property name="messageManager"
+                readonly="true">
+        <getter>
+          <![CDATA[
+            var owner = this.QueryInterface(Components.interfaces.nsIFrameLoaderOwner);
+            if (!owner.frameLoader) {
+              return null;
+            }
+            return owner.frameLoader.messageManager;
+          ]]>
+        </getter>
+      </property>
+
       <field name="_webNavigation">null</field>
 
       <property name="webNavigation"
@@ -139,6 +152,10 @@
                 readonly="true"
                 onget="return this._contentWindow || (this._contentWindow = this.docShell.QueryInterface(Components.interfaces.nsIInterfaceRequestor).getInterface(Components.interfaces.nsIDOMWindow));"/>
 
+      <property name="contentWindowAsCPOW"
+                readonly="true"
+                onget="return this.contentWindow;"/>
+
       <property name="contentDocument"
                 onget="return this.webNavigation.document;"
                 readonly="true"/>