From ac7590fa79970828553654580b55fa85c978812a Mon Sep 17 00:00:00 2001 From: "hyatt%netscape.com" Date: Tue, 4 May 1999 23:37:01 +0000 Subject: [PATCH] Committing changes to allow instantiation of nsIEventQueues. --- xpfe/bootstrap/nsAppRunner.cpp | 11 ++--------- xpfe/bootstrap/nsSetupRegistry.cpp | 5 ----- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/xpfe/bootstrap/nsAppRunner.cpp b/xpfe/bootstrap/nsAppRunner.cpp index ad49205b6e76..78fbd2fb8d50 100644 --- a/xpfe/bootstrap/nsAppRunner.cpp +++ b/xpfe/bootstrap/nsAppRunner.cpp @@ -105,8 +105,7 @@ PrintUsage(void) int main(int argc, char* argv[]) { nsresult rv; - nsString controllerCID; - + nsICmdLineService * cmdLineArgs = nsnull; char * urlstr=nsnull; @@ -447,13 +446,7 @@ int main(int argc, char* argv[]) } } - /* - * XXX: Currently, the CID for the "controller" is passed in as an argument - * to CreateTopLevelWindow(...). Once XUL supports "controller" - * components this will be specified in the XUL description... - */ - controllerCID = "43147b80-8a39-11d2-9938-0080c7cb1081"; - rv = appShell->CreateTopLevelWindow(nsnull, url, controllerCID, newWindow, + rv = appShell->CreateTopLevelWindow(nsnull, url, PR_TRUE, newWindow, nsnull, nsnull, widthVal, heightVal); NS_RELEASE(url); diff --git a/xpfe/bootstrap/nsSetupRegistry.cpp b/xpfe/bootstrap/nsSetupRegistry.cpp index 45801c091bf3..1d63b3378b19 100644 --- a/xpfe/bootstrap/nsSetupRegistry.cpp +++ b/xpfe/bootstrap/nsSetupRegistry.cpp @@ -78,9 +78,6 @@ static NS_DEFINE_IID(kXPConnectFactoryCID, NS_XPCONNECTFACTORY_CID); static NS_DEFINE_IID(kGlobalHistoryCID, NS_GLOBALHISTORY_CID); static NS_DEFINE_IID(kNetSupportDialogCID, NS_NETSUPPORTDIALOG_CID); static NS_DEFINE_IID(kProtocolHelperCID, NS_PROTOCOL_HELPER_CID); -///static NS_DEFINE_IID(kCBrowserControllerCID, NS_BROWSERCONTROLLER_CID); -//static NS_DEFINE_IID(kIEditFactoryIID, NS_IEDITORFACTORY_IID); - /* * This evil file will go away when the XPCOM registry can be @@ -123,8 +120,6 @@ NS_SetupRegistry_1() nsComponentManager::RegisterComponent(kRDFCoreCID, NULL, NULL, APPCORES_DLL, PR_FALSE, PR_FALSE); //All Editor registration is done in webshell/tests/viewer/nsSetupregistry.cpp - -/// nsComponentManager::RegisterComponent(kCBrowserControllerCID, NULL, NULL, BROWSER_DLL, PR_FALSE, PR_FALSE); }