Commit 2ffde1e9 authored by Mark Banner's avatar Mark Banner
Browse files

Bug 1792341 - Migrate more toolkit/modules consumers to use direct ES module... 

Bug 1792341 - Migrate more toolkit/modules consumers to use direct ES module import. r=Gijs,webdriver-reviewers,perftest-reviewers,necko-reviewers,geckoview-reviewers,preferences-reviewers,application-update-reviewers,pip-reviewers,credential-management-reviewers,sgalich,owlish,bytesized,AlexandruIonescu,whimboo,mconley,mixedpuppy

Mainly automated changes. Some manual ESLint fixes and whitespace cleanup.

Differential Revision: https://phabricator.services.mozilla.com/D158452
parent 69a9e3e7

accessible/tests/mochitest/browser.js

+2 −2
Original line number Diff line number Diff line 
/* import-globals-from common.js */



var { AppConstants } = ChromeUtils.import(

  "resource://gre/modules/AppConstants.jsm"

var { AppConstants } = ChromeUtils.importESModule(

  "resource://gre/modules/AppConstants.sys.mjs"

);



/**

browser/actors/AboutNewTabChild.sys.mjs

+2 −7
Original line number Diff line number Diff line
@@ -5,13 +5,8 @@ 


import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";



const { AppConstants } = ChromeUtils.import(

  "resource://gre/modules/AppConstants.jsm"

);



const { PrivateBrowsingUtils } = ChromeUtils.import(

  "resource://gre/modules/PrivateBrowsingUtils.jsm"

);

import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs";

import { PrivateBrowsingUtils } from "resource://gre/modules/PrivateBrowsingUtils.sys.mjs";



const lazy = {};

browser/actors/AboutProtectionsParent.sys.mjs

+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ const lazy = {}; 


ChromeUtils.defineESModuleGetters(lazy, {

  BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs",

  PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",

  Region: "resource://gre/modules/Region.sys.mjs",

});
@@ -17,7 +18,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, { 
  AddonManager: "resource://gre/modules/AddonManager.jsm",

  LoginBreaches: "resource:///modules/LoginBreaches.jsm",

  LoginHelper: "resource://gre/modules/LoginHelper.jsm",

  PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",

});



XPCOMUtils.defineLazyGetter(lazy, "fxAccounts", () => {

browser/actors/BrowserTabChild.sys.mjs

+3 −5
Original line number Diff line number Diff line
@@ -5,11 +5,9 @@ 


const lazy = {};



ChromeUtils.defineModuleGetter(

  lazy,

  "E10SUtils",

  "resource://gre/modules/E10SUtils.jsm"

);

ChromeUtils.defineESModuleGetters(lazy, {

  E10SUtils: "resource://gre/modules/E10SUtils.sys.mjs",

});



export class BrowserTabChild extends JSWindowActorChild {

  constructor() {

browser/actors/ClickHandlerChild.sys.mjs

+5 −14
Original line number Diff line number Diff line
@@ -7,25 +7,16 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; 


const lazy = {};



ChromeUtils.defineModuleGetter(

  lazy,

  "PrivateBrowsingUtils",

  "resource://gre/modules/PrivateBrowsingUtils.jsm"

);

ChromeUtils.defineESModuleGetters(lazy, {

  BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs",

  E10SUtils: "resource://gre/modules/E10SUtils.sys.mjs",

  PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",

});

ChromeUtils.defineModuleGetter(

  lazy,

  "WebNavigationFrames",

  "resource://gre/modules/WebNavigationFrames.jsm"

);

ChromeUtils.defineModuleGetter(

  lazy,

  "E10SUtils",

  "resource://gre/modules/E10SUtils.jsm"

);



ChromeUtils.defineESModuleGetters(lazy, {

  BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs",

});



export class MiddleMousePasteHandlerChild extends JSWindowActorChild {

  handleEvent(clickEvent) {