Skip to content

Commit 9dd1ac0

Browse files
Revert "Bug 1889569 - Disable more print entrypoints when print is disabled. r=gregp,urlbar-reviewers,adw" for causing bc failures @ browser_policy_trackingprotection.js
This reverts commit b00dabe.
1 parent 51bc9aa commit 9dd1ac0

4 files changed

Lines changed: 2 additions & 28 deletions

File tree

‎browser/base/content/browser-context.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@
388388
<menuitem id="context-printframe"
389389
data-l10n-id="main-context-menu-frame-print"
390390
/>
391-
<menuseparator id="print-frame-sep"/>
391+
<menuseparator/>
392392
<menuitem id="context-viewframesource"
393393
data-l10n-id="main-context-menu-frame-view-source"
394394
/>

‎browser/base/content/nsContextMenu.sys.mjs‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,6 @@ XPCOMUtils.defineLazyPreferenceGetter(
7070
false
7171
);
7272

73-
XPCOMUtils.defineLazyPreferenceGetter(
74-
lazy,
75-
"gPrintEnabled",
76-
"print.enabled",
77-
false
78-
);
79-
8073
XPCOMUtils.defineLazyServiceGetter(
8174
lazy,
8275
"QueryStringStripper",
@@ -878,8 +871,7 @@ export class nsContextMenu {
878871
"context-print-selection",
879872
!this.inAboutDevtoolsToolbox &&
880873
this.isContentSelected &&
881-
this.selectionInfo.isDocumentLevelSelection &&
882-
lazy.gPrintEnabled
874+
this.selectionInfo.isDocumentLevelSelection
883875
);
884876

885877
var shouldShow = !(
@@ -977,8 +969,6 @@ export class nsContextMenu {
977969
this.showItem("context-openframeintab", !this.inSrcdocFrame);
978970
this.showItem("context-openframe", !this.inSrcdocFrame);
979971
this.showItem("context-bookmarkframe", !this.inSrcdocFrame);
980-
this.showItem("context-printframe", lazy.gPrintEnabled);
981-
this.showItem("print-frame-sep", lazy.gPrintEnabled);
982972

983973
// Hide menu entries for images, show otherwise
984974
if (this.inFrame) {

‎browser/components/enterprisepolicies/Policies.sys.mjs‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1207,16 +1207,6 @@ export var Policies = {
12071207
false // preserveAllowListSettings
12081208
);
12091209
ContentBlockingPrefs.matchCBCategory();
1210-
// We don't want to lock the new exceptions UI unless
1211-
// that policy was explicitly set.
1212-
if (param.Category == "strict") {
1213-
Services.prefs.unlockPref(
1214-
"privacy.trackingprotection.allow_list.baseline.enabled"
1215-
);
1216-
Services.prefs.unlockPref(
1217-
"privacy.trackingprotection.allow_list.convenience.enabled"
1218-
);
1219-
}
12201210
}
12211211
},
12221212
onBeforeUIStartup(manager, param) {

‎browser/components/urlbar/QuickActionsLoaderDefault.sys.mjs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,6 @@ const DEFAULT_ACTIONS = {
169169
l10nCommands: ["quickactions-cmd-print"],
170170
label: "quickactions-print2",
171171
icon: "chrome://global/skin/icons/print.svg",
172-
isVisible: () => {
173-
return Services.prefs.getBoolPref("print.enabled");
174-
},
175172
onPick: () => {
176173
lazy.BrowserWindowTracker.getTopWindow({
177174
allowFromInactiveWorkspace: true,
@@ -213,9 +210,6 @@ const DEFAULT_ACTIONS = {
213210
l10nCommands: ["quickactions-cmd-savepdf2"],
214211
label: "quickactions-savepdf",
215212
icon: "chrome://global/skin/icons/print.svg",
216-
isVisible: () => {
217-
return Services.prefs.getBoolPref("print.enabled");
218-
},
219213
onPick: () => {
220214
// This writes over the users last used printer which we
221215
// should not do. Refactor to launch the print preview with

0 commit comments

Comments
 (0)