Commit a86dc80e authored by Richard Pospesel's avatar Richard Pospesel Committed by Pier Angelo Vendrame
Browse files

Bug 41327: Disable UrlbarProviderInterventions

parent b9b061ef

browser/components/urlbar/UrlbarProvidersManager.sys.mjs

+3 −2
Original line number Diff line number Diff line
@@ -51,8 +51,9 @@ var localProviderModules = { 
    "resource:///modules/UrlbarProviderHistoryUrlHeuristic.sys.mjs",

  UrlbarProviderInputHistory:

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

  UrlbarProviderInterventions:

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

  // disable as part of tor-browser#41327

  // UrlbarProviderInterventions:

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

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

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

  UrlbarProviderPreloadedSites:

browser/components/urlbar/UrlbarUtils.sys.mjs

+19 −16
Original line number Diff line number Diff line
@@ -21,8 +21,9 @@ ChromeUtils.defineESModuleGetters(lazy, { 
  SearchSuggestionController:

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

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

  UrlbarProviderInterventions:

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

  // disable as part of tor-browser#41327

  // UrlbarProviderInterventions:

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

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

  UrlbarProviderSearchTips:

    "resource:///modules/UrlbarProviderSearchTips.sys.mjs",
@@ -1387,20 +1388,22 @@ export var UrlbarUtils = { 
        return "tab";

      case UrlbarUtils.RESULT_TYPE.TIP:

        if (result.providerName === "UrlbarProviderInterventions") {

          switch (result.payload.type) {

            case lazy.UrlbarProviderInterventions.TIP_TYPE.CLEAR:

              return "intervention_clear";

            case lazy.UrlbarProviderInterventions.TIP_TYPE.REFRESH:

              return "intervention_refresh";

            case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_ASK:

            case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_CHECKING:

            case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_REFRESH:

            case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_RESTART:

            case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_WEB:

              return "intervention_update";

            default:

          return "intervention_unknown";

          }

        // disable as part of tor-browser#41327

        //   switch (result.payload.type) {

        //     case lazy.UrlbarProviderInterventions.TIP_TYPE.CLEAR:

        //       return "intervention_clear";

        //     case lazy.UrlbarProviderInterventions.TIP_TYPE.REFRESH:

        //       return "intervention_refresh";

        //     case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_ASK:

        //     case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_CHECKING:

        //     case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_REFRESH:

        //     case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_RESTART:

        //     case lazy.UrlbarProviderInterventions.TIP_TYPE.UPDATE_WEB:

        //       return "intervention_update";

        //     default:

        //       return "intervention_unknown";

        //   }

        }



        switch (result.payload.type) {

browser/components/urlbar/moz.build

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ EXTRA_JS_MODULES += [ 
    "UrlbarProviderHeuristicFallback.sys.mjs",

    "UrlbarProviderHistoryUrlHeuristic.sys.mjs",

    "UrlbarProviderInputHistory.sys.mjs",

    "UrlbarProviderInterventions.sys.mjs",

    # disable as part of tor-browser#41327

    # "UrlbarProviderInterventions.sys.mjs",

    "UrlbarProviderOmnibox.sys.mjs",

    "UrlbarProviderOpenTabs.sys.mjs",

    "UrlbarProviderPlaces.sys.mjs",