Commit ed46347a authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃 Committed by richard
Browse files

fixup! Bug 40597: Implement TorSettings module 

Bug 42246: Migrate tor connection stuff from browser to toolkit
parent b8154f3f

browser/modules/moz.build

+0 −4
Original line number Diff line number Diff line
@@ -123,7 +123,6 @@ XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini"] 
EXTRA_JS_MODULES += [

    "AboutNewTab.jsm",

    "AsyncTabSwitcher.jsm",

    "BridgeDB.sys.mjs",

    "BrowserUIUtils.jsm",

    "BrowserUsageTelemetry.jsm",

    "BrowserWindowTracker.jsm",
@@ -135,7 +134,6 @@ EXTRA_JS_MODULES += [ 
    "FeatureCallout.sys.mjs",

    "HomePage.jsm",

    "LaterRun.jsm",

    "Moat.sys.mjs",

    "NewTabPagePreloading.jsm",

    "OpenInTabsUtils.jsm",

    "PageActions.jsm",
@@ -149,8 +147,6 @@ EXTRA_JS_MODULES += [ 
    "SitePermissions.sys.mjs",

    "TabsList.jsm",

    "TabUnloader.jsm",

    "TorConnect.sys.mjs",

    "TorSettings.sys.mjs",

    "TorUIUtils.sys.mjs",

    "TransientPrefs.jsm",

    "URILoadingHelper.sys.mjs",

toolkit/components/tor-launcher/TorStartupService.sys.mjs

+2 −2
Original line number Diff line number Diff line
@@ -3,11 +3,11 @@ const lazy = {}; 
// We will use the modules only when the profile is loaded, so prefer lazy

// loading

ChromeUtils.defineESModuleGetters(lazy, {

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

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

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

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

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

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

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

});



/* Browser observer topis */

browser/modules/BridgeDB.sys.mjs→toolkit/modules/BridgeDB.sys.mjs

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



ChromeUtils.defineESModuleGetters(lazy, {

  MoatRPC: "resource:///modules/Moat.sys.mjs",

  MoatRPC: "resource://gre/modules/Moat.sys.mjs",

});



export var BridgeDB = {

browser/modules/Moat.sys.mjs→toolkit/modules/Moat.sys.mjs

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
import {

  TorSettings,

  TorBridgeSource,

} from "resource:///modules/TorSettings.sys.mjs";

} from "resource://gre/modules/TorSettings.sys.mjs";



const lazy = {};

browser/modules/TorConnect.sys.mjs→toolkit/modules/TorConnect.sys.mjs

+3 −3
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ import { setTimeout, clearTimeout } from "resource://gre/modules/Timer.sys.mjs"; 
const lazy = {};



ChromeUtils.defineESModuleGetters(lazy, {

  MoatRPC: "resource:///modules/Moat.sys.mjs",

  MoatRPC: "resource://gre/modules/Moat.sys.mjs",

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

});
@@ -23,9 +23,9 @@ import { 
  TorSettings,

  TorSettingsTopics,

  TorBuiltinBridgeTypes,

} from "resource:///modules/TorSettings.sys.mjs";

} from "resource://gre/modules/TorSettings.sys.mjs";



const { TorStrings } = ChromeUtils.import("resource:///modules/TorStrings.jsm");

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



const TorTopics = Object.freeze({

  LogHasWarnOrErr: "TorLogHasWarnOrErr",