tor-browser

commit 49ad4096e523851c3f84ce4647c6ef07a7d17dc8
parent 078b8c71d27f559f1d31814c072ae82e3ee4e0ec
Author: Cristina Horotan <chorotan@mozilla.com>
Date:   Wed,  1 Oct 2025 18:11:50 +0300

Revert "Bug 1990543 - Tab to search and contextual search actions should be available in the search bar re-implementation. r=daleharvey" for causing bc failures on browser_locationchange_urlbar_edit_dos.js

This reverts commit dc5e86c79bf3d6459e305be849dabbe56d5ca8da.

Diffstat:
M
browser/components/urlbar/ActionsProviderQuickActions.sys.mjs
 | 
3
+--
M
browser/components/urlbar/ActionsProviderTabGroups.sys.mjs
 | 
3
+--
M
browser/components/urlbar/UrlbarProviderGlobalActions.sys.mjs
 | 
15
+++++----------
M
browser/components/urlbar/UrlbarProviderInterventions.sys.mjs
 | 
5
++---
M
browser/components/urlbar/UrlbarProviderTabToSearch.sys.mjs
 | 
7
+++----
M
browser/components/urlbar/UrlbarProvidersManager.sys.mjs
 | 
4
++--
M
browser/components/urlbar/tests/unit/test_quickactions.js
 | 
9
++-------

7 files changed, 16 insertions(+), 30 deletions(-)
diff --git a/browser/components/urlbar/ActionsProviderQuickActions.sys.mjs b/browser/components/urlbar/ActionsProviderQuickActions.sys.mjs
@@ -43,9 +43,8 @@ class ProviderQuickActions extends ActionsProvider {
     return "ActionsProviderQuickActions";
   }
 
