Bug 699575: move browser modules to browser/modules, r=dao

--HG--
rename : browser/base/Makefile.in => browser/modules/Makefile.in
rename : browser/base/content/NetworkPrioritizer.jsm => browser/modules/NetworkPrioritizer.jsm
rename : browser/components/wintaskbar/WindowsJumpLists.jsm => browser/modules/WindowsJumpLists.jsm
rename : browser/components/wintaskbar/WindowsPreviewPerTab.jsm => browser/modules/WindowsPreviewPerTab.jsm
rename : browser/base/content/openLocationLastURL.jsm => browser/modules/openLocationLastURL.jsm
rename : browser/base/content/test/browser_NetworkPrioritizer.js => browser/modules/test/browser_NetworkPrioritizer.js
rename : browser/components/wintaskbar/test/browser_taskbar_preview.js => browser/modules/test/browser_taskbar_preview.js
extra : rebase_source : ed09dfa7b304836be75fbf6efd035efa3a95de28

browser/Makefile.in

@@ -47,6 +47,7 @@ PARALLEL_DIRS = \
   components \
   fuel \
   locales \
+  modules \
   themes \
   $(NULL)
 

browser/base/Makefile.in

@@ -53,11 +53,6 @@ ifdef ENABLE_TESTS
 DIRS += content/test
 endif
 
-EXTRA_JS_MODULES = \
-	content/openLocationLastURL.jsm \
-	content/NetworkPrioritizer.jsm \
-	$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 PRE_RELEASE_SUFFIX := ""

browser/base/content/browser.js

@@ -200,7 +200,7 @@ XPCOMUtils.defineLazyGetter(this, "Win7Features", function () {
   if (WINTASKBAR_CONTRACTID in Cc &&
       Cc[WINTASKBAR_CONTRACTID].getService(Ci.nsIWinTaskbar).available) {
     let temp = {};
-    Cu.import("resource://gre/modules/WindowsPreviewPerTab.jsm", temp);
+    Cu.import("resource:///modules/WindowsPreviewPerTab.jsm", temp);
     let AeroPeek = temp.AeroPeek;
     return {
       onOpenWindow: function () {

browser/base/content/test/Makefile.in

@@ -91,7 +91,6 @@ endif
 _BROWSER_FILES = \
                  browser_typeAheadFind.js \
                  browser_keywordSearch.js \
-                 browser_NetworkPrioritizer.js \
                  browser_allTabsPanel.js \
                  browser_alltabslistener.js \
                  browser_bug304198.js \

browser/components/Makefile.in

@@ -74,10 +74,6 @@ PARALLEL_DIRS = \
   migration \
   $(NULL)
 
-ifeq ($(MOZ_WIDGET_TOOLKIT),windows) 
-PARALLEL_DIRS += wintaskbar
-endif
-
 ifdef MOZ_SAFE_BROWSING
 PARALLEL_DIRS += safebrowsing
 endif

browser/makefiles.sh

@@ -80,6 +80,7 @@ browser/fuel/public/Makefile
 browser/fuel/src/Makefile
 browser/installer/Makefile
 browser/locales/Makefile
+browser/modules/Makefile
 browser/themes/Makefile
 $MOZ_BRANDING_DIRECTORY/Makefile
 $MOZ_BRANDING_DIRECTORY/content/Makefile
@@ -93,9 +94,6 @@ if [ "$MOZ_SAFE_BROWSING" ]; then
 fi
 
 if [ "$MOZ_WIDGET_TOOLKIT" = "windows" ]; then
-  add_makefiles "
-    browser/components/wintaskbar/Makefile
-  "
   if [ "$MOZ_INSTALLER" ]; then
     add_makefiles "
       browser/installer/windows/Makefile
@@ -146,15 +144,11 @@ if [ "$ENABLE_TESTS" ]; then
     browser/devtools/styleinspector/test/browser/Makefile
     browser/devtools/webconsole/test/browser/Makefile
     browser/fuel/test/Makefile
+    browser/modules/test/Makefile
   "
   if [ "$MOZ_SAFE_BROWSING" ]; then
     add_makefiles "
       browser/components/safebrowsing/content/test/Makefile
     "
   fi
-  if [ "$MOZ_WIDGET_TOOLKIT" = "windows" ]; then
-    add_makefiles "
-      browser/components/wintaskbar/test/Makefile
-    "
-  fi
 fi

browser/modules/Makefile.in

@@ -0,0 +1,63 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#  Robert Strong <robert.bugzilla@gmail.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH   = ../..
+topsrcdir = @top_srcdir@
+srcdir    = @srcdir@
+VPATH   = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/config.mk
+
+ifdef ENABLE_TESTS
+DIRS += test
+endif
+
+EXTRA_JS_MODULES = \
+	openLocationLastURL.jsm \
+	NetworkPrioritizer.jsm \
+	$(NULL)
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),windows) 
+EXTRA_JS_MODULES += \
+	WindowsPreviewPerTab.jsm \
+	WindowsJumpLists.jsm \
+	$(NULL)
+endif
+
+include $(topsrcdir)/config/rules.mk

browser/modules/test/Makefile.in

@@ -0,0 +1,57 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Mozilla Foundation.
+# Portions created by the Initial Developer are Copyright (C) 2007
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either of the GNU General Public License Version 2 or later (the "GPL"),
+# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+relativesrcdir  = browser/modules/test
+
+include $(DEPTH)/config/autoconf.mk
+include $(topsrcdir)/config/rules.mk
+
+_BROWSER_FILES = \
+                 browser_NetworkPrioritizer.js \
+                 $(NULL)
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),windows) 
+_BROWSER_FILES += \
+                 browser_taskbar_preview.js \
+                 $(NULL)
+endif
+
+libs::	$(_BROWSER_FILES)
+	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)

browser/modules/test/browser_taskbar_preview.js

@@ -14,7 +14,7 @@ function test() {
   const ENABLE_PREF_NAME = "browser.taskbar.previews.enable";
 
   let temp = {};
-  Cu.import("resource://gre/modules/WindowsPreviewPerTab.jsm", temp);
+  Cu.import("resource:///modules/WindowsPreviewPerTab.jsm", temp);
   let AeroPeek = temp.AeroPeek;
 
   waitForExplicitFinish();