Verified Commit 42f5b8d7 authored by Alex Catarineu's avatar Alex Catarineu Committed by Pier Angelo Vendrame
Browse files

Bug 10760: Integrate TorButton to TorBrowser core 

Because of the non-restartless nature of Torbutton, it required
a two-stage installation process. On mobile, it was a problem,
because it was not loading when the user opened the browser for
the first time.

Moving it to tor-browser and making it a system extension allows it
to load when the user opens the browser for first time.

Additionally, this patch also fixes Bug 27611.

Bug 26321: New Circuit and New Identity menu items

Bug 14392: Make about:tor behave like other initial pages.

Bug 25013: Add torbutton as a tor-browser submodule

Bug 31575: Replace Firefox Home (newtab) with about:tor
parent daf07d2b

browser/base/content/browser.xhtml

+11 −0
Original line number Diff line number Diff line
@@ -36,6 +36,11 @@ 
<?xml-stylesheet href="chrome://browser/skin/translations/panel.css" type="text/css"?>

<?xml-stylesheet href="chrome://browser/skin/places/tree-icons.css" type="text/css"?>

<?xml-stylesheet href="chrome://browser/skin/places/editBookmark.css" type="text/css"?>

<?xml-stylesheet href="chrome://browser/content/onionservices/onionservices.css" type="text/css"?>



<!DOCTYPE window [

#include browser-doctype.inc

]>



<html id="main-window"

        xmlns:html="http://www.w3.org/1999/xhtml"
@@ -123,11 +128,17 @@ 
  Services.scriptloader.loadSubScript("chrome://browser/content/search/autocomplete-popup.js", this);

  Services.scriptloader.loadSubScript("chrome://browser/content/search/searchbar.js", this);

  Services.scriptloader.loadSubScript("chrome://browser/content/languageNotification.js", this);

  Services.scriptloader.loadSubScript("chrome://torbutton/content/torbutton.js", this);



  window.onload = gBrowserInit.onLoad.bind(gBrowserInit);

  window.onunload = gBrowserInit.onUnload.bind(gBrowserInit);

  window.onclose = WindowIsClosing;



  //onLoad Handler

  try {

    window.addEventListener("load", torbutton_init);

  } catch (e) {}



  window.addEventListener("MozBeforeInitialXULLayout",

    gBrowserInit.onBeforeInitialXULLayout.bind(gBrowserInit), { once: true });

browser/installer/package-manifest.in

+3 −0
Original line number Diff line number Diff line
@@ -226,6 +226,9 @@ 
@RESPATH@/chrome/pdfjs.manifest

@RESPATH@/chrome/pdfjs/*

@RESPATH@/components/tor-launcher.manifest

@RESPATH@/chrome/torbutton.manifest

@RESPATH@/chrome/torbutton/*

@RESPATH@/components/torbutton.manifest

@RESPATH@/chrome/toolkit@JAREXT@

@RESPATH@/chrome/toolkit.manifest

#ifdef MOZ_GTK

mobile/android/installer/package-manifest.in

+4 −0
Original line number Diff line number Diff line
@@ -140,6 +140,10 @@ 
; Base Browser

@BINPATH@/components/SecurityLevel.manifest



; Torbutton

@BINPATH@/chrome/torbutton@JAREXT@

@BINPATH@/chrome/torbutton.manifest



; [Default Preferences]

; All the pref files must be part of base to prevent migration bugs

#ifndef MOZ_ANDROID_FAT_AAR_ARCHITECTURES

toolkit/moz.build

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ DIRS += [ 
    "mozapps/preferences",

    "profile",

    "themes",

    "torbutton",

]



if CONFIG["OS_ARCH"] == "WINNT":

toolkit/torbutton/CREDITS

0 → 100644
+5 −0
Original line number Diff line number Diff line 
TorButton was adapted by Scott Squires from ProxyButton

(proxybutton.mozdev.com), which was written by Oleg Ivanov.



Security components by Mike Perry with History blocking and cookie jar code

from Collin Jackson.