Bug 1286930 - Allow the About dialog to show the application update UI even if the separate Update Available window is shown. r=rstrong
authorJared Wein <jwein@mozilla.com>
Thu, 14 Jul 2016 15:22:11 -0400
changeset 330133 525cfc10534677e164667326632d3cd216809dbc
parent 330132 20a6fd076505809220e031dd594e03029459a664
child 330134 fcb130529e8206fb65ed0bff9837762d29cd7a1a
push id9858
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 14:37:10 +0000
treeherdermozilla-aurora@203106ef6cb6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrstrong
bugs1286930
milestone50.0a1
Bug 1286930 - Allow the About dialog to show the application update UI even if the separate Update Available window is shown. r=rstrong MozReview-Commit-ID: 1jUyLx4KsZG
browser/base/content/aboutDialog-appUpdater.js
--- a/browser/base/content/aboutDialog-appUpdater.js
+++ b/browser/base/content/aboutDialog-appUpdater.js
@@ -23,19 +23,22 @@ function onUnload(aEvent) {
   gAppUpdater = null;
 }
 
 
 function appUpdater()
 {
   this.updateDeck = document.getElementById("updateDeck");
 
-  // Hide the update deck when there is already an update window open to avoid
-  // syncing issues between them.
-  if (Services.wm.getMostRecentWindow("Update:Wizard")) {
+  // Hide the update deck when the update window is already open and it's not
+  // already applied, to avoid syncing issues between them. Applied updates
+  // don't have any information to sync between the windows as they both just
+  // show the "Restart to continue"-type button.
+  if (Services.wm.getMostRecentWindow("Update:Wizard") &&
+      !this.isApplied) {
     this.updateDeck.hidden = true;
     return;
   }
 
   XPCOMUtils.defineLazyServiceGetter(this, "aus",
                                      "@mozilla.org/updates/update-service;1",
                                      "nsIApplicationUpdateService");
   XPCOMUtils.defineLazyServiceGetter(this, "checker",