Skip to content

Commit a73f6ec

Browse files
committed
Bug 1834831 - update imports of browser/modules JSMs r=webdriver-reviewers,perftest-reviewers,zeid,extension-reviewers,settings-reviewers,pip-reviewers,credential-management-reviewers,devtools-reviewers,fxview-reviewers,sessionstore-reviewers,tabbrowser-reviewers,whimboo,mhowell,sgalich,robwu,sparky,Standard8,mconley,dao,sclements
Differential Revision: https://phabricator.services.mozilla.com/D179169
1 parent 07b0fa4 commit a73f6ec

File tree

157 files changed

+318
-617
lines changed

Some content is hidden

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

157 files changed

+318
-617
lines changed

browser/actors/AboutNewTabParent.sys.mjs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,11 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
66

77
const lazy = {};
88

9+
ChromeUtils.defineESModuleGetters(lazy, {
10+
AboutNewTab: "resource:///modules/AboutNewTab.sys.mjs",
11+
});
12+
913
XPCOMUtils.defineLazyModuleGetters(lazy, {
10-
AboutNewTab: "resource:///modules/AboutNewTab.jsm",
1114
ASRouter: "resource://activity-stream/lib/ASRouter.jsm",
1215
});
1316

browser/actors/AboutTabCrashedParent.sys.mjs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,11 @@
22
* License, v. 2.0. If a copy of the MPL was not distributed with this
33
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
44

5-
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
6-
75
const lazy = {};
86

97
ChromeUtils.defineESModuleGetters(lazy, {
108
SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs",
11-
});
12-
13-
XPCOMUtils.defineLazyModuleGetters(lazy, {
14-
TabCrashHandler: "resource:///modules/ContentCrashHandlers.jsm",
9+
TabCrashHandler: "resource:///modules/ContentCrashHandlers.sys.mjs",
1510
});
1611

1712
// A list of all of the open about:tabcrashed pages.

browser/actors/FormValidationParent.sys.mjs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,9 @@
88

99
const lazy = {};
1010

11-
ChromeUtils.defineModuleGetter(
12-
lazy,
13-
"BrowserWindowTracker",
14-
"resource:///modules/BrowserWindowTracker.jsm"
15-
);
11+
ChromeUtils.defineESModuleGetters(lazy, {
12+
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.sys.mjs",
13+
});
1614

