Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-03 20:49:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

single window mode aviary branch merge. bug 172962, 262537, 263689, 265962, 266776 r=ben,bryner,bzbarsky,jst,peterv

Browse Source
This commit is contained in:
danm-moz%comcast.net 2004-12-07 16:08:48 +00:00
parent 18cfa7e94a
commit b13ac24f0a
1 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
browser/base/content/browser.js
View File

@ -639,22 +639,14 @@ function prepareForStartup()
// initialize observers and listeners
// and give C++ access to gBrowser
window.XULBrowserWindow = new nsBrowserStatusHandler();
window.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
.getInterface(Components.interfaces.nsIWebNavigation)
.QueryInterface(Components.interfaces.nsIDocShellTreeItem).treeOwner
.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
.getInterface(Components.interfaces.nsIXULWindow)
window.QueryInterface(nsCI.nsIInterfaceRequestor)
.getInterface(nsIWebNavigation)
.QueryInterface(nsCI.nsIDocShellTreeItem).treeOwner
.QueryInterface(nsCI.nsIInterfaceRequestor)
.getInterface(nsCI.nsIXULWindow)
.XULBrowserWindow = window.XULBrowserWindow;
/* XXXben branch landing
gBrowser.docShell
.QueryInterface(nsCI.nsIDocShellTreeItem)
.rootTreeItem
.QueryInterface(nsCI.nsIInterfaceRequestor)
.getInterface(nsCI.nsIDOMWindow)
.QueryInterface(nsCI.nsIInterfaceRequestor)
.getInterface(nsCI.nsIDOMWindowUtils)
.browserDOMWindow = new nsBrowserAccess();
*/
window.QueryInterface(nsCI.nsIDOMChromeWindow).browserDOMWindow =
new nsBrowserAccess();
window.browserContentListener =
new nsBrowserContentListener(window, gBrowser);
@ -959,14 +951,7 @@ function Shutdown()
.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
.getInterface(Components.interfaces.nsIXULWindow)
.XULBrowserWindow = null;
gBrowser.docShell
.QueryInterface(nsCI.nsIDocShellTreeItem)
.rootTreeItem
.QueryInterface(nsCI.nsIInterfaceRequestor)
.getInterface(nsCI.nsIDOMWindow)
.QueryInterface(nsCI.nsIInterfaceRequestor)
.getInterface(nsCI.nsIDOMWindowUtils)
.browserDOMWindow = null;
window.QueryInterface(nsCI.nsIDOMChromeWindow).browserDOMWindow = null;
window.browserContentListener.close();
// Close the app core.
@ -3258,6 +3243,15 @@ nsBrowserAccess.prototype =
}
}
return newWindow;
},
isTabContentWindow : function(aWindow)
{
var browsers = gBrowser.browsers;
for (var ctr = 0; ctr < browsers.length; ctr++)
if (browsers.item(ctr).contentWindow == aWindow)
return true;
return false;
}
}