Verified Commit f142bbf3 authored by henry's avatar henry Committed by Pier Angelo Vendrame
Browse files

fixup! Bug 10760: Integrate TorButton to TorBrowser core 

Bug 41600 - Remove old circuit display.
parent 9d79898b

browser/base/content/browser.xhtml

+1 −3
Original line number Diff line number Diff line
@@ -35,8 +35,7 @@ 
<?xml-stylesheet href="chrome://browser/skin/searchbar.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://torbutton/skin/tor-circuit-display.css" type="text/css"?>

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

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



<!DOCTYPE window [

#include browser-doctype.inc
@@ -122,7 +121,6 @@ 
  Services.scriptloader.loadSubScript("chrome://browser/content/search/autocomplete-popup.js", this);

  Services.scriptloader.loadSubScript("chrome://browser/content/search/searchbar.js", this);

  Services.scriptloader.loadSubScript("chrome://browser/content/languageNotification.js", this);

  Services.scriptloader.loadSubScript("chrome://torbutton/content/tor-circuit-display.js", this);

  Services.scriptloader.loadSubScript("chrome://torbutton/content/torbutton.js", this);



  window.onload = gBrowserInit.onLoad.bind(gBrowserInit);

browser/components/controlcenter/content/identityPanel.inc.xhtml

+0 −22
Original line number Diff line number Diff line
@@ -92,28 +92,6 @@ 
        </vbox>

      </hbox>



      <!-- Circuit display section -->



      <vbox id="circuit-display-container" class="identity-popup-section">

        <toolbarseparator/>

        <vbox id="circuit-display-header" flex="1" role="group"

              aria-labelledby="circuit-display-headline">

          <hbox flex="1">

            <label id="circuit-display-headline"

                   role="heading" aria-level="2">&torbutton.circuit_display.title;</label>

          </hbox>

        </vbox>

        <vbox id="circuit-display-content">

          <html:ul id="circuit-display-nodes" dir="auto"/>

          <hbox id="circuit-guard-note-container"/>

          <hbox id="circuit-reload-button-container">

            <html:button id="circuit-reload-button"

                    onclick="torbutton_new_circuit()"

                    default="true">&torbutton.circuit_display.new_circuit;</html:button>

          </hbox>

        </vbox>

      </vbox>



      <!-- Clear Site Data Button -->

      <vbox hidden="true"

            id="identity-popup-clear-sitedata-footer">

toolkit/torbutton/chrome/content/tor-circuit-display.js

deleted100644 → 0
+0 −615

File deleted.

Preview size limit exceeded, changes collapsed.

toolkit/torbutton/chrome/content/torbutton.js

+1 −15

File changed.

Preview size limit exceeded, changes collapsed.

toolkit/torbutton/chrome/skin/tor-circuit-display.css

deleted100644 → 0
+0 −193

File deleted.

Preview size limit exceeded, changes collapsed.