From add294302a6c097614d160531a03236311d81dc1 Mon Sep 17 00:00:00 2001
From: Matthew Finkel <Matthew.Finkel@gmail.com>
Date: Fri, 30 Aug 2019 10:17:25 -0400
Subject: [PATCH] Load torbutton in BrowserApp.startup on Android

---
 mobile/android/chrome/content/browser.js  | 3 +++
 mobile/android/chrome/content/browser.xul | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 49b3f527567be..5f5ac123835c6 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -763,6 +763,9 @@ var BrowserApp = {
       true
     );
 
+    // Torbutton scripts included in browser.xul
+    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 8072a7a1c6e59..039599131f17c 100644
--- a/mobile/android/chrome/content/browser.xul
+++ b/mobile/android/chrome/content/browser.xul
@@ -4,6 +4,7 @@
    - 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();"
@@ -11,6 +12,7 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <script type="application/javascript" src="chrome://browser/content/browser.js"/>
+  <script type="application/javascript" src="chrome://torbutton/content/torbutton.js"/>
 
   <deck id="browsers" flex="1"/>
 
-- 
GitLab