Verified Commit 00cb6181 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 f0cc11ac

browser/base/content/aboutDialog.xhtml

+29 −11
Original line number Diff line number Diff line
@@ -7,6 +7,12 @@ 
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>

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

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

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



<!-- We need to include the localization DTDs until we migrate to Fluent -->

<!DOCTYPE window [

#include browser-doctype.inc

]>



<window xmlns:html="http://www.w3.org/1999/xhtml"

        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -22,7 +28,7 @@ 
        data-l10n-id="aboutDialog-title"

#endif

        role="dialog"

        aria-describedby="version distribution distributionId communityDesc contributeDesc trademark"

        aria-describedby="version distribution distributionId projectDesc helpDesc trademark trademarkTor"

        >

#ifdef XP_MACOSX

#include macWindow.inc.xhtml
@@ -140,24 +146,36 @@ 
              <label is="text-link" useoriginprincipal="true" href="about:credits" data-l10n-name="community-exp-creditsLink"/>

            </description>

          </vbox>

          <description class="text-blurb" id="communityDesc" data-l10n-id="community-2">

            <label is="text-link" href="https://www.mozilla.org/?utm_source=firefox-browser&#38;utm_medium=firefox-desktop&#38;utm_campaign=about-dialog" data-l10n-name="community-mozillaLink"/>

            <label is="text-link" useoriginprincipal="true" href="about:credits" data-l10n-name="community-creditsLink"/>

          <!-- Keep communityDesc and contributeDesc to avoid JS errors trying to hide them -->

          <description class="text-blurb" id="communityDesc" data-l10n-id="community-2" hidden="true"></description>

          <description class="text-blurb" id="contributeDesc" data-l10n-id="helpus" hidden="true"></description>

          <description class="text-blurb" id="projectDesc">

            &project.start;

            <label is="text-link" href="https://www.torproject.org/">

              &project.tpoLink;

            </label>&project.end;

          </description>

          <description class="text-blurb" id="contributeDesc" data-l10n-id="helpus">

            <label is="text-link" href="https://donate.mozilla.org/?utm_source=firefox&#38;utm_medium=referral&#38;utm_campaign=firefox_about&#38;utm_content=firefox_about" data-l10n-name="helpus-donateLink"/>

            <label is="text-link" href="https://www.mozilla.org/contribute/?utm_source=firefox-browser&#38;utm_medium=firefox-desktop&#38;utm_campaign=about-dialog" data-l10n-name="helpus-getInvolvedLink"/>

          <description class="text-blurb" id="helpDesc">

            &help.start;

            <label is="text-link" href="https://donate.torproject.org/">

              &help.donateLink;

            </label>

            &help.or;

            <label is="text-link" href="https://community.torproject.org/">

              &help.getInvolvedLink;

            </label>&help.end;

          </description>

        </vbox>

      </vbox>

    </hbox>

    <vbox id="bottomBox">

      <hbox pack="center">

        <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:license" data-l10n-id="bottomLinks-license"/>

        <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:rights" data-l10n-id="bottomLinks-rights"/>

        <label is="text-link" class="bottom-link" href="https://www.mozilla.org/privacy/?utm_source=firefox-browser&#38;utm_medium=firefox-desktop&#38;utm_campaign=about-dialog" data-l10n-id="bottomLinks-privacy"/>

      <hbox id="newBottom" pack="center" position="1">

        <label is="text-link" class="bottom-link" href="https://support.torproject.org/">&bottomLinks.questions;</label>

        <label is="text-link" class="bottom-link" href="https://community.torproject.org/relay/">&bottomLinks.grow;</label>

        <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:license">&bottomLinks.license;</label>

      </hbox>

      <description id="trademark" data-l10n-id="trademarkInfo"></description>

      <description id="trademarkTor">&tor.TrademarkStatement;</description>

    </vbox>

  </vbox>

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

+5 −0
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="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
@@ -389,4 +389,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>