Verified Commit 9d854e14 authored by henry's avatar henry Committed by ma1
Browse files

Bug 41600: Add a tor circuit display panel.

parent f37d32a7

browser/base/content/browser.js

+9 −0
Original line number Diff line number Diff line
@@ -282,6 +282,11 @@ XPCOMUtils.defineLazyScriptGetter( 
  "gPageStyleMenu",

  "chrome://browser/content/browser-pagestyle.js"

);

XPCOMUtils.defineLazyScriptGetter(

  this,

  ["gTorCircuitPanel"],

  "chrome://browser/content/torCircuitPanel.js"

);



// lazy service getters
@@ -1722,6 +1727,8 @@ var gBrowserInit = { 
    // Init the NewIdentityButton

    NewIdentityButton.init();



    gTorCircuitPanel.init();



    // Certain kinds of automigration rely on this notification to complete

    // their tasks BEFORE the browser window is shown. SessionStore uses it to

    // restore tabs into windows AFTER important parts like gMultiProcessBrowser
@@ -2495,6 +2502,8 @@ var gBrowserInit = { 


    NewIdentityButton.uninit();



    gTorCircuitPanel.uninit();



    if (gToolbarKeyNavEnabled) {

      ToolbarKeyboardNavigator.uninit();

    }

browser/base/content/browser.xhtml

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
<?xml-stylesheet href="chrome://browser/skin/translations/panel.css" type="text/css"?>

<?xml-stylesheet href="chrome://browser/skin/places/tree-icons.css" type="text/css"?>

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

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



<!DOCTYPE window [

#include browser-doctype.inc

browser/base/content/main-popupset.inc.xhtml

+1 −0
Original line number Diff line number Diff line
@@ -527,6 +527,7 @@ 
#include ../../components/downloads/content/downloadsPanel.inc.xhtml

#include ../../components/translations/content/translationsPanel.inc.xhtml

#include ../../../devtools/startup/enableDevToolsPopup.inc.xhtml

#include ../../components/torcircuit/content/torCircuitPanel.inc.xhtml

#include ../../components/securitylevel/content/securityLevelPanel.inc.xhtml

#include browser-allTabsMenu.inc.xhtml

browser/base/content/navigator-toolbox.inc.xhtml

+11 −0
Original line number Diff line number Diff line
@@ -185,6 +185,17 @@ 
                 collapsed="true">

                <image id="remote-control-icon"/>

            </box>

            <!-- We follow the surrounding code and use a

               - <xul:box role="button"> rather than a more semantic

               - <html:button>, <xul:button> or <xul:toolbarbutton> -->

            <box id="tor-circuit-button"

                 role="button"

                 class="identity-box-button"

                 align="center"

                 tooltiptext="&torbutton.circuit_display.title;"

                 hidden="true">

              <image id="tor-circuit-button-icon"/>

            </box>

            <box id="urlbar-search-button"

                 class="chromeclass-toolbar-additional"/>

            <!-- Use onclick instead of normal popup= syntax since the popup

browser/components/moz.build

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ DIRS += [ 
    "translations",

    "uitour",

    "urlbar",

    "torcircuit",

]



DIRS += ["build"]