Bug 1363969 - Remove prompt action that asks to restart the browser when we change TP blocklists. r?johannh
MozReview-Commit-ID: 3PEIcyJ8zWV
--- a/browser/components/preferences/blocklists.js
+++ b/browser/components/preferences/blocklists.js
@@ -107,47 +107,26 @@ var gBlocklistManager = {
for (let list of this._blockLists) {
if (list.selected) {
selected = list;
break;
}
}
if (activeList !== selected.id) {
- const Cc = Components.classes, Ci = Components.interfaces;
- let msg = this._bundle.getFormattedString("blocklistChangeRequiresRestart",
- [this._brandShortName]);
- let title = this._bundle.getFormattedString("shouldRestartTitle",
- [this._brandShortName]);
- let shouldProceed = Services.prompt.confirm(window, title, msg);
- if (shouldProceed) {
- let cancelQuit = Cc["@mozilla.org/supports-PRBool;1"]
- .createInstance(Ci.nsISupportsPRBool);
- Services.obs.notifyObservers(cancelQuit, "quit-application-requested",
- "restart");
- shouldProceed = !cancelQuit.data;
+ let trackingTable = Services.prefs.getCharPref(TRACKING_TABLE_PREF);
+ if (selected.id != CONTENT_LIST_ID) {
+ trackingTable = trackingTable.replace("," + CONTENT_LIST_ID + TRACK_SUFFIX, "");
+ } else {
+ trackingTable += "," + CONTENT_LIST_ID + TRACK_SUFFIX;
+ }
+ Services.prefs.setCharPref(TRACKING_TABLE_PREF, trackingTable);
+ Services.prefs.setCharPref(UPDATE_TIME_PREF, 42);
+ }
- if (shouldProceed) {
- let trackingTable = Services.prefs.getCharPref(TRACKING_TABLE_PREF);
- if (selected.id != CONTENT_LIST_ID) {
- trackingTable = trackingTable.replace("," + CONTENT_LIST_ID + TRACK_SUFFIX, "");
- } else {
- trackingTable += "," + CONTENT_LIST_ID + TRACK_SUFFIX;
- }
- Services.prefs.setCharPref(TRACKING_TABLE_PREF, trackingTable);
- Services.prefs.setCharPref(UPDATE_TIME_PREF, 42);
-
- Services.startup.quit(Ci.nsIAppStartup.eAttemptQuit |
- Ci.nsIAppStartup.eRestart);
- }
- }
-
- // Don't close the dialog in case we didn't quit.
- return;
- }
window.close();
},
_loadBlockLists() {
this._blockLists = [];
// Load blocklists into a table.
let branch = Services.prefs.getBranch(LISTS_PREF_BRANCH);
--- a/browser/locales/en-US/chrome/browser/preferences/preferences.properties
+++ b/browser/locales/en-US/chrome/browser/preferences/preferences.properties
@@ -58,18 +58,16 @@ mozNameTemplate=%1$S %2$S
# LOCALIZATION NOTE (mozstdName, etc.): These labels appear in the tracking
# protection block lists dialog, mozNameTemplate is used to create the final
# string. Note that in the future these two strings (name, desc) could be
# displayed on two different lines.
mozstdName=Disconnect.me basic protection (Recommended).
mozstdDesc=Allows some trackers so websites function properly.
mozfullName=Disconnect.me strict protection.
mozfullDesc2=Blocks known trackers. Some websites may not function properly.
-# LOCALIZATION NOTE (blocklistChangeRequiresRestart): %S = brandShortName
-blocklistChangeRequiresRestart=%S must restart to change block lists.
#### Master Password
pw_change2empty_in_fips_mode=You are currently in FIPS mode. FIPS requires a non-empty Master Password.
pw_change_failed_title=Password Change Failed
#### Fonts