Bug 950241 - Set front end flag for metrofx restart. r=bbondy, r=rs, a=lsblakk
authorJim Mathies <jmathies@mozilla.com>
Thu, 30 Jan 2014 13:32:49 -0600
changeset 176262 25dd5a9531d3734c12390d03eb857000f19d3fa6
parent 176261 10bed2ab6575a5c902d604884966e475753328f2
child 176263 5d2ffbeb04f7d73db1db35e0274b96f14d62087b
push id445
push userffxbld
push dateMon, 10 Mar 2014 22:05:19 +0000
treeherdermozilla-release@dc38b741b04e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbbondy, rs, lsblakk
bugs950241
milestone28.0
Bug 950241 - Set front end flag for metrofx restart. r=bbondy, r=rs, a=lsblakk
browser/metro/base/content/flyoutpanels/AboutFlyoutPanel.js
--- a/browser/metro/base/content/flyoutpanels/AboutFlyoutPanel.js
+++ b/browser/metro/base/content/flyoutpanels/AboutFlyoutPanel.js
@@ -273,35 +273,38 @@ appUpdater.prototype =
                        getService(Components.interfaces.nsIAppStartup);
 
       // If already in safe mode restart in safe mode (bug 327119)
       if (Services.appinfo.inSafeMode) {
         appStartup.restartInSafeMode(Components.interfaces.nsIAppStartup.eAttemptQuit);
         return;
       }
 
+      Services.metro.updatePending = true;
       appStartup.quit(Components.interfaces.nsIAppStartup.eAttemptQuit |
                       Components.interfaces.nsIAppStartup.eRestartTouchEnvironment);
       return;
     }
 
-    const URI_UPDATE_PROMPT_DIALOG = "chrome://mozapps/content/update/updates.xul";
+    // XXX We can't create dialogs in metro, and we currently don't support addons, so
+    // commenting this out for now.
+    /* const URI_UPDATE_PROMPT_DIALOG = "chrome://mozapps/content/update/updates.xul";
     // Firefox no longer displays a license for updates and the licenseURL check
     // is just in case a distibution does.
     if (this.update && (this.update.billboardURL || this.update.licenseURL ||
         this.addons.length != 0)) {
       var ary = null;
       ary = Components.classes["@mozilla.org/supports-array;1"].
             createInstance(Components.interfaces.nsISupportsArray);
       ary.AppendElement(this.update);
       var openFeatures = "chrome,centerscreen,dialog=no,resizable=no,titlebar,toolbar=no";
       Services.ww.openWindow(null, URI_UPDATE_PROMPT_DIALOG, "", openFeatures, ary);
       window.close();
       return;
-    }
+    }*/
 
     this.selectPanel("checkingForUpdates");
     this.isChecking = true;
     this.checker.checkForUpdates(this.updateCheckListener, true);
   },
 
   /**
    * Implements nsIUpdateCheckListener. The methods implemented by