Skip to content

Commit 2d6f2a1

Browse files
committed
Use Services global variable if possible
Services.jsm is planned to be removed in Firefox 117 cycle in https://bugzilla.mozilla.org/show_bug.cgi?id=1780695 . Services global variable is available in WebExtensions experiments API global from version 88 https://bugzilla.mozilla.org/show_bug.cgi?id=1698158 , and experiments code doesn't have to import Services.jsm for recent versions.
1 parent c1c75e6 commit 2d6f2a1

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

api/Utilities/implementation.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
/* eslint-disable object-shorthand */
1313

1414
var { ExtensionCommon } = ChromeUtils.import("resource://gre/modules/ExtensionCommon.jsm");
15-
var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
15+
var Services = globalThis.Services || ChromeUtils.import(
16+
"resource://gre/modules/Services.jsm"
17+
).Services;
1618
var {NetUtil} = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
1719

1820
function getImageData(src) {

api/customui/parent.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
var ex_customui = class extends ExtensionCommon.ExtensionAPI {
22
getAPI(context) {
33
const Cc = Components.classes;
4-
const { Services } = ChromeUtils.import(
5-
"resource://gre/modules/Services.jsm");
4+
const Services = globalThis.Services || ChromeUtils.import(
5+
"resource://gre/modules/Services.jsm"
6+
).Services;
67
const { ExtensionParent } = ChromeUtils.import(
78
"resource://gre/modules/ExtensionParent.jsm");
89
const { setTimeout } = ChromeUtils.import(

0 commit comments

Comments
 (0)