From 063bcbee40aa901a90da96a9b2065ff94ceadf02 Mon Sep 17 00:00:00 2001
From: "danm%netscape.com"
 <danm%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 26 Feb 2001 00:31:44 +0000
Subject: [PATCH] initialize window creator at startup. bug 67368 r=hyatt,jst

git-svn-id: svn://10.0.0.236/trunk@87956 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/xpfe/bootstrap/nsAppRunner.cpp | 27 +++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/mozilla/xpfe/bootstrap/nsAppRunner.cpp b/mozilla/xpfe/bootstrap/nsAppRunner.cpp
index 92cd0e893ee..e989f0a29f2 100644
--- a/mozilla/xpfe/bootstrap/nsAppRunner.cpp
+++ b/mozilla/xpfe/bootstrap/nsAppRunner.cpp
@@ -61,6 +61,8 @@
 #include "nsDirectoryServiceDefs.h" 
 #include "nsIHTTPProtocolHandler.h"
 #include "nsBuildID.h"
+#include "nsWindowCreator.h"
+#include "nsIWindowWatcher.h"
 
 // Interfaces Needed
 #include "nsIXULWindow.h"
@@ -137,6 +139,8 @@ public:
 /* Define Class IDs */
 static NS_DEFINE_CID(kAppShellServiceCID,   NS_APPSHELL_SERVICE_CID);
 static NS_DEFINE_CID(kCmdLineServiceCID,    NS_COMMANDLINE_SERVICE_CID);
+static char *sWatcherServiceContractID = "@mozilla.org/embedcomp/window-watcher;1";
+
 
 #include "nsNativeAppSupport.h"
 
@@ -793,6 +797,24 @@ static nsresult InitializeProfileService(nsICmdLineService *cmdLineArgs)
     return rv;
 }
 
+static nsresult InitializeWindowCreator()
+{
+  // create an nsWindowCreator and give it to the WindowWatcher service
+  nsWindowCreator *creatorCallback = new nsWindowCreator();
+  if (!creatorCallback)
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  nsCOMPtr<nsIWindowCreator> windowCreator(NS_STATIC_CAST(nsIWindowCreator *, creatorCallback));
+  if (windowCreator) {
+    nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService(sWatcherServiceContractID));
+    if (wwatch) {
+      wwatch->SetWindowCreator(windowCreator);
+      return NS_OK;
+    }
+  }
+  return NS_ERROR_FAILURE;
+}
+
 #ifdef DEBUG_warren
 #ifdef XP_PC
 #define _CRTDBG_MAP_ALLOC
@@ -939,6 +961,10 @@ static nsresult main1(int argc, char* argv[], nsISupports *nativeApp )
   NS_ASSERTION(NS_SUCCEEDED(rv), "failed to initialize appshell");
   if (NS_FAILED(rv)) return rv;
 
+  rv = InitializeWindowCreator();
+  NS_ASSERTION(NS_SUCCEEDED(rv), "failed to initialize window creator");
+  if (NS_FAILED(rv)) return rv;
+
   // Initialize Profile Service here.
   rv = InitializeProfileService(cmdLineArgs);
   if (NS_FAILED(rv)) return rv;
@@ -987,7 +1013,6 @@ static nsresult main1(int argc, char* argv[], nsISupports *nativeApp )
   return rv;
 }
 
-
 // English text needs to go into a dtd file.
 // But when this is called we have no components etc. These strings must either be
 // here, or in a native resource file.