fixup! Bug 10760: Integrate TorButton to TorBrowser core

Make this commit disappear from the patch set. We still need the jar.mn, but only for strings, so do these changes in the strings commit, instead. The Android change should not be needed at all, at this point.

fixup! Bug 10760: Integrate TorButton to TorBrowser core
ea4dc759 · Pier Angelo Vendrame · 51275698 · ea4dc759 · ea4dc759 · ea4dc759
Verified Commit ea4dc759 authored Aug 21, 2023 by Pier Angelo Vendrame
--- a/browser/base/content/browser.xhtml
+++ b/browser/base/content/browser.xhtml
@@ -36,11 +36,6 @@
 <?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"

--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -225,8 +225,6 @@
 @RESPATH@/browser/chrome/browser.manifest
 @RESPATH@/chrome/pdfjs.manifest
 @RESPATH@/chrome/pdfjs/*
-@RESPATH@/chrome/torbutton.manifest
-@RESPATH@/chrome/torbutton/*
 @RESPATH@/chrome/toolkit@JAREXT@
 @RESPATH@/chrome/toolkit.manifest
 #ifdef MOZ_GTK

--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -140,10 +140,6 @@
 ; 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

--- a/toolkit/moz.build
+++ b/toolkit/moz.build
@@ -22,7 +22,6 @@ DIRS += [
    "mozapps/preferences",
    "profile",
    "themes",
-    "torbutton",
 ]

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

--- a/toolkit/torbutton/CREDITS
+++ b/toolkit/torbutton/CREDITS
-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.
--- a/toolkit/torbutton/LICENSE
+++ b/toolkit/torbutton/LICENSE
-Copyright (c) 2020, The Tor Project, Inc.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    (1) Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-    (2) Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-    (3)The name of the author may not be used to
-    endorse or promote products derived from this software without
-    specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
--- a/toolkit/torbutton/jar.mn
+++ b/toolkit/torbutton/jar.mn
-#filter substitution
-
-torbutton.jar:
-% resource torbutton %
--- a/toolkit/torbutton/moz.build
+++ b/toolkit/torbutton/moz.build
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-JAR_MANIFESTS += ["jar.mn"]