From b13ac24f0aa274697b88f623b0f9dedd215c1f0b Mon Sep 17 00:00:00 2001 From: "danm-moz%comcast.net" Date: Tue, 7 Dec 2004 16:08:48 +0000 Subject: [PATCH] single window mode aviary branch merge. bug 172962, 262537, 263689, 265962, 266776 r=ben,bryner,bzbarsky,jst,peterv --- browser/base/content/browser.js | 40 ++++++++++++++------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 6c0605ed0bda..58f6def8f640 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -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; } }