Skip to content

Commit a85bf46

Browse files
committed
Bug 1788954 - Convert toolkit/components/nimbus to ES modules r=Standard8,pip-reviewers,credential-management-reviewers,sgalich
Differential Revision: https://phabricator.services.mozilla.com/D172850
1 parent ffa2a1f commit a85bf46

File tree

111 files changed

+329
-473
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+329
-473
lines changed

browser/actors/AboutNewTabChild.sys.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import { PrivateBrowsingUtils } from "resource://gre/modules/PrivateBrowsingUtil
1010

1111
const lazy = {};
1212

13-
XPCOMUtils.defineLazyModuleGetters(lazy, {
14-
NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
13+
ChromeUtils.defineESModuleGetters(lazy, {
14+
NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
1515
});
1616

1717
XPCOMUtils.defineLazyPreferenceGetter(

browser/actors/AboutPrivateBrowsingChild.sys.mjs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@
33
* License, v. 2.0. If a copy of the MPL was not distributed with this
44
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
55

6-
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
7-
86
import { RemotePageChild } from "resource://gre/actors/RemotePageChild.sys.mjs";
97

108
const lazy = {};
119

12-
XPCOMUtils.defineLazyModuleGetters(lazy, {
13-
NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
14-
ExperimentAPI: "resource://nimbus/ExperimentAPI.jsm",
10+
ChromeUtils.defineESModuleGetters(lazy, {
11+
NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
12+
ExperimentAPI: "resource://nimbus/ExperimentAPI.sys.mjs",
1513
});
1614

1715
export class AboutPrivateBrowsingChild extends RemotePageChild {

browser/base/content/browser-sync.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,11 @@ const { UIState } = ChromeUtils.importESModule(
99
"resource://services-sync/UIState.sys.mjs"
1010
);
1111

12-
ChromeUtils.defineModuleGetter(
13-
this,
14-
"ExperimentAPI",
15-
"resource://nimbus/ExperimentAPI.jsm"
16-
);
17-
1812
ChromeUtils.defineESModuleGetters(this, {
1913
EnsureFxAccountsWebChannel:
2014
"resource://gre/modules/FxAccountsWebChannel.sys.mjs",
15+
16+
ExperimentAPI: "resource://nimbus/ExperimentAPI.sys.mjs",
2117
FxAccounts: "resource://gre/modules/FxAccounts.sys.mjs",
2218
SyncedTabs: "resource://services-sync/SyncedTabs.sys.mjs",
2319
Weave: "resource://services-sync/main.sys.mjs",

browser/base/content/browser.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ ChromeUtils.defineESModuleGetters(this, {
3232
Log: "resource://gre/modules/Log.sys.mjs",
3333
MigrationUtils: "resource:///modules/MigrationUtils.sys.mjs",
3434
NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs",
35+
NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
3536
PictureInPicture: "resource://gre/modules/PictureInPicture.sys.mjs",
3637
PlacesTransactions: "resource://gre/modules/PlacesTransactions.sys.mjs",
3738
PlacesUIUtils: "resource:///modules/PlacesUIUtils.sys.mjs",
@@ -78,7 +79,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
7879
CFRPageActions: "resource://activity-stream/lib/CFRPageActions.jsm",
7980
CustomizableUI: "resource:///modules/CustomizableUI.jsm",
8081
DownloadUtils: "resource://gre/modules/DownloadUtils.jsm",
81-
NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
8282
ExtensionsUI: "resource:///modules/ExtensionsUI.jsm",
8383
HomePage: "resource:///modules/HomePage.jsm",
8484
LoginHelper: "resource://gre/modules/LoginHelper.jsm",

browser/base/content/nonbrowser-mac.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
/* eslint-env mozilla/browser-window */
77

8-
XPCOMUtils.defineLazyModuleGetters(this, {
9-
NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
8+
ChromeUtils.defineESModuleGetters(this, {
9+
NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
1010
});
1111

1212
let delayedStartupTimeoutId = null;

browser/base/content/test/about/browser_aboutSupport.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33

44
"use strict";
55

6-
const { ExperimentAPI } = ChromeUtils.import(
7-
"resource://nimbus/ExperimentAPI.jsm"
6+
const { ExperimentAPI } = ChromeUtils.importESModule(
7+
"resource://nimbus/ExperimentAPI.sys.mjs"
88
);
9-
const { ExperimentFakes } = ChromeUtils.import(
10-
"resource://testing-common/NimbusTestUtils.jsm"
9+
const { ExperimentFakes } = ChromeUtils.importESModule(
10+
"resource://testing-common/NimbusTestUtils.sys.mjs"
1111
);
1212

1313
add_task(async function() {

browser/components/BrowserContentHandler.sys.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ const lazy = {};
99

1010
ChromeUtils.defineESModuleGetters(lazy, {
1111
FirstStartup: "resource://gre/modules/FirstStartup.sys.mjs",
12+
NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
1213
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
1314
SessionStartup: "resource:///modules/sessionstore/SessionStartup.sys.mjs",
1415
UpdatePing: "resource://gre/modules/UpdatePing.sys.mjs",
@@ -19,7 +20,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
1920
HeadlessShell: "resource:///modules/HeadlessShell.jsm",
2021
HomePage: "resource:///modules/HomePage.jsm",
2122
LaterRun: "resource:///modules/LaterRun.jsm",
22-
NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
2323
ShellService: "resource:///modules/ShellService.jsm",
2424
});
2525
XPCOMUtils.defineLazyServiceGetters(lazy, {

browser/components/BrowserGlue.sys.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
3737
Log: "resource://gre/modules/Log.sys.mjs",
3838
LoginBreaches: "resource:///modules/LoginBreaches.sys.mjs",
3939
NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs",
40+
NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
4041
OsEnvironment: "resource://gre/modules/OsEnvironment.sys.mjs",
4142
PageDataService: "resource:///modules/pagedata/PageDataService.sys.mjs",
4243
PdfJs: "resource://pdf.js/PdfJs.sys.mjs",
@@ -91,7 +92,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
9192
ExtensionsUI: "resource:///modules/ExtensionsUI.jsm",
9293
HomePage: "resource:///modules/HomePage.jsm",
9394
NetUtil: "resource://gre/modules/NetUtil.jsm",
94-
NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
9595
Normandy: "resource://normandy/Normandy.jsm",
9696

9797
OnboardingMessageProvider:

browser/components/doh/DoHController.sys.mjs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,14 @@ ChromeUtils.defineESModuleGetters(lazy, {
1515
AsyncShutdown: "resource://gre/modules/AsyncShutdown.sys.mjs",
1616
ClientID: "resource://gre/modules/ClientID.sys.mjs",
1717
DoHConfigController: "resource:///modules/DoHConfig.sys.mjs",
18+
ExperimentAPI: "resource://nimbus/ExperimentAPI.sys.mjs",
1819
Heuristics: "resource:///modules/DoHHeuristics.sys.mjs",
20+
NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
1921
Preferences: "resource://gre/modules/Preferences.sys.mjs",
2022
clearTimeout: "resource://gre/modules/Timer.sys.mjs",
2123
setTimeout: "resource://gre/modules/Timer.sys.mjs",
2224
});
2325

24-
XPCOMUtils.defineLazyModuleGetters(lazy, {
25-
NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
26-
ExperimentAPI: "resource://nimbus/ExperimentAPI.jsm",
27-
});
28-
2926
// When this is set we suppress automatic TRR selection beyond dry-run as well
3027
// as sending observer notifications during heuristics throttling.
3128
XPCOMUtils.defineLazyPreferenceGetter(

browser/components/extensions/test/xpcshell/test_ext_settings_overrides_search_mozParam.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ const { AddonTestUtils } = ChromeUtils.import(
99
const { SearchTestUtils } = ChromeUtils.importESModule(
1010
"resource://testing-common/SearchTestUtils.sys.mjs"
1111
);
12-
const { NimbusFeatures } = ChromeUtils.import(
13-
"resource://nimbus/ExperimentAPI.jsm"
12+
const { NimbusFeatures } = ChromeUtils.importESModule(
13+
"resource://nimbus/ExperimentAPI.sys.mjs"
1414
);
1515
const { sinon } = ChromeUtils.importESModule(
1616
"resource://testing-common/Sinon.sys.mjs"

browser/components/newtab/AboutNewTabService.jsm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ const { E10SUtils } = ChromeUtils.importESModule(
4242

4343
const lazy = {};
4444

45-
XPCOMUtils.defineLazyModuleGetters(lazy, {
46-
NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
45+
ChromeUtils.defineESModuleGetters(lazy, {
46+
NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
4747
});
4848

4949
/**

browser/components/newtab/aboutwelcome/AboutWelcomeChild.jsm

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,14 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
1212

1313
const lazy = {};
1414

15+
ChromeUtils.defineESModuleGetters(lazy, {
16+
ExperimentAPI: "resource://nimbus/ExperimentAPI.sys.mjs",
17+
NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
18+
});
19+
1520
XPCOMUtils.defineLazyModuleGetters(lazy, {
16-
ExperimentAPI: "resource://nimbus/ExperimentAPI.jsm",
1721
AboutWelcomeDefaults:
1822
"resource://activity-stream/aboutwelcome/lib/AboutWelcomeDefaults.jsm",
19-
NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
2023
});
2124

2225
XPCOMUtils.defineLazyGetter(lazy, "log", () => {

browser/components/newtab/lib/ASRouter.jsm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ const lazy = {};
1414

1515
ChromeUtils.defineESModuleGetters(lazy, {
1616
Downloader: "resource://services-settings/Attachments.sys.mjs",
17+
ExperimentAPI: "resource://nimbus/ExperimentAPI.sys.mjs",
1718
MacAttribution: "resource:///modules/MacAttribution.sys.mjs",
19+
NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
1820
SpecialMessageActions:
1921
"resource://messaging-system/lib/SpecialMessageActions.sys.mjs",
2022
TargetingContext: "resource://messaging-system/targeting/Targeting.sys.mjs",
@@ -38,9 +40,7 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
3840
"resource://activity-stream/lib/ASRouterTriggerListeners.jsm",
3941
KintoHttpClient: "resource://services-common/kinto-http-client.js",
4042
RemoteL10n: "resource://activity-stream/lib/RemoteL10n.jsm",
41-
ExperimentAPI: "resource://nimbus/ExperimentAPI.jsm",
4243
setTimeout: "resource://gre/modules/Timer.jsm",
43-
NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
4444
Utils: "resource://services-settings/Utils.jsm",
4545
});
4646
XPCOMUtils.defineLazyServiceGetters(lazy, {

browser/components/newtab/lib/ASRouterTargeting.jsm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ const lazy = {};
2424
ChromeUtils.defineESModuleGetters(lazy, {
2525
AttributionCode: "resource:///modules/AttributionCode.sys.mjs",
2626
BuiltInThemes: "resource:///modules/BuiltInThemes.sys.mjs",
27+
NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
2728
ProfileAge: "resource://gre/modules/ProfileAge.sys.mjs",
2829
Region: "resource://gre/modules/Region.sys.mjs",
2930
TargetingContext: "resource://messaging-system/targeting/Targeting.sys.mjs",
@@ -38,7 +39,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
3839
HomePage: "resource:///modules/HomePage.jsm",
3940
AboutNewTab: "resource:///modules/AboutNewTab.jsm",
4041
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
41-
NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
4242
});
4343

4444
ChromeUtils.defineModuleGetter(

browser/components/newtab/lib/AboutPreferences.jsm

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
44
"use strict";
55

6-
const { XPCOMUtils } = ChromeUtils.importESModule(
7-
"resource://gre/modules/XPCOMUtils.sys.mjs"
8-
);
96
const { actionTypes: at, actionCreators: ac } = ChromeUtils.importESModule(
107
"resource://activity-stream/common/Actions.sys.mjs"
118
);
@@ -15,8 +12,8 @@ const PREFERENCES_LOADED_EVENT = "home-pane-loaded";
1512

1613
const lazy = {};
1714

18-
XPCOMUtils.defineLazyModuleGetters(lazy, {
19-
NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
15+
ChromeUtils.defineESModuleGetters(lazy, {
16+
NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
2017
});
2118

2219
// These "section" objects are formatted in a way to be similar to the ones from

browser/components/newtab/lib/DiscoveryStreamFeed.jsm

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
const lazy = {};
77
ChromeUtils.defineESModuleGetters(lazy, {
8+
ExperimentAPI: "resource://nimbus/ExperimentAPI.sys.mjs",
89
NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs",
910
Region: "resource://gre/modules/Region.sys.mjs",
1011
RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
@@ -25,11 +26,6 @@ ChromeUtils.defineModuleGetter(
2526
"PersistentCache",
2627
"resource://activity-stream/lib/PersistentCache.jsm"
2728
);
28-
ChromeUtils.defineModuleGetter(
29-
lazy,
30-
"ExperimentAPI",
31-
"resource://nimbus/ExperimentAPI.jsm"
32-
);
3329

3430
const CACHE_KEY = "discovery_stream";
3531
const LAYOUT_UPDATE_TIME = 30 * 60 * 1000; // 30 minutes

browser/components/newtab/lib/OnboardingMessageProvider.jsm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ const lazy = {};
1818

1919
ChromeUtils.defineESModuleGetters(lazy, {
2020
BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs",
21+
NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
2122
});
2223

2324
XPCOMUtils.defineLazyModuleGetters(lazy, {
24-
NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
2525
ShellService: "resource:///modules/ShellService.jsm",
2626
});
2727

browser/components/newtab/lib/PlacesFeed.jsm

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
44
"use strict";
55

6-
const { XPCOMUtils } = ChromeUtils.importESModule(
7-
"resource://gre/modules/XPCOMUtils.sys.mjs"
8-
);
9-
106
const {
117
actionCreators: ac,
128
actionTypes: at,
@@ -24,7 +20,9 @@ const { AboutNewTab } = ChromeUtils.import(
2420
const lazy = {};
2521

2622
ChromeUtils.defineESModuleGetters(lazy, {
23+
ExperimentAPI: "resource://nimbus/ExperimentAPI.sys.mjs",
2724
NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs",
25+
NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
2826
PartnerLinkAttribution: "resource:///modules/PartnerLinkAttribution.sys.mjs",
2927
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
3028
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
@@ -34,14 +32,6 @@ ChromeUtils.defineModuleGetter(
3432
"pktApi",
3533
"chrome://pocket/content/pktApi.jsm"
3634
);
37-
ChromeUtils.defineModuleGetter(
38-
lazy,
39-
"ExperimentAPI",
40-
"resource://nimbus/ExperimentAPI.jsm"
41-
);
42-
XPCOMUtils.defineLazyModuleGetters(lazy, {
43-
NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
44-
});
4535

4636
const LINK_BLOCKED_EVENT = "newtab-linkBlocked";
4737
const PLACES_LINKS_CHANGED_DELAY_TIME = 1000; // time in ms to delay timer for places links changed events

browser/components/newtab/lib/PrefsFeed.jsm

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
const { actionCreators: ac, actionTypes: at } = ChromeUtils.importESModule(
77
"resource://activity-stream/common/Actions.sys.mjs"
88
);
9-
const { XPCOMUtils } = ChromeUtils.importESModule(
10-
"resource://gre/modules/XPCOMUtils.sys.mjs"
11-
);
129
const { Prefs } = ChromeUtils.import(
1310
"resource://activity-stream/lib/ActivityStreamPrefs.jsm"
1411
);
@@ -19,14 +16,11 @@ const { AppConstants } = ChromeUtils.importESModule(
1916
const lazy = {};
2017

2118
ChromeUtils.defineESModuleGetters(lazy, {
19+
NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
2220
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
2321
Region: "resource://gre/modules/Region.sys.mjs",
2422
});
2523

26-
XPCOMUtils.defineLazyModuleGetters(lazy, {
27-
NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
28-
});
29-
3024
class PrefsFeed {
3125
constructor(prefMap) {
3226
this._prefMap = prefMap;

browser/components/newtab/lib/SectionsManager.jsm

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
const { EventEmitter } = ChromeUtils.importESModule(
77
"resource://gre/modules/EventEmitter.sys.mjs"
88
);
9-
const { XPCOMUtils } = ChromeUtils.importESModule(
10-
"resource://gre/modules/XPCOMUtils.sys.mjs"
11-
);
129
const { actionCreators: ac, actionTypes: at } = ChromeUtils.importESModule(
1310
"resource://activity-stream/common/Actions.sys.mjs"
1411
);
@@ -19,13 +16,10 @@ const { getDefaultOptions } = ChromeUtils.import(
1916
const lazy = {};
2017

2118
ChromeUtils.defineESModuleGetters(lazy, {
19+
NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
2220
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
2321
});
2422

25-
XPCOMUtils.defineLazyModuleGetters(lazy, {
26-
NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
27-
});
28-
2923
/*
3024
* Generators for built in sections, keyed by the pref name for their feed.
3125
* Built in sections may depend on options stored as serialised JSON in the pref

browser/components/newtab/lib/TelemetryFeed.jsm

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ ChromeUtils.defineModuleGetter(
4545
);
4646
ChromeUtils.defineESModuleGetters(lazy, {
4747
ClientID: "resource://gre/modules/ClientID.sys.mjs",
48+
ExperimentAPI: "resource://nimbus/ExperimentAPI.sys.mjs",
49+
NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
4850
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
4951
TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.sys.mjs",
5052
TelemetrySession: "resource://gre/modules/TelemetrySession.sys.mjs",
@@ -61,11 +63,6 @@ ChromeUtils.defineModuleGetter(
6163
"resource://gre/modules/ExtensionSettingsStore.jsm"
6264
);
6365

64-
XPCOMUtils.defineLazyModuleGetters(lazy, {
65-
ExperimentAPI: "resource://nimbus/ExperimentAPI.jsm",
66-
NimbusFeatures: "resource://nimbus/ExperimentAPI.jsm",
67-
});
68-
6966
const ACTIVITY_STREAM_ID = "activity-stream";
7067
const DOMWINDOW_OPENED_TOPIC = "domwindowopened";
7168
const DOMWINDOW_UNLOAD_TOPIC = "unload";

browser/components/newtab/lib/ToastNotification.jsm

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,11 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
99

1010
const lazy = {};
1111

12+
ChromeUtils.defineESModuleGetters(lazy, {
13+
ExperimentAPI: "resource://nimbus/ExperimentAPI.sys.mjs",
14+
});
15+
1216
XPCOMUtils.defineLazyModuleGetters(lazy, {
13-
ExperimentAPI: "resource://nimbus/ExperimentAPI.jsm",
1417
RemoteL10n: "resource://activity-stream/lib/RemoteL10n.jsm",
1518
});
1619

0 commit comments

Comments
 (0)