Verified Commit 125b82ff authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

squash! Bug 31575: Disable Firefox Home (Activity Stream) 

Bug 40144: Redirect about:privatebrowsing to the user's home
parent 2cf5f3bf

browser/components/about/AboutRedirector.cpp

+3 −2
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static const RedirEntry kRedirMap[] = { 
         nsIAboutModule::HIDE_FROM_ABOUTABOUT},

    {"policies", "chrome://browser/content/policies/aboutPolicies.html",

     nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI},

    {"privatebrowsing", "chrome://browser/content/aboutPrivateBrowsing.html",

    {"privatebrowsing", "about:blank",

     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |

         nsIAboutModule::URI_MUST_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT |

         nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS},
@@ -193,7 +193,8 @@ AboutRedirector::NewChannel(nsIURI* aURI, nsILoadInfo* aLoadInfo, 
      // enabled about:newtab. Disabled about:newtab page uses fallback.

      if (path.EqualsLiteral("home") ||

          (StaticPrefs::browser_newtabpage_enabled() &&

           path.EqualsLiteral("newtab"))) {

           path.EqualsLiteral("newtab")) ||

          path.EqualsLiteral("privatebrowsing")) {

        nsCOMPtr<nsIAboutNewTabService> aboutNewTabService =

            do_GetService("@mozilla.org/browser/aboutnewtab-service;1", &rv);

        NS_ENSURE_SUCCESS(rv, rv);