Commit 9514e0c6 authored by cypherpunks1's avatar cypherpunks1
Browse files

fixup! Bug 31740: Remove some unnecessary RemoteSettings instances

Disable activity stream
parent 56584b5d
Loading
Loading
Loading
Loading
+0 −31
Changes for browser/components/BrowserGlue.jsm: 0 added lines, 31 removed lines.
Original line number Diff line number Diff line
@@ -21,9 +21,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
  ActorManagerParent: "resource://gre/modules/ActorManagerParent.jsm",
  AddonManager: "resource://gre/modules/AddonManager.jsm",
  AppMenuNotifications: "resource://gre/modules/AppMenuNotifications.jsm",
  ASRouterDefaultConfig:
    "resource://activity-stream/lib/ASRouterDefaultConfig.jsm",
  ASRouterNewTabHook: "resource://activity-stream/lib/ASRouterNewTabHook.jsm",
  ASRouter: "resource://activity-stream/lib/ASRouter.jsm",
  AsyncShutdown: "resource://gre/modules/AsyncShutdown.jsm",
  BackgroundUpdate: "resource://gre/modules/BackgroundUpdate.jsm",
@@ -738,27 +735,6 @@ let JSWINDOWACTORS = {
    matches: ["about:studies*"],
  },

  ASRouter: {
    parent: {
      moduleURI: "resource:///actors/ASRouterParent.jsm",
    },
    child: {
      moduleURI: "resource:///actors/ASRouterChild.jsm",
      events: {
        // This is added so the actor instantiates immediately and makes
        // methods available to the page js on load.
        DOMDocElementInserted: {},
      },
    },
    matches: [
      "about:home*",
      "about:newtab*",
      "about:welcome*",
      "about:privatebrowsing",
    ],
    remoteTypes: ["privilegedabout"],
  },

  SwitchDocumentDirection: {
    child: {
      moduleURI: "resource:///actors/SwitchDocumentDirectionChild.jsm",
@@ -2058,7 +2034,6 @@ BrowserGlue.prototype = {
      () => NewTabUtils.uninit(),
      () => Normandy.uninit(),
      () => RFPHelper.uninit(),
      () => ASRouterNewTabHook.destroy(),
      () => UpdateListener.reset(),
      () => OnionAliasStore.uninit(),
    ];
@@ -2797,12 +2772,6 @@ BrowserGlue.prototype = {
        },
      },

      {
        task: () => {
          ASRouterNewTabHook.createInstance(ASRouterDefaultConfig());
        },
      },

      {
        condition: AppConstants.MOZ_UPDATE_AGENT,
        task: () => {