corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1230373 - Enable mozilla/use-services for browser/components/ r=mossop

Browse Source 
MozReview-Commit-ID: 9m9iss3jUJJ
This commit is contained in:
Mark Banner
2017-10-11 15:43:51 +01:00
parent 65c34bf3e9
commit 4de85b3d5b
61 changed files with 235 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
browser/components/preferences/in-content/preferences.js
View File

@@ -254,7 +254,6 @@ function confirmRestartPrompt(aRestartToEnable, aDefaultButtonIndex,
"featureDisableRequiresRestart",
[brandName]);
let title = bundle.getFormattedString("shouldRestartTitle", [brandName]);
let prompts = Cc["@mozilla.org/embedcomp/prompt-service;1"].getService(Ci.nsIPromptService);
// Set up the first (index 0) button:
let button0Text = bundle.getFormattedString("okToRestartButton", [brandName]);
@@ -295,9 +294,9 @@ function confirmRestartPrompt(aRestartToEnable, aDefaultButtonIndex,
break;
}
let buttonIndex = prompts.confirmEx(window, title, msg, buttonFlags,
button0Text, button1Text, button2Text,
null, {});
let buttonIndex = Services.prompt.confirmEx(window, title, msg, buttonFlags,
button0Text, button1Text, button2Text,
null, {});
// If we have the second confirmation dialog for restart, see if the user
// cancels out at that point.