clean up window creator. npodb

git-svn-id: svn://10.0.0.236/trunk@194044 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dougt%meer.net 2006-04-10 21:30:51 +00:00
parent 95a6500a6b
commit 1e8afe26f8

View File

@ -70,38 +70,30 @@ WindowCreator::CreateChromeWindow2(nsIWebBrowserChrome *aParent,
if (!mAppShell)
return NS_ERROR_NOT_INITIALIZED;
unsigned long x, y;
GetScreenSize(&x, &y);
nsCOMPtr<nsIXULWindow> newWindow;
#if 0
if (aParent) {
nsCOMPtr<nsIXULWindow> xulParent(do_GetInterface(aParent));
if (xulParent)
xulParent->CreateNewWindow(aChromeFlags, mAppShell, getter_AddRefs(newWindow));
}
else
#endif
{
nsCOMPtr<nsIAppShellService> appShell(do_GetService(NS_APPSHELLSERVICE_CONTRACTID));
if (!appShell)
return NS_ERROR_FAILURE;
nsCOMPtr<nsIXULWindow> xulParent(do_GetInterface(aParent));
unsigned long x, y;
GetScreenSize(&x, &y);
appShell->CreateTopLevelWindow(xulParent, // get rid of if you undef above
0,
aChromeFlags,
x,
y,
mAppShell,
getter_AddRefs(newWindow));
}
nsCOMPtr<nsIAppShellService> appShell(do_GetService(NS_APPSHELLSERVICE_CONTRACTID));
if (!appShell)
return NS_ERROR_FAILURE;
nsCOMPtr<nsIXULWindow> xulParent(do_GetInterface(aParent));
appShell->CreateTopLevelWindow(xulParent, // get rid of if you undef above
0,
aChromeFlags,
x,
y,
mAppShell,
getter_AddRefs(newWindow));
// if anybody gave us anything to work with, use it
if (newWindow) {
if (newWindow)
{
newWindow->SetContextFlags(aContextFlags);
nsCOMPtr<nsIInterfaceRequestor> thing(do_QueryInterface(newWindow));
if (thing)