Bug 1640625 - Fix globalmessagemanager following landing of Bug 888600. r=frg
authorIan Neal <iann_cvs@blueyonder.co.uk>
Mon, 25 May 2020 13:17:12 +0100
changeset 39233 1317619f493e6c9718d92299ece67ec97e287254
parent 39232 a172c7754d7d9721ab93c80fd4d0def59f395563
child 39234 46848d1e9f8c94400406b61ab8a5ebea2b99e340
push id402
push userclokep@gmail.com
push dateMon, 29 Jun 2020 20:48:04 +0000
reviewersfrg
bugs1640625, 888600
Bug 1640625 - Fix globalmessagemanager following landing of Bug 888600. r=frg Port relevant parts to SeaMonkey of: * Bug 888600 - Move ContentFrameMessageManager to WebIDL. Part 6: Mark some IDL interfaces as non-scriptable
suite/components/nsSuiteGlue.js
--- a/suite/components/nsSuiteGlue.js
+++ b/suite/components/nsSuiteGlue.js
@@ -194,19 +194,18 @@ SuiteGlue.prototype = {
         break;
       case "final-ui-startup":
         this._onProfileStartup();
         this._promptForMasterPassword();
         this._checkForNewAddons();
         Services.search.init();
         listeners.init();
 
-        Cc["@mozilla.org/globalmessagemanager;1"]
-          .getService(Ci.nsIMessageListenerManager)
-          .loadFrameScript("chrome://navigator/content/content.js", true);
+        Services.mm.loadFrameScript("chrome://navigator/content/content.js",
+                                    true);
         ChromeUtils.import("resource://gre/modules/NotificationDB.jsm");
         break;
       case "browser-delayed-startup-finished":
          // Intended fallthrough.
       case "mail-startup-done":
         Services.obs.removeObserver(this, "browser-delayed-startup-finished");
         Services.obs.removeObserver(this, "mail-startup-done");
         this._onFirstWindowLoaded(subject);