tor-browser

commit aec59658e8580dc1853de7d303c185799c0091bc
parent c1532e1f383ee8c7f09ea62693d71b5b17e64711
Author: Richard Pospesel <richard@torproject.org>
Date:   Wed, 20 Sep 2023 21:18:22 +0000

BB 41327: Disable UrlbarProviderInterventions

Diffstat:
M
browser/components/urlbar/UrlbarProvidersManager.sys.mjs
 | 
7
+------
M
browser/components/urlbar/UrlbarUtils.sys.mjs
 | 
10
+++++++---
M
browser/components/urlbar/moz.build
 | 
3
++-

3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/browser/components/urlbar/UrlbarProvidersManager.sys.mjs b/browser/components/urlbar/UrlbarProvidersManager.sys.mjs
@@ -104,12 +104,7 @@ var localProviderModules = [
       "moz-src:///browser/components/urlbar/UrlbarProviderInputHistory.sys.mjs",
     supportedInputTypes: ["urlbar"],
   },
-  {
-    name: "UrlbarProviderInterventions",
-    module:
-      "moz-src:///browser/components/urlbar/UrlbarProviderInterventions.sys.mjs",
-    supportedInputTypes: ["urlbar"],
-  },
+  // disable UrlbarProviderInterventions as part of tor-browser#41327
   {
     name: "UrlbarProviderOmnibox",
     module:
diff --git a/browser/components/urlbar/UrlbarUtils.sys.mjs b/browser/components/urlbar/UrlbarUtils.sys.mjs
@@ -1572,17 +1572,21 @@ export var UrlbarUtils = {
         return checkForSubType("tab", result);
       case this.RESULT_TYPE.TIP:
         if (result.providerName === "UrlbarProviderInterventions") {
+          // disable as part of tor-browser#41327
           switch (result.payload.type) {
             case lazy.UrlbarProviderInterventions.TIP_TYPE.CLEAR:
-              return "intervention_clear";
+            // return "intervention_clear";
+            // fall-through
             case lazy.UrlbarProviderInterventions.TIP_TYPE.REFRESH:
-              return "intervention_refresh";
+            // return "intervention_refresh";
+            // fall-through
             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";
+            // return "intervention_update";
+            // fall-through
             default:
               return "intervention_unknown";
           }
diff --git a/browser/components/urlbar/moz.build b/browser/components/urlbar/moz.build
@@ -33,7 +33,8 @@ MOZ_SRC_FILES += [
     "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",