Bug 494550: Get nsIDownloadManager initialization out of startup path, r=gavin

mobile/chrome/content/browser.xul

@@ -450,9 +450,9 @@
     <hbox id="alerts-container" hidden="true" align="start" top="0" left="0" width="200"
           onclick="AlertsHelper.click(event);">
       <image id="alerts-image"/>
-      <vbox>
+      <vbox flex="1">
         <label id="alerts-title" value=""/>
-        <description id="alerts-text"/>
+        <description id="alerts-text" flex="1"/>
       </vbox>
     </hbox>
   </stack>

mobile/chrome/content/downloads.js

@@ -40,11 +40,11 @@ Components.utils.import("resource://gre/modules/DownloadUtils.jsm");
 const URI_GENERIC_ICON_DOWNLOAD = "chrome://mozapps/skin/downloads/downloadIcon.png";
 
 var DownloadsView = {
+  _initialized: false,
   _pref: null,
   _list: null,
   _dlmgr: null,
   _progress: null,
-  _alerts: null,
 
   _initStatement: function dv__initStatement(aMode) {
     aMode = aMode || "date";
@@ -126,14 +126,21 @@ var DownloadsView = {
   },
 
   init: function dv_init() {
-    if (this._dlmgr)
+    if (this._initialized)
       return;
+    this._initialized = true;
 
-    this._dlmgr = Cc["@mozilla.org/download-manager;1"].getService(Ci.nsIDownloadManager);
-    this._pref = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch2);
+    // Monitor downloads and display alerts
+    var os = Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);
+    os.addObserver(this, "dl-start", true);
+    os.addObserver(this, "dl-failed", true);
+    os.addObserver(this, "dl-done", true);
+    os.addObserver(this, "dl-blocked", true);
+    os.addObserver(this, "dl-dirty", true);
+    os.addObserver(this, "dl-cancel", true);
 
-    this._alerts = new DownloadAlertsListener();
-    this._dlmgr.addListener(this._alerts);
+    // Monitor downloads being removed by the download manager (non-UI)
+    os.addObserver(this, "download-manager-remove-download", true);
 
     let self = this;
     let panels = document.getElementById("panel-items");
@@ -151,12 +158,11 @@ var DownloadsView = {
 
     this._list = document.getElementById("downloads-list");
 
+    this._dlmgr = Cc["@mozilla.org/download-manager;1"].getService(Ci.nsIDownloadManager);
+    this._pref = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch2);
     this._progress = new DownloadProgressListener();
     this._dlmgr.addListener(this._progress);
 
-    var os = Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);
-    os.addObserver(this, "download-manager-remove-download", false);
-
     this._initStatement();
     this.getDownloads();
   },
