462478 - Make nsBrowserContentHandler use nsBrowserGlue's getMostRecentBrowserWindow()

Status: RESOLVED FIXED

(Firefox :: General, defect)

Description

[Justin Dolske [:Dolske]]

Spun off from bug 456439, which added this function to nsBrowserGlue.

Comment 1

[Justin Dolske [:Dolske]]

Attachment: Patch v.1

Comment 2

[:Gavin Sharp [email: [e-mail]]]

Comment on attachment 350712 [details] [diff] [review]
Patch v.1

>diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js

+    var browserGlue = Components.classes["@mozilla.org/browser/browserglue;1"]
+                      .getService(Components.interfaces.nsIBrowserGlue);
+    return browserGlue.getMostRecentBrowserWindow();

You can use Cc[GLUE_CID].getService(Ci.nsIBrowserGlue) here.

>diff --git a/browser/components/nsBrowserContentHandler.js b/browser/components/nsBrowserContentHandler.js

>-  // if we're lucky, this isn't a popup, and we can just return this
>-  if (win && win.document.documentElement.getAttribute("chromehidden")) {

Hmm, wonder why this didn't have the "win = null;" line here that the other versions do. I suppose none of its callers handle a null return value... but it's probably not possible for there to be no (non-popup) windows when they call it anyways.

>+  var browserGlue = Components.classes["@mozilla.org/browser/browserglue;1"]
>+                              .getService(Components.interfaces.nsIBrowserGlue);
>+  return browserGlue.getMostRecentBrowserWindow();

I was a bit worried that this might force instantiation of browserglue earlier than it normally would, but from reading nsAppRunner, it looks like app-startup is already fired before command line handlers are run, and browserglue's init just sets some observers anyways, so shouldn't be a problem.

Comment 3

[Mike Beltzner [:beltzner, not reading bugmail]]

Comment on attachment 350712 [details] [diff] [review]
Patch v.1

a191=beltzner

Comment 4

[Justin Dolske [:Dolske]]

Pushed http://hg.mozilla.org/mozilla-central/rev/034f60a2969e

Comment 5

[Justin Dolske [:Dolske]]

Pushed to branch: http://hg.mozilla.org/releases/mozilla-1.9.1/rev/8128fdf22a41