Commit 1cf6d4d8 authored by henry's avatar henry Committed by Pier Angelo Vendrame
Browse files

Bug 31575: Disable Firefox Home (Activity Stream) 

Treat about:blank as the default home page and new tab page.

Avoid loading AboutNewTab in BrowserGlue.sys.mjs in order
to avoid several network requests that we do not need.

Bug 41624: Disable about:pocket-* pages.

Bug 40144: Redirect about:privatebrowsing to the user's home
parent 14e65118

browser/base/content/browser.js

+0 −3
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ ChromeUtils.defineESModuleGetters(this, { 
  ReportBrokenSite: "resource:///modules/ReportBrokenSite.sys.mjs",

  SafeBrowsing: "resource://gre/modules/SafeBrowsing.sys.mjs",

  Sanitizer: "resource:///modules/Sanitizer.sys.mjs",

  SaveToPocket: "chrome://pocket/content/SaveToPocket.sys.mjs",

  ScreenshotsUtils: "resource:///modules/ScreenshotsUtils.sys.mjs",

  SearchUIUtils: "resource:///modules/SearchUIUtils.sys.mjs",

  SessionStartup: "resource:///modules/sessionstore/SessionStartup.sys.mjs",
@@ -3634,8 +3633,6 @@ var XULBrowserWindow = { 


    SafeBrowsingNotificationBox.onLocationChange(aLocationURI);



    SaveToPocket.onLocationChange(window);



    let originalURI;

    if (aRequest instanceof Ci.nsIChannel) {

      originalURI = aRequest.originalURI;

browser/base/content/browser.js.globals

+0 −1
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ 
  "ReportBrokenSite",

  "SafeBrowsing",

  "Sanitizer",

  "SaveToPocket",

  "ScreenshotsUtils",

  "SearchUIUtils",

  "SessionStartup",

browser/components/BrowserGlue.sys.mjs

+2 −91
Original line number Diff line number Diff line
@@ -8,12 +8,8 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; 
const lazy = {};



ChromeUtils.defineESModuleGetters(lazy, {

  AboutNewTab: "resource:///modules/AboutNewTab.sys.mjs",

  AWToolbarButton: "resource:///modules/aboutwelcome/AWToolbarUtils.sys.mjs",

  ASRouter: "resource:///modules/asrouter/ASRouter.sys.mjs",

  ASRouterDefaultConfig:

    "resource:///modules/asrouter/ASRouterDefaultConfig.sys.mjs",

  ASRouterNewTabHook: "resource:///modules/asrouter/ASRouterNewTabHook.sys.mjs",

  ActorManagerParent: "resource://gre/modules/ActorManagerParent.sys.mjs",

  AddonManager: "resource://gre/modules/AddonManager.sys.mjs",

  AppMenuNotifications: "resource://gre/modules/AppMenuNotifications.sys.mjs",
@@ -83,7 +79,6 @@ ChromeUtils.defineESModuleGetters(lazy, { 
  SafeBrowsing: "resource://gre/modules/SafeBrowsing.sys.mjs",

  Sanitizer: "resource:///modules/Sanitizer.sys.mjs",

  SandboxUtils: "resource://gre/modules/SandboxUtils.sys.mjs",

  SaveToPocket: "chrome://pocket/content/SaveToPocket.sys.mjs",

  ScreenshotsUtils: "resource:///modules/ScreenshotsUtils.sys.mjs",

  SearchSERPCategorization: "resource:///modules/SearchSERPTelemetry.sys.mjs",

  SearchSERPTelemetry: "resource:///modules/SearchSERPTelemetry.sys.mjs",
@@ -453,52 +448,6 @@ let JSWINDOWACTORS = { 
    matches: ["about:messagepreview", "about:messagepreview?*"],

  },



  AboutNewTab: {

    parent: {

      esModuleURI: "resource:///actors/AboutNewTabParent.sys.mjs",

    },

    child: {

      esModuleURI: "resource:///actors/AboutNewTabChild.sys.mjs",

      events: {

        DOMDocElementInserted: {},

        DOMContentLoaded: {},

        load: { capture: true },

        unload: { capture: true },

        pageshow: {},

        visibilitychange: {},

      },

    },

    // The wildcard on about:newtab is for the # parameter

    // that is used for the newtab devtools. The wildcard for about:home

    // is similar, and also allows for falling back to loading the

    // about:home document dynamically if an attempt is made to load

    // about:home?jscache from the AboutHomeStartupCache as a top-level

    // load.

    matches: ["about:home*", "about:welcome", "about:newtab*"],

    remoteTypes: ["privilegedabout"],

  },



  AboutPocket: {

    parent: {

      esModuleURI: "resource:///actors/AboutPocketParent.sys.mjs",

    },

    child: {

      esModuleURI: "resource:///actors/AboutPocketChild.sys.mjs",



      events: {

        DOMDocElementInserted: { capture: true },

      },

    },



    remoteTypes: ["privilegedabout"],

    matches: [

      "about:pocket-saved*",

      "about:pocket-signup*",

      "about:pocket-home*",

      "about:pocket-style-guide*",

    ],

  },



  AboutPrivateBrowsing: {

    parent: {

      esModuleURI: "resource:///actors/AboutPrivateBrowsingParent.sys.mjs",
@@ -973,28 +922,6 @@ let JSWINDOWACTORS = { 
    allFrames: true,

  },



  ASRouter: {

    parent: {

      esModuleURI: "resource:///actors/ASRouterParent.sys.mjs",

    },

    child: {

      esModuleURI: "resource:///actors/ASRouterChild.sys.mjs",

      events: {

        // This is added so the actor instantiates immediately and makes

        // methods available to the page js on load.

        DOMDocElementInserted: {},

      },

    },

    matches: [

      "about:asrouter*",

      "about:home*",

      "about:newtab*",

      "about:welcome*",

      "about:privatebrowsing*",

    ],

    remoteTypes: ["privilegedabout"],

  },



  SwitchDocumentDirection: {

    child: {

      esModuleURI: "resource:///actors/SwitchDocumentDirectionChild.sys.mjs",
@@ -1629,8 +1556,6 @@ BrowserGlue.prototype = { 
      lazy.Normandy.init();

    }



    lazy.SaveToPocket.init();



    lazy.ResetPBMPanel.init();



    AboutHomeStartupCache.init();
@@ -1975,8 +1900,6 @@ BrowserGlue.prototype = { 


  // the first browser window has finished initializing

  _onFirstWindowLoaded: function BG__onFirstWindowLoaded(aWindow) {

    lazy.AboutNewTab.init();



    lazy.TabCrashHandler.init();



    lazy.ProcessHangMonitor.init();
@@ -2346,7 +2269,6 @@ BrowserGlue.prototype = { 
        }

      },

      () => lazy.RFPHelper.uninit(),

      () => lazy.ASRouterNewTabHook.destroy(),

      () => {

        if (AppConstants.MOZ_UPDATER) {

          lazy.UpdateListener.reset();
@@ -3215,13 +3137,6 @@ BrowserGlue.prototype = { 
        },

      },



      {

        name: "ASRouterNewTabHook.createInstance",

        task: () => {

          lazy.ASRouterNewTabHook.createInstance(lazy.ASRouterDefaultConfig());

        },

      },



      {

        name: "BackgroundUpdate",

        condition: AppConstants.MOZ_UPDATE_AGENT,
@@ -6354,12 +6269,8 @@ export var AboutHomeStartupCache = { 
      return { pageInputStream: null, scriptInputStream: null };

    }



    let state = lazy.AboutNewTab.activityStream.store.getState();

    return new Promise(resolve => {

      this._cacheDeferred = resolve;

      this.log.trace("Parent is requesting cache streams.");

      this._procManager.sendAsyncMessage(this.CACHE_REQUEST_MESSAGE, { state });

    });

    this.log.error("Activity Stream is disabled.");

    return { pageInputStream: null, scriptInputStream: null };

  },



  /**

browser/components/about/AboutRedirector.cpp

+5 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static const RedirEntry kRedirMap[] = { 
         nsIAboutModule::IS_SECURE_CHROME_UI},

    {"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},
@@ -115,6 +115,7 @@ static const RedirEntry kRedirMap[] = { 
     nsIAboutModule::URI_MUST_LOAD_IN_CHILD |

         nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |

         nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT},

#ifndef BASE_BROWSER_VERSION

    {"pocket-saved", "chrome://pocket/content/panels/saved.html",

     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |

         nsIAboutModule::URI_MUST_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT |
@@ -135,6 +136,7 @@ static const RedirEntry kRedirMap[] = { 
         nsIAboutModule::URI_MUST_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT |

         nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS |

         nsIAboutModule::HIDE_FROM_ABOUTABOUT},

#endif

    {"settings", "chrome://browser/content/preferences/preferences.xhtml",

     nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI |

         nsIAboutModule::HIDE_FROM_ABOUTABOUT},
@@ -207,7 +209,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);

browser/components/about/components.conf

+0 −4
Original line number Diff line number Diff line
@@ -15,10 +15,6 @@ pages = [ 
    'loginsimportreport',

    'messagepreview',

    'newtab',

    'pocket-home',

    'pocket-saved',

    'pocket-signup',

    'pocket-style-guide',

    'policies',

    'preferences',

    'privatebrowsing',