Make opening a new window load the homepage, if it's supposed to. Bug 289211,

patch by Gavin Sharp <gavin.sharp@gmail.com>, r=mconnor, a=asa

browser/components/nsBrowserContentHandler.js

@@ -107,34 +107,6 @@ function getMostRecentWindow(aType) {
 var nsBrowserContentHandler = {
   /* helper functions */
 
-  get defaultArgs() {
-    var prefb = Components.classes["@mozilla.org/preferences-service;1"]
-                          .getService(nsIPrefBranch);
-
-    if (needHomepageOverride(prefb)) {
-      try {
-        return prefb.getComplexValue("startup.homepage_override_url",
-                                     nsIPrefLocalizedString).data;
-      }
-      catch (e) {
-      }
-    }
-
-    try {
-      var choice = prefb.getIntPref("browser.startup.page");
-      if (choice == 1)
-        return this.startPage;
-
-      if (choice == 2)
-        return Components.classes["@mozilla.org/browser/global-history;2"]
-                         .getService(nsIBrowserHistory).lastPageVisited;
-    }
-    catch (e) {
-    }
-
-    return "about:blank";
-  },
-
   mChromeURL : null,
 
   get chromeURL() {
@@ -253,6 +225,34 @@ var nsBrowserContentHandler = {
 
   /* nsIBrowserHandler */
 
+  get defaultArgs() {
+    var prefb = Components.classes["@mozilla.org/preferences-service;1"]
+                          .getService(nsIPrefBranch);
+
+    if (needHomepageOverride(prefb)) {
+      try {
+        return prefb.getComplexValue("startup.homepage_override_url",
+                                     nsIPrefLocalizedString).data;
+      }
+      catch (e) {
+      }
+    }
+
+    try {
+      var choice = prefb.getIntPref("browser.startup.page");
+      if (choice == 1)
+        return this.startPage;
+
+      if (choice == 2)
+        return Components.classes["@mozilla.org/browser/global-history;2"]
+                         .getService(nsIBrowserHistory).lastPageVisited;
+    }
+    catch (e) {
+    }
+
+    return "about:blank";
+  },
+
   get startPage() {
     var prefb = Components.classes["@mozilla.org/preferences-service;1"]
                           .getService(nsIPrefBranch);

browser/components/nsIBrowserHandler.idl

@@ -43,6 +43,7 @@ interface nsICommandLine;
 interface nsIBrowserHandler : nsISupports
 {
   attribute AUTF8String startPage;
+  attribute AUTF8String defaultArgs;
 
   /**
    * Extract the width and height specified on the command line, if present.