Fixed: Topic 11234 - toolbar icon not shown in popup windows

lib/windowObserver.js

 /*
  * This Source Code is subject to the terms of the Mozilla Public License
  * version 2.0 (the "License"). You can obtain a copy of the License at
  * http://mozilla.org/MPL/2.0/.
  */
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 exports.WindowObserver = WindowObserver;
@@ skipping 16 matching lines @@
   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);
   }
 
-  Services.ww.registerNotification(this);
+  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));
 
-    Services.ww.unregisterNotification(this);
+    Services.obs.removeObserver(this, "chrome-document-global-created");
   }.bind(this);
   onShutdown.add(this._shutdownHandler);
 }
 WindowObserver.prototype =
 {
   _listener: null,
   _when: null,
   _shutdownHandler: null,
 
   shutdown: function()
   {
     if (!this._shutdownHandler)
       return;
 
     onShutdown.remove(this._shutdownHandler);
     this._shutdownHandler();
     this._shutdownHandler = null;
   },
 
   observe: function(subject, topic, data)
   {
-    if (topic == "domwindowopened")
+    // Make sure page is not about:blank (work-around for bug 795961)
+    if (subject instanceof Ci.nsIDOMWindow && subject.location.href !== "about:blank")
     {
       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])
 };