From d63003256be2b679586ef06a21735d014ca6f299 Mon Sep 17 00:00:00 2001
From: "blakeross%telocity.com" <blakeross%telocity.com>
Date: Fri, 20 Sep 2002 02:08:11 +0000
Subject: [PATCH] 167430 - second phoenix window opens mozilla. r=hyatt
 sr=bryner

---
 xpfe/bootstrap/nsNativeAppSupportWin.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/xpfe/bootstrap/nsNativeAppSupportWin.cpp b/xpfe/bootstrap/nsNativeAppSupportWin.cpp
index 373d575e0e5b..bd75435c5a36 100644
--- a/xpfe/bootstrap/nsNativeAppSupportWin.cpp
+++ b/xpfe/bootstrap/nsNativeAppSupportWin.cpp
@@ -2307,8 +2307,15 @@ nsNativeAppSupportWin::OpenBrowserWindow( const char *args, PRBool newWindow ) {
         return NS_OK;
     } while ( PR_FALSE );
 
+    nsCOMPtr<nsICmdLineHandler> handler(do_GetService("@mozilla.org/commandlinehandler/general-startup;1?type=browser", &rv));
+    if (NS_FAILED(rv)) return rv;
+
+    nsXPIDLCString chromeUrlForTask;
+    rv = handler->GetChromeUrlForTask(getter_Copies(chromeUrlForTask));
+    if (NS_FAILED(rv)) return rv;
+
     // Last resort is to open a brand new window.
-    return OpenWindow( "chrome://navigator/content", args );
+    return OpenWindow( chromeUrlForTask, args );
 }
 
 void AppendMenuItem( HMENU& menu, PRInt32 aIdentifier, const nsString& aText ) {