[tor-commits] [tor-browser/tor-browser-68.1.0esr-9.0-1] Load torbutton in BrowserApp.startup on Android

[gk at torproject.org]

commit fe6da38319ca39a62dc8cfffe615ec0335ba3ddf
Author: Matthew Finkel <Matthew.Finkel at gmail.com>
Date:   Fri Aug 30 10:17:25 2019 -0400

    Load torbutton in BrowserApp.startup on Android
---
 mobile/android/chrome/content/browser.js  | 3 +++
 mobile/android/chrome/content/browser.xul | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index f8e9399f51c4..dbecd308a3dc 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 8072a7a1c6e5..fab93922a5f6 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,8 @@
         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_util.js"/>
+  <script type="application/javascript" src="chrome://torbutton/content/torbutton.js"/>
 
   <deck id="browsers" flex="1"/>