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

[gk at torproject.org]

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

    Load torbutton in browser.xul on Android
---
 mobile/android/chrome/content/browser.js  | 4 ++++
 mobile/android/chrome/content/browser.xul | 1 +
 2 files changed, 5 insertions(+)

diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index f8e9399f51c4..7fcee29f0c3c 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -243,6 +243,8 @@ 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) {
@@ -763,6 +765,8 @@ 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 8072a7a1c6e5..71aa04df0ebf 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();"