Bug 342587 - Extension update can be displayed on app upgrade. patch=michael.wu, r=rob_strong

toolkit/mozapps/extensions/content/extensions.js

@@ -1398,7 +1398,10 @@ function installUpdatesAll() {
 
 function restartApp() {
   const nsIAppStartup = Components.interfaces.nsIAppStartup;
-  if (canQuitApplication())
+
+  if (gUpdatesOnly)
+    window.close();
+  else if (canQuitApplication())
     Components.classes["@mozilla.org/toolkit/app-startup;1"].getService(nsIAppStartup)
               .quit(nsIAppStartup.eRestart | nsIAppStartup.eAttemptQuit);
 }

toolkit/mozapps/extensions/src/nsExtensionManager.js.in

@@ -2709,7 +2709,6 @@ ExtensionManager.prototype = {
       break;
     case "profile-after-change":
       this._profileSelected();
-      this._showUpdatesWindow();
       break;
     case "quit-application-requested":
       this._confirmCancelDownloadsOnQuit(subject);
@@ -2857,6 +2856,8 @@ ExtensionManager.prototype = {
     var isDirty = false;
     var forceAutoReg = false;
     
+    this._showUpdatesWindow();
+    
     // Somehow the component list went away, and for that reason the new one
     // generated by this function is going to result in a different compreg.
     // We must force a restart.