Bug 1282537: Better wording for the E10S restart required confirm box. r?jimm
MozReview-Commit-ID: sHQUi8Ec2L
--- 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) {