Bug 340219 - Display new version when upgrading add-ons. r=robstrong

toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd

@@ -95,7 +95,7 @@
 <!ENTITY toBeEnabled.label                "This add-on will be enabled when &brandShortName; is restarted.">
 <!ENTITY toBeInstalled.label              "This add-on will be installed when &brandShortName; is restarted.">
 <!ENTITY toBeUninstalled.label            "This add-on will be uninstalled when &brandShortName; is restarted.">
-<!ENTITY toBeUpgraded.label               "This add-on will be upgraded when &brandShortName; is restarted.">
+<!ENTITY toBeUpdated.label                "This add-on will be updated when &brandShortName; is restarted.">
 
 <!ENTITY getExtensions.label              "Get Extensions">
 <!ENTITY getExtensions.tooltip            "Get Extensions from addons.mozilla.org">
@@ -108,6 +108,7 @@
 <!ENTITY updateSuccess.label              "Update completed successfully.">
 <!ENTITY installSuccess.label             "Install completed successfully.">
 <!ENTITY installSuccessRestart.label      "Restart to complete the installation.">
+<!ENTITY updateSuccessRestart.label       "Restart to complete the update.">
 <!ENTITY installWaiting.label             "Waiting...">
 <!ENTITY installIncompatibleUpdate.label  "Checking compatibility...">
 <!ENTITY installFinishing.label           "Installing...">

toolkit/mozapps/extensions/content/extensions.css

@@ -38,10 +38,14 @@ richlistitem[state="finishing"] hbox.addon-install-status {
   -moz-binding: url("chrome://mozapps/content/extensions/extensions.xml#addon-install-finishing");
 }
 
-richlistitem[state="success"][opType] hbox.addon-install-status {
+richlistitem[state="success"][opType="needs-install"] hbox.addon-install-status {
   -moz-binding: url("chrome://mozapps/content/extensions/extensions.xml#addon-install-restart");
 }
 
+richlistitem[state="success"][opType="needs-upgrade"] hbox.addon-install-status {
+  -moz-binding: url("chrome://mozapps/content/extensions/extensions.xml#addon-upgrade-restart");
+}
+
 richlistitem[state="success"] hbox.addon-install-status {
   -moz-binding: url("chrome://mozapps/content/extensions/extensions.xml#addon-install-success");
 }

toolkit/mozapps/extensions/content/extensions.js

@@ -349,6 +349,7 @@ function showView(aView) {
                       ["updateable", "?updateable"],
                       ["updateURL", "?updateURL"],
                       ["version", "?version"],
+                      ["newVersion", "?newVersion"],
                       ["typeName", "install"] ];
       types = [ [ ["state", "?state", null ] ] ];
       break;

toolkit/mozapps/extensions/content/extensions.xml

@@ -232,7 +232,7 @@
           <xul:hbox anonid="addonNameVersion" class="addon-name-version" xbl:inherits="name, version"/>
           <xul:label anonid="addonDescriptionWrap" class="descriptionWrap" xbl:inherits="xbl:text=description"/>
           <xul:vbox anonid="addonSelectedStatusMsgs" class="selectedStatusMsgs">
-            <xul:hbox anonid="addonOpType" class="addon-optype attention" align="center"/>
+            <xul:hbox anonid="addonOpType" class="addon-optype attention" align="center" xbl:inherits="newVersion"/>
             <xul:hbox flex="1" class="updateAvailableBox attention">
               <xul:label xbl:inherits="value=updateAvailableMsg" crop="end"/>
             </xul:hbox>
@@ -456,7 +456,7 @@
 
   <binding id="addon-needs-upgrade">
     <content>
-      <xul:label value="&toBeUpgraded.label;" crop="end"/>
+      <xul:label value="&toBeUpdated.label;" crop="end"/>
     </content>
   </binding>
 
@@ -558,7 +558,7 @@
           </xul:stack>
         </xul:vbox>
         <xul:vbox flex="1">
-          <xul:hbox class="addon-name-version" xbl:inherits="name, version"/>
+          <xul:hbox class="addon-name-version" xbl:inherits="name, version=newVersion"/>
           <xul:hbox class="addon-install-status" xbl:inherits="state"/>
         </xul:vbox>
       </xul:hbox>
@@ -601,6 +601,12 @@
     </content>
   </binding>
 
+  <binding id="addon-upgrade-restart">
+    <content>
+      <xul:label value="&updateSuccessRestart.label;" flex="1" crop="end"/>
+    </content>
+  </binding>
+
   <binding id="addon-install-updated">
     <content>
       <xul:label value="&updateSuccess.label;" flex="1" crop="end"/>

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

@@ -4758,6 +4758,7 @@ ExtensionManager.prototype = {
 
     var props = { name            : name,
                   version         : EM_L(getManifestProperty(installManifest, "version")),
+                  newVersion      : EM_L(getManifestProperty(installManifest, "version")),
                   installLocation : EM_L(installLocation.name),
                   type            : EM_I(type),
                   availableUpdateURL    : null,
@@ -4799,6 +4800,7 @@ ExtensionManager.prototype = {
     ds.updateVisibleList(id, installLocation.name, false);
     var props = { installLocation : EM_L(installLocation.name),
                   type            : EM_I(type),
+                  newVersion      : EM_L(getManifestProperty(installManifest, "version")),
                   availableUpdateURL      : null,
                   availableUpdateHash     : null,
                   availableUpdateVersion  : null };
@@ -7274,8 +7276,10 @@ ExtensionsDataSource.prototype = {
    *          The Install Location of the item. 
    */
   addItemMetadata: function(id, installManifest, installLocation) {
-    // Copy the assertions over from the source datasource. 
     var targetRes = getResourceForID(id);
+    // Remove any temporary assertions used for the install process
+    this._setProperty(this._inner, targetRes, EM_R("newVersion"), null);
+    // Copy the assertions over from the source datasource. 
     // Assert properties with single values
     var singleProps = ["version", "updateURL", "updateService", "optionsURL",
                        "aboutURL", "iconURL", "internalName"];