Backed out changeset f85e650c1df7 (bug 847971)

--HG--
rename : toolkit/modules/RecentWindow.jsm => browser/modules/RecentWindow.jsm

browser/base/content/browser.js

@@ -7,7 +7,7 @@ let Ci = Components.interfaces;
 let Cu = Components.utils;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/RecentWindow.jsm");
+Cu.import("resource:///modules/RecentWindow.jsm");
 
 const nsIWebNavigation = Ci.nsIWebNavigation;
 

browser/components/downloads/content/allDownloadsViewOverlay.js

@@ -23,7 +23,7 @@ Cu.import("resource://gre/modules/osfile.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils",
                                   "resource://gre/modules/PrivateBrowsingUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "RecentWindow",
-                                  "resource://gre/modules/RecentWindow.jsm");
+                                  "resource:///modules/RecentWindow.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "FileUtils",
                                   "resource://gre/modules/FileUtils.jsm");
 

browser/components/downloads/src/DownloadsUI.js

@@ -31,7 +31,7 @@ XPCOMUtils.defineLazyServiceGetter(this, "gBrowserGlue",
                                    "@mozilla.org/browser/browserglue;1",
                                    "nsIBrowserGlue");
 XPCOMUtils.defineLazyModuleGetter(this, "RecentWindow",
-                                  "resource://gre/modules/RecentWindow.jsm");
+                                  "resource:///modules/RecentWindow.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils",
                                   "resource://gre/modules/PrivateBrowsingUtils.jsm");
 

browser/components/nsBrowserContentHandler.js

@@ -8,7 +8,7 @@ Components.utils.import("resource://gre/modules/Services.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils",
                                   "resource://gre/modules/PrivateBrowsingUtils.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "RecentWindow",
-                                  "resource://gre/modules/RecentWindow.jsm");
+                                  "resource:///modules/RecentWindow.jsm");
 
 const nsISupports            = Components.interfaces.nsISupports;
 

browser/components/nsBrowserGlue.js

@@ -57,7 +57,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "KeywordURLResetPrompter",
                                   "resource:///modules/KeywordURLResetPrompter.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "RecentWindow",
-                                  "resource://gre/modules/RecentWindow.jsm");
+                                  "resource:///modules/RecentWindow.jsm");
 
 const PREF_PLUGINS_NOTIFYUSER = "plugins.update.notifyUser";
 const PREF_PLUGINS_UPDATEURL  = "plugins.update.url";

browser/modules/Makefile.in

@@ -25,6 +25,11 @@ EXTRA_JS_MODULES = \
 	SharedFrame.jsm \
 	$(NULL)
 
+EXTRA_PP_JS_MODULES = \
+	RecentWindow.jsm \
+	$(NULL)
+
+
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 EXTRA_JS_MODULES += \
 	WindowsPreviewPerTab.jsm \

toolkit/content/contentAreaUtils.js

@@ -5,7 +5,6 @@
 
 Components.utils.import("resource://gre/modules/Services.jsm");
 Components.utils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
-Components.utils.import("resource://gre/modules/RecentWindow.jsm");
 
 var ContentAreaUtils = {
 
@@ -1073,9 +1072,7 @@ function openURL(aURL)
     protocolSvc.loadUrl(uri);
   }
   else {
-    let isPrivate = PrivateBrowsingUtils.isWindowPrivate(window);
-    var recentWindow = RecentWindow.getMostRecentWindow({type: "navigator:browser",
-                                                         private: isPrivate});
+    var recentWindow = Services.wm.getMostRecentWindow("navigator:browser");
     if (recentWindow) {
       var win = recentWindow.browserDOMWindow.openURI(uri, null,
                                                       recentWindow.browserDOMWindow.OPEN_DEFAULTWINDOW,

toolkit/modules/Makefile.in

@@ -16,8 +16,4 @@ EXTRA_JS_MODULES := \
   Timer.jsm \
   $(NULL)
 
-EXTRA_PP_JS_MODULES = \
-  RecentWindow.jsm \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk