Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NECKO ifdef (ifdef'd _off_ by default) this checkin should not impact anything. checkin approved. If someone runs into a problem, call me at 303.546.0061.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@35863 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
valeski%netscape.com
1999-06-18 17:34:08 +00:00
parent f8cf48d35b
commit 4fa4e2e84d
124 changed files with 3915 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
mozilla/xpfe/appshell/src/nsWebShellWindow.cpp
View File

@@ -26,6 +26,11 @@
#include "nsIComponentManager.h"
#include "nsIServiceManager.h"
#include "nsIURL.h"
#ifdef NECKO
#include "nsIIOService.h"
#include "nsIURI.h"
static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
#endif // NECKO
#include "nsIPref.h"
#include "nsINameSpaceManager.h"
@@ -1257,7 +1262,20 @@ nsWebShellWindow::NewWebShell(PRUint32 aChromeMask, PRBool aVisible,
eQueueService->PushThreadEventQueue();
nsCOMPtr<nsIURL> urlObj;
rv = NS_NewURL(getter_AddRefs(urlObj), "chrome://navigator/content/");
char * urlStr = "chrome://navigator/content/";
#ifndef NECKO
rv = NS_NewURL(getter_AddRefs(urlObj), urlStr);
#else
NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &rv);
if (NS_FAILED(rv)) return rv;
nsIURI *uri = nsnull;
rv = service->NewURI(urlStr, nsnull, &uri);
if (NS_FAILED(rv)) return rv;
rv = uri->QueryInterface(nsIURL::GetIID(), (void**)&urlObj);
NS_RELEASE(uri);
#endif // NECKO
if (NS_SUCCEEDED(rv))
rv = appShell->CreateTopLevelWindow(nsnull, urlObj, PR_FALSE, *getter_AddRefs(newWindow),
@@ -2266,8 +2284,21 @@ NS_IMETHODIMP nsWebShellWindow::Init(nsIAppShell* aAppShell,
{
nsresult rv;
nsCOMPtr<nsIURL> urlObj;
char * urlStr = "chrome://navigator/content/";
rv = NS_NewURL(getter_AddRefs(urlObj), "chrome://navigator/content/");
#ifndef NECKO
rv = NS_NewURL(getter_AddRefs(urlObj), urlStr);
#else
NS_WITH_SERVICE(nsIIOService, service, kIOServiceCID, &rv);
if (NS_FAILED(rv)) return rv;
nsIURI *uri = nsnull;
rv = service->NewURI(urlStr, nsnull, &uri);
if (NS_FAILED(rv)) return rv;
rv = uri->QueryInterface(nsIURL::GetIID(), (void**)&urlObj);
NS_RELEASE(uri);
#endif // NECKO
if (NS_FAILED(rv))
return rv;