| ... |
... |
@@ -78,7 +78,7 @@ const NoScriptId = "_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action"; |
|
78
|
78
|
/**
|
|
79
|
79
|
* The current version for tor browser.
|
|
80
|
80
|
*/
|
|
81
|
|
-var kVersionTorBrowser = 1;
|
|
|
81
|
+var kVersionTorBrowser = 2;
|
|
82
|
82
|
|
|
83
|
83
|
/**
|
|
84
|
84
|
* Buttons removed from built-ins by version they were removed. kVersion must be
|
| ... |
... |
@@ -215,13 +215,6 @@ XPCOMUtils.defineLazyPreferenceGetter( |
|
215
|
215
|
}
|
|
216
|
216
|
);
|
|
217
|
217
|
|
|
218
|
|
-XPCOMUtils.defineLazyPreferenceGetter(
|
|
219
|
|
- lazy,
|
|
220
|
|
- "resetPBMToolbarButtonEnabled",
|
|
221
|
|
- "browser.privatebrowsing.resetPBM.enabled",
|
|
222
|
|
- false
|
|
223
|
|
-);
|
|
224
|
|
-
|
|
225
|
218
|
XPCOMUtils.defineLazyPreferenceGetter(
|
|
226
|
219
|
lazy,
|
|
227
|
220
|
"sidebarRevampEnabled",
|
| ... |
... |
@@ -387,7 +380,11 @@ var CustomizableUIInternal = { |
|
387
|
380
|
AppConstants.MOZ_DEV_EDITION ? "developer-button" : null,
|
|
388
|
381
|
lazy.ippEnabled ? "ipprotection-button" : null,
|
|
389
|
382
|
"fxa-toolbar-menu-button",
|
|
390
|
|
- lazy.resetPBMToolbarButtonEnabled ? "reset-pbm-toolbar-button" : null,
|
|
|
383
|
+ // Remove reset-pbm-toolbar-button unconditionally.
|
|
|
384
|
+ // NOTE: If we want to re-show this button, we may want to position it
|
|
|
385
|
+ // elsewhere (just after security-level-button), and we will likely want
|
|
|
386
|
+ // to migrate existing users so that it takes the place of the
|
|
|
387
|
+ // new-identity-button. tor-browser#45262.
|
|
391
|
388
|
].filter(name => name);
|
|
392
|
389
|
|
|
393
|
390
|
this.registerArea(
|
| ... |
... |
@@ -1126,6 +1123,17 @@ var CustomizableUIInternal = { |
|
1126
|
1123
|
}
|
|
1127
|
1124
|
}
|
|
1128
|
1125
|
}
|
|
|
1126
|
+
|
|
|
1127
|
+ if (currentVersion < 2) {
|
|
|
1128
|
+ // Remove the reset-pbm button that was added in version 24 in
|
|
|
1129
|
+ // `updateForNewVersion`. tor-browser#45262.
|
|
|
1130
|
+ for (const placements of Object.values(gSavedState.placements)) {
|
|
|
1131
|
+ let buttonIndex = placements.indexOf("reset-pbm-toolbar-button");
|
|
|
1132
|
+ if (buttonIndex != -1) {
|
|
|
1133
|
+ placements.splice(buttonIndex, 1);
|
|
|
1134
|
+ }
|
|
|
1135
|
+ }
|
|
|
1136
|
+ }
|
|
1129
|
1137
|
},
|
|
1130
|
1138
|
|
|
1131
|
1139
|
/**
|