Commit 972c9b60 authored by Alex Catarineu's avatar Alex Catarineu Committed by Matthew Finkel
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
parent afca99f9

.gitmodules

0 → 100644
+3 −0
Original line number Diff line number Diff line 
[submodule "toolkit/torproject/torbutton"]

	path = toolkit/torproject/torbutton

	url = https://git.torproject.org/torbutton.git

browser/base/content/aboutDialog.xhtml

+25 −13
Original line number Diff line number Diff line
@@ -7,11 +7,11 @@ 
<?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 [

#ifdef XP_MACOSX

#include browser-doctype.inc

#endif

]>



<window xmlns:html="http://www.w3.org/1999/xhtml"
@@ -28,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
@@ -132,24 +132,36 @@ 
              <label is="text-link" useoriginprincipal="true" href="about:credits" data-l10n-name="community-exp-creditsLink"></label>

            </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>

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

          <!-- 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>

            <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"></label>

          <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>

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

        <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"></label>

      <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/browser-doctype.inc

+6 −0
Original line number Diff line number Diff line
@@ -14,3 +14,9 @@ 
%syncBrandDTD;

<!ENTITY % brandingsDTD SYSTEM "chrome://browser/locale/brandings.dtd">

%brandingsDTD;

<!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

+36 −13
Original line number Diff line number Diff line
@@ -34,6 +34,18 @@ 
                          command="Tools:NonFissionWindow"

                          accesskey="s" label="New Non-Fission Window"/>

#endif

                <menuseparator/>

                <menuitem id="menu_newIdentity"

                          accesskey="&torbutton.context_menu.new_identity_key;"

                          key="torbutton-new-identity-key"

                          label="&torbutton.context_menu.new_identity;"

                          oncommand="torbutton_new_identity();"/>

                <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"

                          command="Browser:OpenLocation"
@@ -465,17 +477,28 @@ 
#endif

                   data-l10n-id="menu-help">

              <menupopup id="menu_HelpPopup" onpopupshowing="buildHelpMenu();">

                <menuitem id="menu_openHelp"

                <!-- dummy elements to avoid 'getElementById' errors -->

                <box id="feedbackPage"/>

                <box id="helpSafeMode"/>

                <box id="menu_HelpPopup_reportPhishingtoolmenu"/>

                <box id="menu_HelpPopup_reportPhishingErrortoolmenu"/>

                <!-- Add Tor Browser manual link -->

                <menuitem id="torBrowserUserManual"

                          oncommand="gBrowser.selectedTab = gBrowser.addTab('https://tb-manual.torproject.org/' + Services.locale.requestedLocale, {triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal()});"

                          label="&aboutTor.torbrowser_user_manual.label;"

                          accesskey="&aboutTor.torbrowser_user_manual.accesskey;"/>

                <!-- Bug 18905: Hide unused help menu items -->

                <!-- <menuitem id="menu_openHelp"

                          oncommand="openHelpLink('firefox-help')"

                          onclick="checkForMiddleClick(this, event);"

                          data-l10n-id="menu-help-product"

#ifdef XP_MACOSX

                          key="key_openHelpMac"/>

                          key="key_openHelpMac"/> -->

#else

                          />

                          /> -->

#endif

                <menuitem id="menu_openTour"

                          oncommand="openTourPage();" data-l10n-id="menu-help-show-tour"/>

                <!-- <menuitem id="menu_openTour"

                          oncommand="openTourPage();" data-l10n-id="menu-help-show-tour"/> -->

                <menuitem id="help_importFromAnotherBrowser"

                          command="cmd_help_importFromAnotherBrowser" data-l10n-id="menu-help-import-from-another-browser"/>

                <menuitem id="menu_keyboardShortcuts"
@@ -484,22 +507,22 @@ 
                <menuitem id="troubleShooting"

                          oncommand="openTroubleshootingPage()"

                          onclick="checkForMiddleClick(this, event);" data-l10n-id="menu-help-troubleshooting-info"/>

                <menuitem id="feedbackPage"

                <!-- <menuitem id="feedbackPage"

                          oncommand="openFeedbackPage()"

                          onclick="checkForMiddleClick(this, event);" data-l10n-id="menu-help-feedback-page"/>

                <menuitem id="helpSafeMode"

                          oncommand="safeModeRestart();" data-l10n-id="menu-help-safe-mode-without-addons"/>

                <menuitem id="menu_HelpPopup_reportPhishingtoolmenu"

                          onclick="checkForMiddleClick(this, event);" data-l10n-id="menu-help-feedback-page"/> -->

                <!-- <menuitem id="helpSafeMode"

                          oncommand="safeModeRestart();" data-l10n-id="menu-help-safe-mode-without-addons"/> -->

                <!-- <menuitem id="menu_HelpPopup_reportPhishingtoolmenu"

                          disabled="true"

                          oncommand="openUILink(gSafeBrowsing.getReportURL('Phish'), event, {triggeringPrincipal: Services.scriptSecurityManager.createNullPrincipal({})});"

                          onclick="checkForMiddleClick(this, event);"

                          hidden="true" data-l10n-id="menu-help-report-deceptive-site"/>

                <menuitem id="menu_HelpPopup_reportPhishingErrortoolmenu"

                          hidden="true" data-l10n-id="menu-help-report-deceptive-site"/> -->

                <!-- <menuitem id="menu_HelpPopup_reportPhishingErrortoolmenu"

                          disabled="true"

                          oncommand="ReportFalseDeceptiveSite();"

                          onclick="checkForMiddleClick(this, event);"

                          data-l10n-id="menu-help-not-deceptive"

                          hidden="true"/>

                          hidden="true"/> -->

                <menuseparator id="helpPolicySeparator"

                          hidden="true"/>

                <menuitem id="helpPolicySupport"

browser/base/content/browser-sets.inc

+2 −0
Original line number Diff line number Diff line
@@ -385,4 +385,6 @@ 
         data-l10n-id="hide-other-apps-shortcut"

         modifiers="accel,alt"/>

#endif

    <key id="torbutton-new-identity-key" modifiers="accel shift" key="U" oncommand="torbutton_new_identity()"/>

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

  </keyset>