diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js index 016549f436..4e42a56877 100644 --- a/toolkit/content/aboutSupport.js +++ b/toolkit/content/aboutSupport.js @@ -879,16 +879,25 @@ function populateActionBox() { } } -// Prompt user to restart the browser in safe mode -function safeModeRestart() { +// Prompt user to restart the browser +function restart(safeMode) { let cancelQuit = Cc["@mozilla.org/supports-PRBool;1"] .createInstance(Ci.nsISupportsPRBool); Services.obs.notifyObservers(cancelQuit, "quit-application-requested", "restart"); - if (!cancelQuit.data) { - Services.startup.restartInSafeMode(Ci.nsIAppStartup.eAttemptQuit); + if (cancelQuit.data) { + return; + } + + let flags = Ci.nsIAppStartup.eAttemptQuit; + + if (safeMode) { + Services.startup.restartInSafeMode(flags); + } else { + Services.startup.quit(flags | Ci.nsIAppStartup.eRestart); } } + /** * Set up event listeners for buttons. */ @@ -915,9 +924,12 @@ function setupEventListeners() { if (Services.obs.enumerateObservers("restart-in-safe-mode").hasMoreElements()) { Services.obs.notifyObservers(null, "restart-in-safe-mode", ""); } else { - safeModeRestart(); + restart(true); } }); + $("restart-button").addEventListener("click", function(event) { + restart(false); + }); $("verify-place-integrity-button").addEventListener("click", function(event) { PlacesDBUtils.checkAndFixDatabase(function(aLog) { let msg = aLog.join("\n"); diff --git a/toolkit/content/aboutSupport.xhtml b/toolkit/content/aboutSupport.xhtml index a92dcfb4ab..5eb64d437b 100644 --- a/toolkit/content/aboutSupport.xhtml +++ b/toolkit/content/aboutSupport.xhtml @@ -44,6 +44,12 @@ &aboutSupport.restartInSafeMode.label; +
+

&aboutSupport.restartTitle;

+ +

diff --git a/toolkit/locales/en-US/chrome/global/aboutSupport.dtd b/toolkit/locales/en-US/chrome/global/aboutSupport.dtd index 780b513f68..a0dd3531b6 100644 --- a/toolkit/locales/en-US/chrome/global/aboutSupport.dtd +++ b/toolkit/locales/en-US/chrome/global/aboutSupport.dtd @@ -112,6 +112,9 @@ variant of aboutSupport.showDir.label. --> + + + diff --git a/toolkit/themes/shared/aboutSupport.css b/toolkit/themes/shared/aboutSupport.css index d26cd3cbd2..69e6a95b46 100644 --- a/toolkit/themes/shared/aboutSupport.css +++ b/toolkit/themes/shared/aboutSupport.css @@ -99,6 +99,10 @@ td { width: 30%; } +#contents { + clear: right; +} + #action-box, #reset-box, #safe-mode-box {