From 436cf3dbc41e2f00ada4a21e52c3e392a4938bc9 Mon Sep 17 00:00:00 2001 From: "danm%netscape.com" Date: Tue, 29 Feb 2000 02:50:06 +0000 Subject: [PATCH] fixing build bustage by obliterating the entire offending function, which appears to be unused. git-svn-id: svn://10.0.0.236/trunk@61828 18797224-902f-48f8-a5cc-f745e15eee43 --- .../appshell/src/nsCommandLineServiceMac.cpp | 46 ------------------- .../startup/src/nsCommandLineServiceMac.cpp | 46 ------------------- 2 files changed, 92 deletions(-) diff --git a/mozilla/xpfe/appshell/src/nsCommandLineServiceMac.cpp b/mozilla/xpfe/appshell/src/nsCommandLineServiceMac.cpp index 6f32d89babe..292dcb0315a 100644 --- a/mozilla/xpfe/appshell/src/nsCommandLineServiceMac.cpp +++ b/mozilla/xpfe/appshell/src/nsCommandLineServiceMac.cpp @@ -55,52 +55,6 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); #include "nsAppShellCIDs.h" static NS_DEFINE_IID(kAppShellServiceCID, NS_APPSHELL_SERVICE_CID); -static nsIWebShellWindow* FindWebShellWindow(nsIXULWindowCallbacks* cb); - -//---------------------------------------------------------------------------------------- -// The return value has been AddRefed. Callers should release it. -nsIWebShellWindow* FindWebShellWindow(nsIXULWindowCallbacks* inCallbacks) -//---------------------------------------------------------------------------------------- -{ - // Temporary - we'll create a brand new window EVERY time. - nsresult rv; - NS_WITH_SERVICE(nsIAppShellService, appShellService, kAppShellServiceCID, &rv); - if (NS_FAILED(rv)) - return nsnull; - - const PRInt32 windowWidth = 615; - const PRInt32 windowHeight = 650; - nsCOMPtr urlObj; - char * urlStr = "chrome://navigator/content"; - NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &rv); - if (NS_FAILED(rv)) return nsnull; - - nsIURI *uri = nsnull; - rv = service->NewURI(urlStr, nsnull, &uri); - if (NS_FAILED(rv)) return nsnull; - - rv = uri->QueryInterface(NS_GET_IID(nsIURI), (void**)&urlObj); - NS_RELEASE(uri); - if (NS_FAILED(rv)) - return nsnull; - - nsIWebShellWindow *aWindow = nsnull; // we will return the window AddRefed - rv = appShellService->CreateTopLevelWindow( - nsnull, - urlObj, // nsIURI* of chrome - PR_TRUE, PR_TRUE, - NS_CHROME_ALL_CHROME, - inCallbacks, // callbacks - NS_SIZETOCONTENT, NS_SIZETOCONTENT, - &aWindow); - if (NS_FAILED(rv)) - return nsnull; - return aWindow; -} - -#pragma mark - - - // the static instance nsMacCommandLine nsMacCommandLine::sMacCommandLine; diff --git a/mozilla/xpfe/components/startup/src/nsCommandLineServiceMac.cpp b/mozilla/xpfe/components/startup/src/nsCommandLineServiceMac.cpp index 6f32d89babe..292dcb0315a 100644 --- a/mozilla/xpfe/components/startup/src/nsCommandLineServiceMac.cpp +++ b/mozilla/xpfe/components/startup/src/nsCommandLineServiceMac.cpp @@ -55,52 +55,6 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); #include "nsAppShellCIDs.h" static NS_DEFINE_IID(kAppShellServiceCID, NS_APPSHELL_SERVICE_CID); -static nsIWebShellWindow* FindWebShellWindow(nsIXULWindowCallbacks* cb); - -//---------------------------------------------------------------------------------------- -// The return value has been AddRefed. Callers should release it. -nsIWebShellWindow* FindWebShellWindow(nsIXULWindowCallbacks* inCallbacks) -//---------------------------------------------------------------------------------------- -{ - // Temporary - we'll create a brand new window EVERY time. - nsresult rv; - NS_WITH_SERVICE(nsIAppShellService, appShellService, kAppShellServiceCID, &rv); - if (NS_FAILED(rv)) - return nsnull; - - const PRInt32 windowWidth = 615; - const PRInt32 windowHeight = 650; - nsCOMPtr urlObj; - char * urlStr = "chrome://navigator/content"; - NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &rv); - if (NS_FAILED(rv)) return nsnull; - - nsIURI *uri = nsnull; - rv = service->NewURI(urlStr, nsnull, &uri); - if (NS_FAILED(rv)) return nsnull; - - rv = uri->QueryInterface(NS_GET_IID(nsIURI), (void**)&urlObj); - NS_RELEASE(uri); - if (NS_FAILED(rv)) - return nsnull; - - nsIWebShellWindow *aWindow = nsnull; // we will return the window AddRefed - rv = appShellService->CreateTopLevelWindow( - nsnull, - urlObj, // nsIURI* of chrome - PR_TRUE, PR_TRUE, - NS_CHROME_ALL_CHROME, - inCallbacks, // callbacks - NS_SIZETOCONTENT, NS_SIZETOCONTENT, - &aWindow); - if (NS_FAILED(rv)) - return nsnull; - return aWindow; -} - -#pragma mark - - - // the static instance nsMacCommandLine nsMacCommandLine::sMacCommandLine;