commit af0bfb7134368f2d9a2eb7efeb1d6abcd11b5fdf Author: Georg Koppen gk@torproject.org Date: Mon Sep 2 09:16:02 2019 +0000

Revert "Load torbutton in browser.xul on Android"

This reverts commit 805ff051656dc22d11de026e01223352f39e7380. --- mobile/android/chrome/content/browser.js | 4 ---- mobile/android/chrome/content/browser.xul | 1 - 2 files changed, 5 deletions(-)

diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js index 7fcee29f0c3c..f8e9399f51c4 100644 --- a/mobile/android/chrome/content/browser.js +++ b/mobile/android/chrome/content/browser.js @@ -243,8 +243,6 @@ var lazilyLoadedBrowserScripts = [ ["CastingApps", "chrome://browser/content/CastingApps.js"], ["RemoteDebugger", "chrome://browser/content/RemoteDebugger.js"], ["gViewSourceUtils", "chrome://global/content/viewSourceUtils.js"], - ["torbuttonUtils", "chrome://torbutton/content/torbutton_utils.js"], - ["torbutton", "chrome://torbutton/content/torbutton.js"], ];

lazilyLoadedBrowserScripts.forEach(function(aScript) { @@ -765,8 +763,6 @@ var BrowserApp = { true );

- torbutton_init(); - // We can't delay registering WebChannel listeners: if the first page is // about:accounts, which can happen when starting the Firefox Account flow // from the first run experience, or via the Firefox Account Status diff --git a/mobile/android/chrome/content/browser.xul b/mobile/android/chrome/content/browser.xul index 71aa04df0ebf..8072a7a1c6e5 100644 --- a/mobile/android/chrome/content/browser.xul +++ b/mobile/android/chrome/content/browser.xul @@ -4,7 +4,6 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

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

<window id="main-window" onload="BrowserApp.startup();"