Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-11 16:32:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Hook up customize toolbar callback after window shows; ifdef XP_UNIX out the xremote stuff (I'm anal).

Browse Source
This commit is contained in:
blakeross%telocity.com 2002-10-13 17:32:15 +00:00
parent 48f82757b0
commit 14ac6b3143
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -259,9 +259,6 @@ function Startup()
gProgressMeterPanel = document.getElementById("statusbar-progresspanel");
var toolbox = document.getElementById("navigator-toolbox");
toolbox.customizeDone = BrowserToolboxCustomizeDone;
var webNavigation;
try {
// Create the browser instance component.
@ -353,7 +350,7 @@ function Startup()
loadURI(uriToLoad);
}
}
#ifdef XP_UNIX
// hook up remote support
if (XREMOTESERVICE_CONTRACTID in Components.classes) {
var remoteService;
@ -364,7 +361,7 @@ function Startup()
RegisterTabOpenObserver();
}
}
#endif
if (window.opener) {
var openerSidebarBox = window.opener.document.getElementById("sidebar-box");
if (!openerSidebarBox.hidden) {
@ -426,6 +423,9 @@ function delayedStartup(aElt)
SetPageProxyState("invalid", null);
var toolbox = document.getElementById("navigator-toolbox");
toolbox.customizeDone = BrowserToolboxCustomizeDone;
// Get the preferences service
gPrefService = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefService);
@ -453,6 +453,7 @@ function WindowFocusTimerCallback(element)
function Shutdown()
{
#ifdef XP_UNIX
// remove remote support
if (XREMOTESERVICE_CONTRACTID in Components.classes) {
var remoteService;
@ -460,7 +461,7 @@ function Shutdown()
.getService(Components.interfaces.nsIXRemoteService);
remoteService.removeBrowserInstance(window);
}
#endif
try {
gBrowser.removeProgressListener(window.XULBrowserWindow);
} catch (ex) {