richard pushed to branch base-browser-115.3.0esr-13.0-1 at The Tor Project / Applications / Tor Browser

Commits: baa05b03 by Richard Pospesel at 2023-09-21T20:10:02+00:00 Bug 41327: Disable UrlbarProviderInterventions

- - - - -

3 changed files:

- browser/components/urlbar/UrlbarProvidersManager.sys.mjs - browser/components/urlbar/UrlbarUtils.sys.mjs - browser/components/urlbar/moz.build

Changes:

===================================== browser/components/urlbar/UrlbarProvidersManager.sys.mjs ===================================== @@ -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 ===================================== @@ -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"; - } + 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 ===================================== @@ -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",

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/baa05b03...