Verified Commit 7659147e authored by Alex Catarineu's avatar Alex Catarineu Committed by Pier Angelo Vendrame
Browse files

Bug 10760: Integrate TorButton to TorBrowser core 

Because of the non-restartless nature of Torbutton, it required
a two-stage installation process. On mobile, it was a problem,
because it was not loading when the user opened the browser for
the first time.

Moving it to tor-browser and making it a system extension allows it
to load when the user opens the browser for first time.

Additionally, this patch also fixes Bug 27611.

Bug 26321: New Circuit and New Identity menu items

Bug 14392: Make about:tor behave like other initial pages.

Bug 25013: Add torbutton as a tor-browser submodule

Bug 31575: Replace Firefox Home (newtab) with about:tor
parent 6b032630

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

+5 −0
Original line number Diff line number Diff line
@@ -59,6 +59,11 @@ 
      <toolbarbutton id="appMenu-new-identity"

                     class="subviewbutton"

                     key="new-identity-key"/>

      <toolbarbutton id="appMenuNewCircuit"

                     class="subviewbutton"

                     key="torbutton-new-circuit-key"

                     label="&torbutton.context_menu.new_circuit_sentence_case;"

                     oncommand="torbutton_new_circuit();"/>

      <toolbarseparator/>

      <toolbarbutton id="appMenu-bookmarks-button"

                     class="subviewbutton subviewbutton-nav"

browser/base/content/browser-doctype.inc

0 → 100644
+8 −0
Original line number Diff line number Diff line 
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >

%brandDTD;

<!ENTITY % torbuttonDTD SYSTEM "chrome://torbutton/locale/torbutton.dtd">

%torbuttonDTD;

<!ENTITY % aboutTorDTD SYSTEM "chrome://torbutton/locale/aboutTor.dtd">

%aboutTorDTD;

<!ENTITY % aboutDialogDTD SYSTEM "chrome://torbutton/locale/aboutDialog.dtd">

%aboutDialogDTD;

browser/base/content/browser-menubar.inc

+5 −0
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="torbutton-new-circuit-key"

                          label="&torbutton.context_menu.new_circuit;"

                          oncommand="torbutton_new_circuit();"/>

                <menuseparator/>

                <menuitem id="menu_openLocation"

                          hidden="true"

browser/base/content/browser-sets.inc

+1 −0
Original line number Diff line number Diff line
@@ -396,4 +396,5 @@ 
         internal="true"/>

#endif

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

    <key id="torbutton-new-circuit-key" modifiers="accel shift" key="L" oncommand="torbutton_new_circuit()"/>

  </keyset>

browser/base/content/browser.js

+1 −0
Original line number Diff line number Diff line
@@ -696,6 +696,7 @@ var gPageIcons = { 
};



var gInitialPages = [

  "about:tor",

  "about:blank",

  "about:home",

  "about:firefoxview",