forked from mirrors/gecko-dev
8a6f97c45c
The overlay was responsible for script loading and defining three elements (bhTooltip, placesCommands, placesContext). In the majority of places where the overlay was included only part of it was used. To remove the overlay, the elements were each split into include files and moved into where they were used. For the scripts, a JS file was added that defines all the lazy modules and then this script, globalOverlay.js and utilityOverlay.js were inlined to everywhere that would have included them from the overlay. MozReview-Commit-ID: 8T5D46oYWLn --HG-- rename : browser/components/places/content/placesOverlay.xul => browser/components/places/content/placesCommands.inc.xul rename : browser/components/places/content/placesOverlay.xul => browser/components/places/content/placesContextMenu.inc.xul extra : rebase_source : c1071af4ea264a95183cbc65caae98feb23d58e5
77 lines
3 KiB
XML
77 lines
3 KiB
XML
<?xml version="1.0"?>
|
|
# -*- Mode: HTML -*-
|
|
#
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
|
|
#define MAC_NON_BROWSER_WINDOW
|
|
|
|
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
|
|
<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?>
|
|
|
|
# All DTD information is stored in a separate file so that it can be shared by
|
|
# hiddenWindow.xul.
|
|
#include browser-doctype.inc
|
|
|
|
<overlay id="hidden-overlay"
|
|
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
|
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
|
|
|
# All JS files which are not content (only) dependent that browser.xul
|
|
# wishes to include *must* go into the global-scripts.inc file
|
|
# so that they can be shared by this overlay.
|
|
#include global-scripts.inc
|
|
|
|
<script type="application/javascript">
|
|
function OpenBrowserWindowFromDockMenu(options) {
|
|
let win = OpenBrowserWindow(options);
|
|
win.addEventListener("load", function listener() {
|
|
win.removeEventListener("load", listener);
|
|
let dockSupport = Cc["@mozilla.org/widget/macdocksupport;1"]
|
|
.getService(Ci.nsIMacDockSupport);
|
|
dockSupport.activateApplication(true);
|
|
});
|
|
|
|
return win;
|
|
}
|
|
|
|
addEventListener("load", function() { gBrowserInit.nonBrowserWindowStartup() }, false);
|
|
addEventListener("unload", function() { gBrowserInit.nonBrowserWindowShutdown() }, false);
|
|
|
|
ChromeUtils.defineModuleGetter(window,
|
|
"PlacesUtils", "resource://gre/modules/PlacesUtils.jsm");
|
|
ChromeUtils.defineModuleGetter(window,
|
|
"PlacesUIUtils", "resource:///modules/PlacesUIUtils.jsm");
|
|
ChromeUtils.defineModuleGetter(window,
|
|
"PlacesTransactions", "resource://gre/modules/PlacesTransactions.jsm");
|
|
|
|
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
|
|
XPCOMUtils.defineLazyScriptGetter(window, "PlacesTreeView",
|
|
"chrome://browser/content/places/treeView.js");
|
|
XPCOMUtils.defineLazyScriptGetter(window,
|
|
["PlacesInsertionPoint", "PlacesController", "PlacesControllerDragHelper"],
|
|
"chrome://browser/content/places/controller.js");
|
|
</script>
|
|
|
|
# All sets except for popupsets (commands, keys, stringbundles and broadcasters) *must* go into the
|
|
# browser-sets.inc file for sharing with hiddenWindow.xul.
|
|
#include browser-sets.inc
|
|
|
|
# The entire main menubar is placed into browser-menubar.inc, so that it can be shared by
|
|
# hiddenWindow.xul.
|
|
#include browser-menubar.inc
|
|
|
|
<!-- Dock menu -->
|
|
<popupset>
|
|
<menupopup id="menu_mac_dockmenu">
|
|
<!-- The command cannot be cmd_newNavigator because we need to activate
|
|
the application. -->
|
|
<menuitem label="&newNavigatorCmd.label;" oncommand="OpenBrowserWindowFromDockMenu();"
|
|
id="macDockMenuNewWindow" />
|
|
<menuitem label="&newPrivateWindow.label;" oncommand="OpenBrowserWindowFromDockMenu({private: true});"
|
|
id="macDockMenuNewPrivateWindow" />
|
|
</menupopup>
|
|
</popupset>
|
|
|
|
</overlay>
|