1715
class PopupShownObserver {
1816
_weakContext = null;

browser/actors/LinkHandlerChild.sys.mjs

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

55
const lazy = {};
66

7-
ChromeUtils.defineModuleGetter(
8-
lazy,
9-
"FaviconLoader",
10-
"resource:///modules/FaviconLoader.jsm"
11-
);
7+
ChromeUtils.defineESModuleGetters(lazy, {
8+
FaviconLoader: "resource:///modules/FaviconLoader.sys.mjs",
9+
});
1210

1311
export class LinkHandlerChild extends JSWindowActorChild {
1412
constructor() {

browser/actors/WebRTCChild.sys.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ function prompt(
381381
// then chose to just build their own prompting mechanism instead.
382382
//
383383
// So, what you are looking at here is not a real nsIContentPermissionRequest, but
384-
// something that looks really similar and will be transmitted to webrtcUI.jsm
384+
// something that looks really similar and will be transmitted to webrtcUI.sys.mjs
385385
// for showing the prompt.
386386
// Note that we basically do the permission delegate check in
387387
// nsIContentPermissionRequest, but because webrtc uses their own prompting

browser/actors/WebRTCParent.sys.mjs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,8 @@ const lazy = {};
99
ChromeUtils.defineESModuleGetters(lazy, {
1010
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
1111
SitePermissions: "resource:///modules/SitePermissions.sys.mjs",
12+
webrtcUI: "resource:///modules/webrtcUI.sys.mjs",
1213
});
13-
ChromeUtils.defineModuleGetter(
14-
lazy,
15-
"webrtcUI",
16-
"resource:///modules/webrtcUI.jsm"
17-
);
1814

1915
XPCOMUtils.defineLazyServiceGetter(
2016
lazy,

browser/base/content/browser-allTabsMenu.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,9 @@
55
// This file is loaded into the browser window scope.
66
/* eslint-env mozilla/browser-window */
77

8-
ChromeUtils.defineModuleGetter(
9-
this,
10-
"TabsPanel",
11-
"resource:///modules/TabsList.jsm"
12-
);
8+
ChromeUtils.defineESModuleGetters(this, {
9+
TabsPanel: "resource:///modules/TabsList.sys.mjs",
10+
});
1311

1412
var gTabsPanel = {
1513
kElements: {

browser/base/content/browser-places.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1394,9 +1394,11 @@ var BookmarkingUI = {
13941394
},
13951395

13961396
isOnNewTabPage({ currentURI }) {
1397-
// Prevent loading AboutNewTab.jsm during startup path if it
1397+
// Prevent loading AboutNewTab.sys.mjs during startup path if it
13981398
// is only the newTabURL getter we are interested in.
1399-
let newTabURL = Cu.isModuleLoaded("resource:///modules/AboutNewTab.jsm")
1399+
let newTabURL = Cu.isESModuleLoaded(
1400+
"resource:///modules/AboutNewTab.sys.mjs"
1401+
)
14001402
? AboutNewTab.newTabURL
14011403
: "about:newtab";
14021404
// Don't treat a custom "about:blank" new tab URL as the "New Tab Page"

browser/base/content/browser.js

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,14 @@ ChromeUtils.importESModule("resource://gre/modules/NotificationDB.sys.mjs");
1515

1616
ChromeUtils.defineESModuleGetters(this, {
1717
AMTelemetry: "resource://gre/modules/AddonManager.sys.mjs",
18+
AboutNewTab: "resource:///modules/AboutNewTab.sys.mjs",
1819
AboutReaderParent: "resource:///actors/AboutReaderParent.sys.mjs",
1920
AddonManager: "resource://gre/modules/AddonManager.sys.mjs",
2021
BrowserSearchTelemetry: "resource:///modules/BrowserSearchTelemetry.sys.mjs",
2122
BrowserTelemetryUtils: "resource://gre/modules/BrowserTelemetryUtils.sys.mjs",
23+
BrowserUIUtils: "resource:///modules/BrowserUIUtils.sys.mjs",
24+
BrowserUsageTelemetry: "resource:///modules/BrowserUsageTelemetry.sys.mjs",
25+
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.sys.mjs",
2226
Color: "resource://gre/modules/Color.sys.mjs",
2327
ContextualIdentityService:
2428
"resource://gre/modules/ContextualIdentityService.sys.mjs",
@@ -29,17 +33,22 @@ ChromeUtils.defineESModuleGetters(this, {
2933
DownloadUtils: "resource://gre/modules/DownloadUtils.sys.mjs",
3034
DownloadsCommon: "resource:///modules/DownloadsCommon.sys.mjs",
3135
E10SUtils: "resource://gre/modules/E10SUtils.sys.mjs",
36+
ExtensionsUI: "resource:///modules/ExtensionsUI.sys.mjs",
3237
FirefoxViewNotificationManager:
3338
"resource:///modules/firefox-view-notification-manager.sys.mjs",
39+
HomePage: "resource:///modules/HomePage.sys.mjs",
3440
LightweightThemeConsumer:
3541
"resource://gre/modules/LightweightThemeConsumer.sys.mjs",
3642
Log: "resource://gre/modules/Log.sys.mjs",
3743
LoginHelper: "resource://gre/modules/LoginHelper.sys.mjs",
3844
LoginManagerParent: "resource://gre/modules/LoginManagerParent.sys.mjs",
3945
MigrationUtils: "resource:///modules/MigrationUtils.sys.mjs",
4046
NetUtil: "resource://gre/modules/NetUtil.sys.mjs",
47+
NewTabPagePreloading: "resource:///modules/NewTabPagePreloading.sys.mjs",
4148
NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs",
4249
NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
50+
OpenInTabsUtils: "resource:///modules/OpenInTabsUtils.sys.mjs",
51+
PageActions: "resource:///modules/PageActions.sys.mjs",
4352
PageThumbs: "resource://gre/modules/PageThumbs.sys.mjs",
4453
PanelMultiView: "resource:///modules/PanelMultiView.sys.mjs",
4554
PanelView: "resource:///modules/PanelMultiView.sys.mjs",
@@ -50,6 +59,7 @@ ChromeUtils.defineESModuleGetters(this, {
5059
PluralForm: "resource://gre/modules/PluralForm.sys.mjs",
5160
Pocket: "chrome://pocket/content/Pocket.sys.mjs",
5261
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
62+
ProcessHangMonitor: "resource:///modules/ProcessHangMonitor.sys.mjs",
5363
PromiseUtils: "resource://gre/modules/PromiseUtils.sys.mjs",
5464
PromptUtils: "resource://gre/modules/PromptUtils.sys.mjs",
5565
ReaderMode: "resource://gre/modules/ReaderMode.sys.mjs",
@@ -61,9 +71,11 @@ ChromeUtils.defineESModuleGetters(this, {
6171
SessionStartup: "resource:///modules/sessionstore/SessionStartup.sys.mjs",
6272
SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs",
6373
ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs",
74+
SiteDataManager: "resource:///modules/SiteDataManager.sys.mjs",
6475
SitePermissions: "resource:///modules/SitePermissions.sys.mjs",
6576
SubDialog: "resource://gre/modules/SubDialog.sys.mjs",
6677
SubDialogManager: "resource://gre/modules/SubDialog.sys.mjs",
78+
TabCrashHandler: "resource:///modules/ContentCrashHandlers.sys.mjs",
6779
TabModalPrompt: "chrome://global/content/tabprompts.sys.mjs",
6880
TabsSetupFlowManager:
6981
"resource:///modules/firefox-view-tabs-setup-manager.sys.mjs",
@@ -80,26 +92,14 @@ ChromeUtils.defineESModuleGetters(this, {
8092
UrlbarValueFormatter: "resource:///modules/UrlbarValueFormatter.sys.mjs",
8193
Weave: "resource://services-sync/main.sys.mjs",
8294
WebNavigationFrames: "resource://gre/modules/WebNavigationFrames.sys.mjs",
95+
webrtcUI: "resource:///modules/webrtcUI.sys.mjs",
8396
WebsiteFilter: "resource:///modules/policies/WebsiteFilter.sys.mjs",
97+
ZoomUI: "resource:///modules/ZoomUI.sys.mjs",
8498
});
8599

86100
XPCOMUtils.defineLazyModuleGetters(this, {
87-
AboutNewTab: "resource:///modules/AboutNewTab.jsm",
88-
NewTabPagePreloading: "resource:///modules/NewTabPagePreloading.jsm",
89-
BrowserUsageTelemetry: "resource:///modules/BrowserUsageTelemetry.jsm",
90-
BrowserUIUtils: "resource:///modules/BrowserUIUtils.jsm",
91-
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
92101
CFRPageActions: "resource://activity-stream/lib/CFRPageActions.jsm",
93-
ExtensionsUI: "resource:///modules/ExtensionsUI.jsm",
94-
HomePage: "resource:///modules/HomePage.jsm",
95-
OpenInTabsUtils: "resource:///modules/OpenInTabsUtils.jsm",
96-
PageActions: "resource:///modules/PageActions.jsm",
97-
ProcessHangMonitor: "resource:///modules/ProcessHangMonitor.jsm",
98-
SiteDataManager: "resource:///modules/SiteDataManager.jsm",
99-
TabCrashHandler: "resource:///modules/ContentCrashHandlers.jsm",
100102
Translation: "resource:///modules/translation/TranslationParent.jsm",
101-
webrtcUI: "resource:///modules/webrtcUI.jsm",
102-
ZoomUI: "resource:///modules/ZoomUI.jsm",
103103
});
104104

105105
XPCOMUtils.defineLazyGetter(this, "fxAccounts", () => {
@@ -479,8 +479,8 @@ XPCOMUtils.defineLazyGetter(this, "Win7Features", () => {
479479
WINTASKBAR_CONTRACTID in Cc &&
480480
Cc[WINTASKBAR_CONTRACTID].getService(Ci.nsIWinTaskbar).available
481481
) {
482-
let { AeroPeek } = ChromeUtils.import(
483-
"resource:///modules/WindowsPreviewPerTab.jsm"
482+
let { AeroPeek } = ChromeUtils.importESModule(
483+
"resource:///modules/WindowsPreviewPerTab.sys.mjs"
484484
);
485485
return {
486486
onOpenWindow() {

browser/base/content/pageinfo/security.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
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-
const { SiteDataManager } = ChromeUtils.import(
7-
"resource:///modules/SiteDataManager.jsm"
6+
const { SiteDataManager } = ChromeUtils.importESModule(
7+
"resource:///modules/SiteDataManager.sys.mjs"
88
);
99
const { DownloadUtils } = ChromeUtils.importESModule(
1010
"resource://gre/modules/DownloadUtils.sys.mjs"

browser/base/content/tabbrowser.js

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,11 @@
8080

8181
window._gBrowser = {
8282
init() {
83-
ChromeUtils.defineModuleGetter(
84-
this,
85-
"AsyncTabSwitcher",
86-
"resource:///modules/AsyncTabSwitcher.jsm"
87-
);
8883
ChromeUtils.defineESModuleGetters(this, {
84+
AsyncTabSwitcher: "resource:///modules/AsyncTabSwitcher.sys.mjs",
85+
PictureInPicture: "resource://gre/modules/PictureInPicture.sys.mjs",
8986
UrlbarProviderOpenTabs:
9087
"resource:///modules/UrlbarProviderOpenTabs.sys.mjs",
91-
PictureInPicture: "resource://gre/modules/PictureInPicture.sys.mjs",
9288
});
9389
XPCOMUtils.defineLazyServiceGetters(this, {
9490
MacSharingService: [
@@ -104,11 +100,9 @@
104100
});
105101

106102
if (AppConstants.MOZ_CRASHREPORTER) {
107-
ChromeUtils.defineModuleGetter(
108-
this,
109-
"TabCrashHandler",
110-
"resource:///modules/ContentCrashHandlers.jsm"
111-
);
103+
ChromeUtils.defineESModuleGetters(this, {
104+
TabCrashHandler: "resource:///modules/ContentCrashHandlers.sys.mjs",
105+
});
112106
}
113107

114108
Services.obs.addObserver(this, "contextual-identity-updated");

browser/base/content/test/general/head.js

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
1-
ChromeUtils.defineModuleGetter(
2-
this,
3-
"AboutNewTab",
4-
"resource:///modules/AboutNewTab.jsm"
5-
);
61
ChromeUtils.defineESModuleGetters(this, {
2+
AboutNewTab: "resource:///modules/AboutNewTab.sys.mjs",
73
PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs",
84
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
5+
TabCrashHandler: "resource:///modules/ContentCrashHandlers.sys.mjs",
96
});
10-
ChromeUtils.defineModuleGetter(
11-
this,
12-
"TabCrashHandler",
13-
"resource:///modules/ContentCrashHandlers.jsm"
14-
);
157

168
/**
179
* Wait for a <notification> to be closed then call the specified callback.

browser/base/content/test/performance/head.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
"use strict";
22

33
ChromeUtils.defineESModuleGetters(this, {
4+
AboutNewTab: "resource:///modules/AboutNewTab.sys.mjs",
45
PerfTestHelpers: "resource://testing-common/PerfTestHelpers.sys.mjs",
56
PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs",
67
PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
78
UrlbarTestUtils: "resource://testing-common/UrlbarTestUtils.sys.mjs",
89
});
910

10-
XPCOMUtils.defineLazyModuleGetters(this, {
11-
AboutNewTab: "resource:///modules/AboutNewTab.jsm",
12-
});
13-
1411
/**
1512
* This function can be called if the test needs to trigger frame dirtying
1613
* outside of the normal mechanism.

browser/base/content/test/webrtc/head.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,9 @@ function promiseIndicatorWindow() {
9494
}
9595

9696
async function assertWebRTCIndicatorStatus(expected) {
97-
let ui = ChromeUtils.import("resource:///modules/webrtcUI.jsm").webrtcUI;
97+
let ui = ChromeUtils.importESModule(
98+
"resource:///modules/webrtcUI.sys.mjs"
99+
).webrtcUI;
98100
let expectedState = expected ? "visible" : "hidden";
99101
let msg = "WebRTC indicator " + expectedState;
100102
if (!expected && ui.showGlobalIndicator) {

browser/base/content/utilityOverlay.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ var { XPCOMUtils } = ChromeUtils.importESModule(
1212
);
1313

1414
ChromeUtils.defineESModuleGetters(this, {
15+
AboutNewTab: "resource:///modules/AboutNewTab.sys.mjs",
1516
BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs",
17+
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.sys.mjs",
1618
ContextualIdentityService:
1719
"resource://gre/modules/ContextualIdentityService.sys.mjs",
1820
ExtensionSettingsStore:
@@ -22,11 +24,6 @@ ChromeUtils.defineESModuleGetters(this, {
2224
URILoadingHelper: "resource:///modules/URILoadingHelper.sys.mjs",
2325
});
2426

25-
XPCOMUtils.defineLazyModuleGetters(this, {
26-
AboutNewTab: "resource:///modules/AboutNewTab.jsm",
27-
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
28-
});
29-
3027
XPCOMUtils.defineLazyGetter(this, "ReferrerInfo", () =>
3128
Components.Constructor(
3229
"@mozilla.org/referrer-info;1",

browser/base/content/webrtcIndicator.js

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,14 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
88
const { AppConstants } = ChromeUtils.importESModule(
99
"resource://gre/modules/AppConstants.sys.mjs"
1010
);
11-
const { showStreamSharingMenu, webrtcUI } = ChromeUtils.import(
12-
"resource:///modules/webrtcUI.jsm"
11+
const { showStreamSharingMenu, webrtcUI } = ChromeUtils.importESModule(
12+
"resource:///modules/webrtcUI.sys.mjs"
1313
);
1414

15-
ChromeUtils.defineModuleGetter(
16-
this,
17-
"MacOSWebRTCStatusbarIndicator",
18-
"resource:///modules/webrtcUI.jsm"
19-
);
20-
21-
ChromeUtils.defineModuleGetter(
22-
this,
23-
"BrowserWindowTracker",
24-
"resource:///modules/BrowserWindowTracker.jsm"
25-
);
15+
ChromeUtils.defineESModuleGetters(this, {
16+
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.sys.mjs",
17+
MacOSWebRTCStatusbarIndicator: "resource:///modules/webrtcUI.sys.mjs",
18+
});
2619

2720
XPCOMUtils.defineLazyServiceGetter(
2821
this,

browser/base/content/webrtcLegacyIndicator.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
* License, v. 2.0. If a copy of the MPL was not distributed with this
33
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
44

5-
const { webrtcUI } = ChromeUtils.import("resource:///modules/webrtcUI.jsm");
5+
const { webrtcUI } = ChromeUtils.importESModule(
6+
"resource:///modules/webrtcUI.sys.mjs"
7+
);
68

79
function init(event) {
810
for (let id of ["audioVideoButton", "screenSharePopup"]) {

browser/components/BrowserContentHandler.sys.mjs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,18 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
88
const lazy = {};
99

1010
ChromeUtils.defineESModuleGetters(lazy, {
11+
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.sys.mjs",
1112
FirstStartup: "resource://gre/modules/FirstStartup.sys.mjs",
1213
HeadlessShell: "resource:///modules/HeadlessShell.sys.mjs",
14+
HomePage: "resource:///modules/HomePage.sys.mjs",
15+
LaterRun: "resource:///modules/LaterRun.sys.mjs",
1316
NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
1417
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
1518
SessionStartup: "resource:///modules/sessionstore/SessionStartup.sys.mjs",
1619
ShellService: "resource:///modules/ShellService.sys.mjs",
1720
UpdatePing: "resource://gre/modules/UpdatePing.sys.mjs",
1821
});
1922

20-
XPCOMUtils.defineLazyModuleGetters(lazy, {
21-
BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
22-
HomePage: "resource:///modules/HomePage.jsm",
23-
LaterRun: "resource:///modules/LaterRun.jsm",
24-
});
2523
XPCOMUtils.defineLazyServiceGetters(lazy, {
2624
UpdateManager: ["@mozilla.org/updates/update-manager;1", "nsIUpdateManager"],
2725
WinTaskbar: ["@mozilla.org/windows-taskbar;1", "nsIWinTaskbar"],

0 commit comments

Comments
 (0)