Commit 8b4f426e authored by Mark Banner's avatar Mark Banner
Browse files

Bug 1834204 - Update more consumers to import ES modules directly....

Bug 1834204 - Update more consumers to import ES modules directly. r=kpatenio,geckoview-reviewers,whimboo,m_kato

Differential Revision: https://phabricator.services.mozilla.com/D178590
parent 3971208b
Loading
Loading
Loading
Loading
+1 −5
Original line number Diff line number Diff line
@@ -4,13 +4,9 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

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

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

const { RemotePageChild } = ChromeUtils.import(
  "resource://gre/actors/RemotePageChild.jsm"
);
import { RemotePageChild } from "resource://gre/actors/RemotePageChild.sys.mjs";

const lazy = {};

+0 −3
Original line number Diff line number Diff line
@@ -281,9 +281,6 @@ var whitelist = [
  // toolkit/xre/MacRunFromDmgUtils.mm
  { file: "resource://gre/localization/en-US/toolkit/global/run-from-dmg.ftl" },

  // References to esm generated from jsm programmatically
  { file: "resource://gre/modules/LangPackMatcher.sys.mjs" },

  // Referenced by screenshots extension
  { file: "chrome://browser/content/screenshots/cancel.svg" },
  { file: "chrome://browser/content/screenshots/copy.svg" },
+1 −1
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
    "resource://gre/modules/psm/RemoteSecuritySettings.sys.mjs",
  RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
  SafeBrowsing: "resource://gre/modules/SafeBrowsing.sys.mjs",
  Sanitizer: "resource:///modules/Sanitizer.sys.mjs",
  SaveToPocket: "chrome://pocket/content/SaveToPocket.sys.mjs",
  ScreenshotsUtils: "resource:///modules/ScreenshotsUtils.sys.mjs",
  SearchSERPTelemetry: "resource:///modules/SearchSERPTelemetry.sys.mjs",
@@ -93,7 +94,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
    "resource://activity-stream/lib/OnboardingMessageProvider.jsm",
  PageActions: "resource:///modules/PageActions.jsm",
  ProcessHangMonitor: "resource:///modules/ProcessHangMonitor.jsm",
  Sanitizer: "resource:///modules/Sanitizer.jsm",
  TabCrashHandler: "resource:///modules/ContentCrashHandlers.jsm",
  TabUnloader: "resource:///modules/TabUnloader.jsm",
});
+1 −4
Original line number Diff line number Diff line
@@ -16,14 +16,11 @@ ChromeUtils.defineESModuleGetters(lazy, {
  LoginCSVImport: "resource://gre/modules/LoginCSVImport.sys.mjs",
  LoginExport: "resource://gre/modules/LoginExport.sys.mjs",
  LoginHelper: "resource://gre/modules/LoginHelper.sys.mjs",
  MigrationUtils: "resource:///modules/MigrationUtils.sys.mjs",
  OSKeyStore: "resource://gre/modules/OSKeyStore.sys.mjs",
  UIState: "resource://services-sync/UIState.sys.mjs",
});

XPCOMUtils.defineLazyModuleGetters(lazy, {
  MigrationUtils: "resource:///modules/MigrationUtils.jsm",
});

XPCOMUtils.defineLazyGetter(lazy, "log", () => {
  return lazy.LoginHelper.createLogger("AboutLoginsParent");
});
+2 −5
Original line number Diff line number Diff line
@@ -10,16 +10,13 @@ const lazy = {};

ChromeUtils.defineESModuleGetters(lazy, {
  CustomizableUI: "resource:///modules/CustomizableUI.sys.mjs",
  LoginHelper: "resource://gre/modules/LoginHelper.sys.mjs",
  PanelMultiView: "resource:///modules/PanelMultiView.sys.mjs",
  RecentlyClosedTabsAndWindowsMenuUtils:
    "resource:///modules/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.sys.mjs",
  Sanitizer: "resource:///modules/Sanitizer.sys.mjs",
  SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs",
  ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs",
  LoginHelper: "resource://gre/modules/LoginHelper.sys.mjs",
});

XPCOMUtils.defineLazyModuleGetters(lazy, {
  Sanitizer: "resource:///modules/Sanitizer.jsm",
});

const kPrefCustomizationDebug = "browser.uiCustomization.debug";
Loading