@@ -448,25 +454,42 @@ var DownloadsView = {
   },
 
   observe: function (aSubject, aTopic, aData) {
-    switch (aTopic) {
-      case "download-manager-remove-download":
-        // A null subject here indicates "remove multiple", so we just rebuild.
-        if (!aSubject) {
-          // Rebuild the default view
-          this.getDownloads();
-          break;
-        }
+    if (aTopic == "download-manager-remove-download") {
+      // A null subject here indicates "remove multiple", so we just rebuild.
+      if (!aSubject) {
+        // Rebuild the default view
+        this.getDownloads();
+        return;
+      }
 
-        // Otherwise, remove a single download
-        let id = aSubject.QueryInterface(Ci.nsISupportsPRUint32);
-        let element = this.getElementForDownload(id.data);
-        this._removeItem(element);
-        break;
+      // Otherwise, remove a single download
+      let id = aSubject.QueryInterface(Ci.nsISupportsPRUint32);
+      let element = this.getElementForDownload(id.data);
+      this._removeItem(element);
+    }
+    else {
+      // We only show alerts if the download view is not visible
+      if (this.visible)
+        return;
+
+      let download = aSubject.QueryInterface(Ci.nsIDownload);
+      let strings = document.getElementById("bundle_browser");
+      var notifier = Cc["@mozilla.org/alerts-service;1"].getService(Ci.nsIAlertsService);
+
+      if (aTopic == "dl-start") {
+        notifier.showAlertNotification(URI_GENERIC_ICON_DOWNLOAD, strings.getString("alertDownloads"),
+                                       strings.getFormattedString("alertDownloadsStart", [download.displayName]), false, "", null);
+      }
+      else {
+        notifier.showAlertNotification(URI_GENERIC_ICON_DOWNLOAD, strings.getString("alertDownloads"),
+                                       strings.getFormattedString("alertDownloadsDone", [download.displayName]), false, "", null);
+      }
     }
   },
 
   QueryInterface: function (aIID) {
     if (!aIID.equals(Ci.nsIObserver) &&
+        !aIID.equals(Ci.nsISupportsWeakReference) &&
         !aIID.equals(Ci.nsISupports))
       throw Components.results.NS_ERROR_NO_INTERFACE;
     return this;
@@ -559,52 +582,3 @@ DownloadProgressListener.prototype = {
     return this;
   }
 };
-
-// DownloadAlertsListener is used for alert notifications and is active all the
-// time. We should not call into DownloadsView from this listener because we
-// don't know if the view is completely intialized
-function DownloadAlertsListener() { }
-
-DownloadAlertsListener.prototype = {
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsIDownloadProgressListener
-  onDownloadStateChange: function dlPL_onDownloadStateChange(aState, aDownload) {
-    // We only show alerts if the download view is not visible
-    if (DownloadsView.visible)
-      return;
-
-    let strings = document.getElementById("bundle_browser");
-    var notifier = Cc["@mozilla.org/alerts-service;1"].getService(Ci.nsIAlertsService);
-
-    let state = aDownload.state;
-    switch (state) {
-      case Ci.nsIDownloadManager.DOWNLOAD_QUEUED:
-        notifier.showAlertNotification(URI_GENERIC_ICON_DOWNLOAD, strings.getString("alertDownloads"),
-                                       strings.getFormattedString("alertDownloadsStart", [aDownload.displayName]), false, "", null);
-        break;
-
-      case Ci.nsIDownloadManager.DOWNLOAD_BLOCKED_POLICY:
-      case Ci.nsIDownloadManager.DOWNLOAD_FAILED:
-      case Ci.nsIDownloadManager.DOWNLOAD_CANCELED:
-      case Ci.nsIDownloadManager.DOWNLOAD_BLOCKED_PARENTAL:
-      case Ci.nsIDownloadManager.DOWNLOAD_DIRTY:
-      case Ci.nsIDownloadManager.DOWNLOAD_FINISHED:
-        notifier.showAlertNotification(URI_GENERIC_ICON_DOWNLOAD, strings.getString("alertDownloads"),
-                                       strings.getFormattedString("alertDownloadsDone", [aDownload.displayName]), false, "", null);
-        break;
-    }
-  },
-
-  onProgressChange: function(aWebProgress, aRequest, aCurSelfProgress, aMaxSelfProgress, aCurTotalProgress, aMaxTotalProgress, aDownload) { },
-  onStateChange: function(aWebProgress, aRequest, aState, aStatus, aDownload) { },
-  onSecurityChange: function(aWebProgress, aRequest, aState, aDownload) { },
-
-  //////////////////////////////////////////////////////////////////////////////
-  //// nsISupports
-  QueryInterface: function (aIID) {
-    if (!aIID.equals(Ci.nsIDownloadProgressListener) &&
-        !aIID.equals(Ci.nsISupports))
-      throw Components.results.NS_ERROR_NO_INTERFACE;
-    return this;
-  }
-};

mobile/chrome/content/extensions.js

@@ -166,7 +166,7 @@ var ExtensionsView = {
   showRestart: function ev_showRestart() {
     // Increment the count in case the view is not completely initialized
     this._restartCount++;
-    
+
     if (this._msg) {
       let strings = document.getElementById("bundle_browser");
       this.showMessage(strings.getString("addonsRestart"), "restart-app",
@@ -202,7 +202,7 @@ var ExtensionsView = {
 
     // Now look and see if we're being opened by XPInstall
     var os = Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);
-    os.addObserver(this._dloadmgr, "xpinstall-download-started", false);
+    os.addObserver(this._dloadmgr, "xpinstall-download-started", true);
 
     let self = this;
     let panels = document.getElementById("panel-items");
@@ -241,7 +241,7 @@ var ExtensionsView = {
       this.showRestart();
       this._restartCount--; // showRestart() always increments
     }
-    
+
     let self = this;
     setTimeout(function() {
       self.getAddonsFromLocal();
@@ -640,6 +640,7 @@ XPInstallDownloadManager.prototype = {
   // nsISupports
   QueryInterface: function (aIID) {
     if (!aIID.equals(Ci.nsIAddonInstallListener) &&
+        !aIID.equals(Ci.nsISupportsWeakReference) &&
         !aIID.equals(Ci.nsISupports))
       throw Components.results.NS_ERROR_NO_INTERFACE;
     return this;