Commit a5840800 authored by henry's avatar henry Committed by brizental
Browse files

Bug 41600: Add a tor circuit display panel.

parent 663e8c64

browser/base/content/browser-init.js

+4 −0
Original line number Diff line number Diff line
@@ -225,6 +225,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
@@ -1038,6 +1040,8 @@ var gBrowserInit = { 


    NewIdentityButton.uninit();



    gTorCircuitPanel.uninit();



    if (gToolbarKeyNavEnabled) {

      ToolbarKeyboardNavigator.uninit();

    }

browser/base/content/browser.js

+5 −0
Original line number Diff line number Diff line
@@ -297,6 +297,11 @@ XPCOMUtils.defineLazyScriptGetter( 
  "gProfiles",

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

);

XPCOMUtils.defineLazyScriptGetter(

  this,

  ["gTorCircuitPanel"],

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

);



// lazy service getters

browser/base/content/browser.xhtml

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ 


  <link rel="stylesheet" href="chrome://browser/content/securitylevel/securityLevelPanel.css" />

  <link rel="stylesheet" href="chrome://browser/content/securitylevel/securityLevelButton.css" />

  <link rel="stylesheet" href="chrome://browser/content/torCircuitPanel.css" />



  <link rel="localization" href="branding/brand.ftl"/>

  <link rel="localization" href="browser/allTabsMenu.ftl"/>

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

+1 −0
Original line number Diff line number Diff line
@@ -531,6 +531,7 @@ 
#include ../../components/translations/content/selectTranslationsPanel.inc.xhtml

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

#include ../../components/tabbrowser/content/browser-allTabsMenu.inc.xhtml

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

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



  <tooltip id="dynamic-shortcut-tooltip"

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

+11 −0
Original line number Diff line number Diff line
@@ -181,6 +181,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"

                 data-l10n-id="tor-circuit-urlbar-button"

                 hidden="true">

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

            </box>

            <box class="chromeclass-toolbar-additional urlbar-search-button"/>

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

                 code fires onmousedown, and hence eats our favicon drag events. -->