Bug 520801 - Remove sub directory from taskbar module path. Addresses installer build issues which prevented jsm installation. r=dao.

--HG--
rename : browser/components/wintaskbar/jumpLists.jsm => browser/components/wintaskbar/WindowsJumpLists.jsm
rename : browser/components/wintaskbar/preview-per-tab.jsm => browser/components/wintaskbar/WindowsPreviewPerTab.jsm
This commit is contained in:
Jim Mathies 2009-10-07 20:06:30 -05:00
parent e168ed8802
commit 4cd8da9491
6 changed files with 7 additions and 10 deletions

View File

@ -136,7 +136,7 @@ XPCOMUtils.defineLazyGetter(this, "Win7Features", function () {
const WINTASKBAR_CONTRACTID = "@mozilla.org/windows-taskbar;1";
let taskbar = Cc[WINTASKBAR_CONTRACTID].getService(Ci.nsIWinTaskbar);
if (taskbar.available) {
Cu.import("resource://gre/modules/wintaskbar/preview-per-tab.jsm");
Cu.import("resource://gre/modules/WindowsPreviewPerTab.jsm");
return {
onOpenWindow: function () {
AeroPeek.onOpenWindow(window);

View File

@ -359,7 +359,7 @@ BrowserGlue.prototype = {
#ifndef WINCE
// For windows seven, initialize the jump list module.
let temp = {};
Cu.import("resource://gre/modules/wintaskbar/jumpLists.jsm", temp);
Cu.import("resource://gre/modules/WindowsJumpLists.jsm", temp);
temp.WinTaskbarJumpList.startup();
#endif
#endif

View File

@ -48,14 +48,9 @@ endif
MODULE = wintaskbar
_WINTASKBAR_FILES = \
preview-per-tab.jsm \
jumpLists.jsm \
EXTRA_JS_MODULES = \
WindowsPreviewPerTab.jsm \
WindowsJumpLists.jsm \
$(NULL)
include $(topsrcdir)/config/rules.mk
libs:: $(_WINTASKBAR_FILES)
$(NSINSTALL) -D $(DIST)/bin/modules/wintaskbar;
$(INSTALL) $(foreach f,$^,"$f") $(DIST)/bin/modules/wintaskbar

View File

@ -69,6 +69,7 @@ browser/components/sidebar/src/Makefile
browser/components/shell/Makefile
browser/components/shell/public/Makefile
browser/components/shell/src/Makefile
browser/components/wintaskbar/Makefile
browser/fuel/Makefile
browser/fuel/public/Makefile
browser/fuel/src/Makefile
@ -105,6 +106,7 @@ if [ "$ENABLE_TESTS" ]; then
browser/components/privatebrowsing/test/Makefile
browser/components/privatebrowsing/test/browser/Makefile
browser/components/safebrowsing/content/test/Makefile
browser/components/wintaskbar/test/Makefile
browser/fuel/test/Makefile
"
fi