Verified Commit 322c6af1 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

fixup! Bug 3455: Add DomainIsolator, for isolating circuit by domain. 

Actually added the new circuit button.
parent ae68e4b5

browser/base/content/appmenu-viewcache.inc.xhtml

+5 −0
Changes for browser/base/content/appmenu-viewcache.inc.xhtml: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -61,6 +61,11 @@ 
      <toolbarbutton id="appMenu-new-identity"

                     class="subviewbutton"

                     key="new-identity-key"/>

      <toolbarbutton id="appMenuNewCircuit"

                     class="subviewbutton"

                     key="new-circuit-key"

                     label="&torbutton.context_menu.new_circuit_sentence_case;"

                     oncommand="TorDomainIsolator.newCircuitForBrowser(gBrowser);"/>

      <toolbarseparator/>

      <toolbarbutton id="appMenu-bookmarks-button"

                     class="subviewbutton subviewbutton-nav"

browser/base/content/browser-menubar.inc

+5 −0
Changes for browser/base/content/browser-menubar.inc: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -31,6 +31,11 @@ 
                <menuseparator/>

                <menuitem id="menu_newIdentity"

                          key="new-identity-key"/>

                <menuitem id="menu_newCircuit"

                          accesskey="&torbutton.context_menu.new_circuit_key;"

                          key="new-circuit-key"

                          label="&torbutton.context_menu.new_circuit;"

                          oncommand="TorDomainIsolator.newCircuitForBrowser(gBrowser);"/>

                <menuseparator/>

                <menuitem id="menu_openLocation"

                          hidden="true"

browser/base/content/browser-sets.inc

+1 −0
Changes for browser/base/content/browser-sets.inc: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -389,4 +389,5 @@ 
         internal="true"/>

#endif

    <key id="new-identity-key" modifiers="accel shift" key="U" oncommand="NewIdentityButton.onCommand(event)"/>

    <key id="new-circuit-key" modifiers="accel shift" key="L" oncommand="TorDomainIsolator.newCircuitForBrowser(gBrowser)"/>

  </keyset>

browser/base/content/browser.js

+1 −0
Changes for browser/base/content/browser.js: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ XPCOMUtils.defineLazyModuleGetters(this, { 
  TorConnect: "resource:///modules/TorConnect.jsm",

  TorConnectState: "resource:///modules/TorConnect.jsm",

  TorConnectTopics: "resource:///modules/TorConnect.jsm",

  TorDomainIsolator: "resource://gre/modules/TorDomainIsolator.jsm",

  Translation: "resource:///modules/translation/TranslationParent.jsm",

  UITour: "resource:///modules/UITour.jsm",

  UpdateUtils: "resource://gre/modules/UpdateUtils.jsm",

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

+5 −0
Changes for browser/base/content/navigator-toolbox.inc.xhtml: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -567,6 +567,11 @@ 


    <toolbarbutton id="new-identity-button" class="toolbarbutton-1 chromeclass-toolbar-additional"/>



    <toolbarbutton id="new-circuit-button" class="toolbarbutton-1 chromeclass-toolbar-additional"

                   label="&torbutton.context_menu.new_circuit;"

                   oncommand="TorDomainIsolator.newCircuitForBrowser(gBrowser);"

                   tooltiptext="&torbutton.context_menu.new_circuit;"/>



    <toolbarbutton id="fullscreen-button" class="toolbarbutton-1 chromeclass-toolbar-additional"

                   observes="View:FullScreen"

                   type="checkbox"