Commit 5bea8348 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃 Committed by richard
Browse files

fixup! Bug 10760: Integrate TorButton to TorBrowser core 

Remove part of the about:tor additions from the torbutton commit to
move them to a commit on their own.
parent 168a3899

browser/components/newtab/AboutNewTabService.jsm

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ class BaseAboutNewTabService { 
   * the newtab page has no effect on the result of this function.

   */

  get defaultURL() {

    return "about:tor";

    return "about:blank";

  }



  get welcomeURL() {

browser/components/preferences/home.inc.xhtml

+0 −2
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
                class="check-home-page-controlled"

                data-preference-related="browser.startup.homepage">

        <menupopup>

          <menuitem value="0" label="&aboutTor.title;" />

          <menuitem value="2" data-l10n-id="home-mode-choice-custom" />

          <menuitem value="1" data-l10n-id="home-mode-choice-blank" />

        </menupopup>
@@ -84,7 +83,6 @@ 
        Preferences so we need to handle setting the pref manually.-->

      <menulist id="newTabMode" flex="1" data-preference-related="browser.newtabpage.enabled">

        <menupopup>

          <menuitem value="0" label="&aboutTor.title;" />

          <menuitem value="1" data-l10n-id="home-mode-choice-blank" />

        </menupopup>

      </menulist>

browser/modules/HomePage.jsm

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ ChromeUtils.defineESModuleGetters(lazy, { 
});



const kPrefName = "browser.startup.homepage";

const kDefaultHomePage = "about:tor";

const kDefaultHomePage = "about:blank";

const kExtensionControllerPref =

  "browser.startup.homepage_override.extensionControlled";

const kHomePageIgnoreListId = "homepage-urls";

docshell/base/nsAboutRedirector.cpp

+1 −5
Original line number Diff line number Diff line
@@ -185,11 +185,7 @@ static const RedirEntry kRedirMap[] = { 
     nsIAboutModule::HIDE_FROM_ABOUTABOUT |

         nsIAboutModule::URI_CAN_LOAD_IN_CHILD |

         nsIAboutModule::URI_MUST_LOAD_IN_CHILD},

    {"crashgpu", "about:blank", nsIAboutModule::HIDE_FROM_ABOUTABOUT},

    {"tor", "chrome://torbutton/content/aboutTor/aboutTor.xhtml",

     nsIAboutModule::URI_MUST_LOAD_IN_CHILD |

         nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |

         nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI}};

    {"crashgpu", "about:blank", nsIAboutModule::HIDE_FROM_ABOUTABOUT}};

static const int kRedirTotal = mozilla::ArrayLength(kRedirMap);



NS_IMETHODIMP

docshell/build/components.conf

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ about_pages = [ 
    'support',

    'telemetry',

    'translations',

    'tor',

    'url-classifier',

    'webrtc',

]