Commit 167c45ce authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

fixup! TB 21952: Implement Onion-Location 

BB 43824: Move from resources:// to moz-src:///.
parent 36d3fed4

browser/base/content/browser.js

+2 −1
Original line number Diff line number Diff line
@@ -53,7 +53,8 @@ ChromeUtils.defineESModuleGetters(this, { 
  NewTabUtils: "resource://gre/modules/NewTabUtils.sys.mjs",

  NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",

  nsContextMenu: "chrome://browser/content/nsContextMenu.sys.mjs",

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

  OnionLocationParent:

    "moz-src:///browser/components/onionservices/OnionLocationParent.sys.mjs",

  OpenSearchManager:

    "moz-src:///browser/components/search/OpenSearchManager.sys.mjs",

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

browser/components/DesktopActorRegistry.sys.mjs

+4 −2
Original line number Diff line number Diff line
@@ -604,10 +604,12 @@ let JSWINDOWACTORS = { 


  OnionLocation: {

    parent: {

      esModuleURI: "resource:///modules/OnionLocationParent.sys.mjs",

      esModuleURI:

        "moz-src:///browser/components/onionservices/OnionLocationParent.sys.mjs",

    },

    child: {

      esModuleURI: "resource:///modules/OnionLocationChild.sys.mjs",

      esModuleURI:

        "moz-src:///browser/components/onionservices/OnionLocationChild.sys.mjs",

      events: {

        pageshow: { mozSystemGroup: true },

      },

browser/components/onionservices/OnionLocationParent.sys.mjs

+1 −1
Original line number Diff line number Diff line 
// Copyright (c) 2020, The Tor Project, Inc.



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

import { TorStrings } from "moz-src:///toolkit/modules/TorStrings.sys.mjs";



// Prefs

browser/components/onionservices/moz.build

+2 −5
Original line number Diff line number Diff line 
JAR_MANIFESTS += ["jar.mn"]



EXTRA_JS_MODULES += [

    "OnionLocationChild.sys.mjs",

    "OnionLocationParent.sys.mjs",

]



MOZ_SRC_FILES += [

    "OnionAliasStore.sys.mjs",

    "OnionLocationChild.sys.mjs",

    "OnionLocationParent.sys.mjs",

    "TorRequestWatch.sys.mjs",

]