Bug 1282537: Better wording for the E10S restart required confirm box. r?jimm draft
authorMilan Sreckovic <milan@mozilla.com>
Mon, 27 Jun 2016 14:38:50 -0400
changeset 381549 cf9581cef85f5b36ee1249ed3adbb0330e7fb8fe
parent 381119 939ecc4e9d055c263633cbe276bfb634a68fe4c5
child 523988 9c0d4b5435ca870e6c403d19808cd2fb387c685f
push id21507
push usermsreckovic@mozilla.com
push dateMon, 27 Jun 2016 18:39:58 +0000
reviewersjimm
bugs1282537
milestone50.0a1
Bug 1282537: Better wording for the E10S restart required confirm box. r?jimm MozReview-Commit-ID: sHQUi8Ec2L
browser/components/preferences/in-content/main.js
--- a/browser/components/preferences/in-content/main.js
+++ b/browser/components/preferences/in-content/main.js
@@ -142,18 +142,30 @@ var gMainPane = {
     }
 
     const Cc = Components.classes, Ci = Components.interfaces;
     let brandName = document.getElementById("bundleBrand").getString("brandShortName");
     let bundle = document.getElementById("bundlePreferences");
     let msg = bundle.getFormattedString(e10sCheckbox.checked ?
                                         "featureEnableRequiresRestart" : "featureDisableRequiresRestart",
                                         [brandName]);
+    let restartText = bundle.getFormattedString("okToRestartButton", [brandName]);
+    let revertText = bundle.getString("revertNoRestartButton");
+
     let title = bundle.getFormattedString("shouldRestartTitle", [brandName]);
-    let shouldProceed = Services.prompt.confirm(window, title, msg)
+    let prompts = Cc["@mozilla.org/embedcomp/prompt-service;1"].getService(Ci.nsIPromptService);
+    let buttonFlags = (Services.prompt.BUTTON_POS_0 *
+                       Services.prompt.BUTTON_TITLE_IS_STRING) +
+                      (Services.prompt.BUTTON_POS_1 *
+                       Services.prompt.BUTTON_TITLE_IS_STRING) +
+                      Services.prompt.BUTTON_POS_0_DEFAULT;
+    let shouldProceed = prompts.confirmEx(window, title, msg,
+                                          buttonFlags, revertText, restartText,
+                                          null, null, {});
+
     if (shouldProceed) {
       let cancelQuit = Cc["@mozilla.org/supports-PRBool;1"]
                          .createInstance(Ci.nsISupportsPRBool);
       Services.obs.notifyObservers(cancelQuit, "quit-application-requested",
                                    "restart");
       shouldProceed = !cancelQuit.data;
 
       if (shouldProceed) {