Verified Commit b45bb7f1 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

fixup! TB 43405: Show a prompt whenever we fail to apply Tor settings. 

BB 43770: Follow upstream's BrowserGlue simplifications.
parent 167c0116

browser/components/BrowserComponents.manifest

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ category browser-first-window-ready resource://gre/modules/SandboxUtils.sys.mjs 
category browser-first-window-ready moz-src:///browser/modules/ClipboardPrivacy.sys.mjs ClipboardPrivacy.init

category browser-first-window-ready moz-src:///browser/modules/SecurityLevelRestartNotification.sys.mjs SecurityLevelRestartNotification.ready

category browser-first-window-ready moz-src:///toolkit/modules/DragDropFilter.sys.mjs DragDropFilter.init

category browser-first-window-ready moz-src:///browser/modules/TorSettingsNotification.sys.mjs TorSettingsNotification.ready



category browser-idle-startup resource:///modules/PlacesUIUtils.sys.mjs PlacesUIUtils.unblockToolbars

category browser-idle-startup resource:///modules/BuiltInThemes.sys.mjs BuiltInThemes.ensureBuiltInThemes

browser/components/BrowserGlue.sys.mjs

+0 −4
Original line number Diff line number Diff line
@@ -73,8 +73,6 @@ ChromeUtils.defineESModuleGetters(lazy, { 
  TRRRacer: "resource:///modules/TRRPerformance.sys.mjs",

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

  TorConnectTopics: "resource://gre/modules/TorConnect.sys.mjs",

  TorSettingsNotification:

    "resource:///modules/TorSettingsNotification.sys.mjs",

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

  WebProtocolHandlerRegistrar:

    "resource:///modules/WebProtocolHandlerRegistrar.sys.mjs",
@@ -826,8 +824,6 @@ BrowserGlue.prototype = { 
      lazy.WeaveService.init();

    }



    lazy.TorSettingsNotification.ready();



    lazy.BrowserUtils.callModulesFromCategory(

      {

        categoryName: "browser-first-window-ready",

browser/modules/moz.build

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,6 @@ EXTRA_JS_MODULES += [ 
    "SharingUtils.sys.mjs",

    "SiteDataManager.sys.mjs",

    "SitePermissions.sys.mjs",

    "TorSettingsNotification.sys.mjs",

    "TorUIUtils.sys.mjs",

    "TransientPrefs.sys.mjs",

    "URILoadingHelper.sys.mjs",
@@ -152,6 +151,7 @@ MOZ_SRC_FILES += [ 
    "ContextId.sys.mjs",

    "ClipboardPrivacy.sys.mjs",

    "SecurityLevelRestartNotification.sys.mjs",

    "TorSettingsNotification.sys.mjs",

]



if CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows":