Commit a6704d82 authored by henry's avatar henry Committed by Pier Angelo Vendrame
Browse files

fixup! TB 27476: Implement about:torconnect captive portal within Tor Browser 

TB 44621: Move torconnect/ from toolkit/components/ to
browser/components/
parent 2be57560

browser/base/content/browser.js

+3 −3
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ ChromeUtils.defineESModuleGetters(this, { 
  TorConnect: "resource://gre/modules/TorConnect.sys.mjs",

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

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

  TorConnectParent: "resource://gre/actors/TorConnectParent.sys.mjs",

  TorConnectParent: "resource:///actors/TorConnectParent.sys.mjs",

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

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

  TranslationsParent: "resource://gre/actors/TranslationsParent.sys.mjs",
@@ -322,12 +322,12 @@ XPCOMUtils.defineLazyScriptGetter( 
XPCOMUtils.defineLazyScriptGetter(

  this,

  ["gTorConnectUrlbarButton"],

  "chrome://global/content/torconnect/torConnectUrlbarButton.js"

  "chrome://browser/content/torconnect/torConnectUrlbarButton.js"

);

XPCOMUtils.defineLazyScriptGetter(

  this,

  ["gTorConnectTitlebarStatus"],

  "chrome://global/content/torconnect/torConnectTitlebarStatus.js"

  "chrome://browser/content/torconnect/torConnectTitlebarStatus.js"

);

XPCOMUtils.defineLazyScriptGetter(

  this,

browser/base/content/browser.xhtml

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 
  <link rel="stylesheet" href="chrome://browser/content/securitylevel/securityLevelPanel.css" />

  <link rel="stylesheet" href="chrome://browser/content/securitylevel/securityLevelButton.css" />

  <link rel="stylesheet" href="chrome://browser/content/torCircuitPanel.css" />

  <link rel="stylesheet" href="chrome://global/content/torconnect/torConnectTitlebarStatus.css" />

  <link rel="stylesheet" href="chrome://browser/content/torconnect/torConnectTitlebarStatus.css" />



  <link rel="localization" href="branding/brand.ftl"/>

  <link rel="localization" href="browser/allTabsMenu.ftl"/>

browser/base/content/navigator-toolbox.inc.xhtml

+2 −2
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ 


    <toolbarbutton class="content-analysis-indicator toolbarbutton-1 content-analysis-indicator-icon"/>



#include ../../../toolkit/components/torconnect/content/torConnectTitlebarStatus.inc.xhtml

#include ../../components/torconnect/content/torConnectTitlebarStatus.inc.xhtml

#include titlebar-items.inc.xhtml



  </toolbar>
@@ -566,7 +566,7 @@ 
    <hbox class="titlebar-spacer" type="post-tabs"/>

#include private-browsing-indicator.inc.xhtml

    <toolbarbutton class="content-analysis-indicator toolbarbutton-1 content-analysis-indicator-icon"/>

#include ../../../toolkit/components/torconnect/content/torConnectTitlebarStatus.inc.xhtml

#include ../../components/torconnect/content/torConnectTitlebarStatus.inc.xhtml

#include titlebar-items.inc.xhtml

  </toolbar>

browser/components/about/AboutRedirector.cpp

+5 −0
Original line number Diff line number Diff line
@@ -162,6 +162,11 @@ static const RedirEntry kRedirMap[] = { 
         nsIAboutModule::IS_SECURE_CHROME_UI | nsIAboutModule::ALLOW_SCRIPT |

         nsIAboutModule::URI_MUST_LOAD_IN_CHILD |

         nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS},

    {"torconnect", "chrome://browser/content/torconnect/aboutTorConnect.html",

     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |

         nsIAboutModule::URI_CAN_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT |

         nsIAboutModule::HIDE_FROM_ABOUTABOUT |

         nsIAboutModule::IS_SECURE_CHROME_UI},

};



static nsAutoCString GetAboutModuleName(nsIURI* aURI) {

browser/components/about/components.conf

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ pages = [ 
    'sessionrestore',

    'settings',

    'tabcrashed',

    'torconnect',

    'unloads',

    'welcome',

    'welcomeback',