Commit 27813def authored by Matthew Finkel's avatar Matthew Finkel Committed by Matthew Finkel
Browse files

Load torbutton in BrowserApp.startup on Android

parent cc3bb8db

mobile/android/chrome/content/browser.js

+3 −0
Original line number Diff line number Diff line
@@ -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

mobile/android/chrome/content/browser.xul

+2 −0
Original line number Diff line number Diff line
@@ -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"/>