Topic 11502 - EHH fails to recognize the first browser window opened

lib/windowObserver.js

 /*
  * This file is part of the Adblock Plus build tools,
  * Copyright (C) 2006-2012 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 24 matching lines @@
   this._listener  = listener;
   this._when = when;
 
   let e = Services.ww.getWindowEnumerator();
   while (e.hasMoreElements())
   {
     let window = e.getNext().QueryInterface(Ci.nsIDOMWindow);
     if (when == "start" || window.document.readyState == "complete")
       this._listener.applyToWindow(window);
     else
-      this.observe(window, "domwindowopened", null);
+      this.observe(window, "chrome-document-global-created", null);
   }
 
   Services.obs.addObserver(this, "chrome-document-global-created", true);
 
   this._shutdownHandler = function()
   {
     let e = Services.ww.getWindowEnumerator();
     while (e.hasMoreElements())
       this._listener.removeFromWindow(e.getNext().QueryInterface(Ci.nsIDOMWindow));
 
@@ skipping 13 matching lines @@
       return;
 
     onShutdown.remove(this._shutdownHandler);
     this._shutdownHandler();
     this._shutdownHandler = null;
   },
 
   observe: function(subject, topic, data)
   {
     // Make sure page is not about:blank (work-around for bug 795961)
-    if (subject instanceof Ci.nsIDOMWindow && subject.location.href !== "about:blank")
+    if (topic == "chrome-document-global-created")
     {
+      let window = subject.QueryInterface(Ci.nsIDOMWindow);
       if (this._when == "start")
       {
         this._listener.applyToWindow(window);
         return;
       }
 
-      let window = subject.QueryInterface(Ci.nsIDOMWindow);
       let event = (this._when == "ready" ? "DOMContentLoaded" : "load");
       let listener = function()
       {
         window.removeEventListener(event, listener, false);
         if (this._shutdownHandler)
           this._listener.applyToWindow(window);
       }.bind(this);
       window.addEventListener(event, listener, false);
     }
   },
 
   QueryInterface: XPCOMUtils.generateQI([Ci.nsISupportsWeakReference, Ci.nsIObserver])
 };