-  isActive(queryContext, controller) {
+  isActive(queryContext) {
     return (
-      controller.input.isAddressbar &&
       lazy.UrlbarPrefs.get(ENABLED_PREF) &&
       !queryContext.searchMode &&
       queryContext.trimmedSearchString.length < 50 &&
diff --git a/browser/components/urlbar/ActionsProviderTabGroups.sys.mjs b/browser/components/urlbar/ActionsProviderTabGroups.sys.mjs
@@ -26,9 +26,8 @@ class ProviderTabGroups extends ActionsProvider {
     return "ActionsProviderTabGroups";
   }
 
-  isActive(queryContext, controller) {
+  isActive(queryContext) {
     return (
-      controller.input.isAddressbar &&
       Services.prefs.getBoolPref("browser.tabs.groups.enabled") &&
       (!queryContext.restrictSource ||
         queryContext.restrictSource == lazy.UrlbarUtils.RESULT_SOURCE.TABS) &&
diff --git a/browser/components/urlbar/UrlbarProviderGlobalActions.sys.mjs b/browser/components/urlbar/UrlbarProviderGlobalActions.sys.mjs
@@ -57,16 +57,12 @@ export class UrlbarProviderGlobalActions extends UrlbarProvider {
     return UrlbarUtils.PROVIDER_TYPE.PROFILE;
   }
 
-  #controller;
-  async isActive(_queryContext, controller) {
-    let isActive =
+  async isActive() {
+    return (
       (lazy.UrlbarPrefs.get(SCOTCH_BONNET_PREF) ||
         lazy.UrlbarPrefs.get(ACTIONS_PREF)) &&
-      lazy.UrlbarPrefs.get(QUICK_ACTIONS_PREF);
-    if (isActive) {
-      this.#controller = controller;
-    }
-    return isActive;
+      lazy.UrlbarPrefs.get(QUICK_ACTIONS_PREF)
+    );
   }
 
   async startQuery(queryContext, addCallback) {
@@ -74,7 +70,7 @@ export class UrlbarProviderGlobalActions extends UrlbarProvider {
     let searchModeEngine = "";
 
     for (let provider of globalActionsProviders) {
-      if (provider.isActive(queryContext, this.#controller)) {
+      if (provider.isActive(queryContext)) {
         for (let action of (await provider.queryActions(queryContext)) || []) {
           if (action.engine && !searchModeEngine) {
             searchModeEngine = action.engine;
@@ -87,7 +83,6 @@ export class UrlbarProviderGlobalActions extends UrlbarProvider {
         }
       }
     }
-    this.#controller = null;
 
     if (!actionsResults.length) {
       return;
diff --git a/browser/components/urlbar/UrlbarProviderInterventions.sys.mjs b/browser/components/urlbar/UrlbarProviderInterventions.sys.mjs
@@ -481,9 +481,8 @@ export class UrlbarProviderInterventions extends UrlbarProvider {
    * with this provider, to save on resources.
    *
    * @param {UrlbarQueryContext} queryContext The query context object
-   * @param {UrlbarController} controller The current controller.
    */
-  async isActive(queryContext, controller) {
+  async isActive(queryContext) {
     if (
       !queryContext.searchString ||
       queryContext.searchString.length > UrlbarUtils.MAX_TEXT_LENGTH ||
@@ -494,7 +493,7 @@ export class UrlbarProviderInterventions extends UrlbarProvider {
       !Services.policies.isAllowed("urlbarinterventions") ||
       (await this.queryInstance
         .getProvider(lazy.UrlbarProviderGlobalActions.name)
-        ?.isActive(queryContext, controller))
+        ?.isActive())
     ) {
       return false;
     }
diff --git a/browser/components/urlbar/UrlbarProviderTabToSearch.sys.mjs b/browser/components/urlbar/UrlbarProviderTabToSearch.sys.mjs
@@ -123,9 +123,8 @@ export class UrlbarProviderTabToSearch extends UrlbarProvider {
    * with this provider, to save on resources.
    *
    * @param {UrlbarQueryContext} queryContext The query context object
-   * @param {UrlbarController} controller The current controller.
    */
-  async isActive(queryContext, controller) {
+  async isActive(queryContext) {
     return (
       queryContext.searchString &&
       queryContext.tokens.length == 1 &&
@@ -134,8 +133,8 @@ export class UrlbarProviderTabToSearch extends UrlbarProvider {
       !(
         (await this.queryInstance
           .getProvider(lazy.UrlbarProviderGlobalActions.name)
-          ?.isActive(queryContext, controller)) &&
-        lazy.ActionsProviderContextualSearch.isActive(queryContext, controller)
+          ?.isActive()) &&
+        lazy.ActionsProviderContextualSearch.isActive(queryContext)
       )
     );
   }
diff --git a/browser/components/urlbar/UrlbarProvidersManager.sys.mjs b/browser/components/urlbar/UrlbarProvidersManager.sys.mjs
@@ -52,7 +52,7 @@ var localProviderModules = [
     name: "UrlbarProviderGlobalActions",
     module:
       "moz-src:///browser/components/urlbar/UrlbarProviderGlobalActions.sys.mjs",
-    supportedInputTypes: ["urlbar", "searchbar"],
+    supportedInputTypes: ["urlbar"],
   },
   {
     name: "UrlbarProviderAliasEngines",
@@ -183,7 +183,7 @@ var localProviderModules = [
     name: "UrlbarProviderTabToSearch",
     module:
       "moz-src:///browser/components/urlbar/UrlbarProviderTabToSearch.sys.mjs",
-    supportedInputTypes: ["urlbar", "searchbar"],
+    supportedInputTypes: ["urlbar"],
   },
   {
     name: "UrlbarProviderTokenAliasEngines",
diff --git a/browser/components/urlbar/tests/unit/test_quickactions.js b/browser/components/urlbar/tests/unit/test_quickactions.js
@@ -90,12 +90,8 @@ add_task(async function minimum_search_string() {
     UrlbarPrefs.set("quickactions.minimumSearchString", minimumSearchString);
     for (let i = 1; i < 4; i++) {
       let context = createContext(searchString.substring(0, i), {});
-      let controller = UrlbarTestUtils.newMockController();
       let result = await ActionsProviderQuickActions.queryActions(context);
-      let isActive = await ActionsProviderQuickActions.isActive(
-        context,
-        controller
-      );
+      let isActive = await ActionsProviderQuickActions.isActive(context);
 
       if (i >= minimumSearchString) {
         Assert.equal(result[0].key, "newaction", "Matched the new action");
@@ -117,10 +113,9 @@ add_task(async function interventions_disabled() {
     getProvider: name => UrlbarProvidersManager.getProvider(name),
   };
   let context = createContext("test", { isPrivate: false });
-  let controller = UrlbarTestUtils.newMockController();
 
   Assert.ok(
-    !(await interventionsProvider.isActive(context, controller)),
+    !(await interventionsProvider.isActive(context)),
     "Urlbar interventions are disabled when actions are enabled"
   );
   interventionsProvider.queryInstance = null;