GitLab

at 2025-08-05T15:30:39+00:00

dropme! fixup! TB 42583: Modify moz-support-link for Tor Browser.

TB 43864: Move moz-support-link "preferences" patch out of tor-browser
commits.

Should be dropped at the next rebase.

fixup! BB 42583: Modify moz-support-link for Base Browser.

TB 43864: Move moz-support-link "preferences" patch to base-browser.

fixup! TB 40562: Added Tor Browser preferences to 000-tor-browser.js

TB 43864: Move to Tor Browser help URL to preferences.

BB 43864: Modify the urlbar for Base Browser.

 // Browser home page:

 pref("browser.startup.homepage", "about:tor");

+// General browser support url. tor-browser#43864 and tor-browser#40899.

+pref("browser.base-browser-support-url", "https://support.torproject.org/tbb");

+

 // tor-browser#40701: Add new download warning

 pref("browser.download.showTorWarning", true);

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

   ActionsProviderQuickActions:

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

+  PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",

 });

 import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs";

     icon: "chrome://mozapps/skin/extensions/category-extensions.svg",

     label: "quickactions-addons",

     onPick: openAddonsUrl("addons://discover/"),

+    // Hide in base-browser, since we don't want to open extensions

+    // "recommendations" tab. tor-browser#43864.

+    disabled: () => true,

   },

   bookmarks: {

     l10nCommands: ["quickactions-cmd-bookmarks", "quickactions-bookmarks2"],

         .document.getElementById("Tools:Sanitize")

         .doCommand();

     },

+    // Disable in permanent private browsing. tor-browser#43864.

+    // NOTE: This should also be disabled in private windows, but we don't have

+    // access to a Window element to check. See mozilla bug 1980912.

+    disabled: () => {

+      return lazy.PrivateBrowsingUtils.permanentPrivateBrowsing;

+    },

   },

   downloads: {

     l10nCommands: ["quickactions-cmd-downloads"],

     icon: "chrome://mozapps/skin/extensions/category-extensions.svg",

     label: "quickactions-extensions",

     onPick: openAddonsUrl("addons://list/extension"),

+    // Hide in base-browser since we do not want to encourage users to change

+    // their extensions/addons. tor-browser#43864.

+    disabled: () => true,

   },

   help: {

     l10nCommands: ["quickactions-cmd-help"],

     icon: "chrome://global/skin/icons/help.svg",

     label: "quickactions-help",

+    // Open the base-browser support/help page, rather than Firefox's.

+    // tor-browser#43864.

     onPick: openUrlFun(

-      "https://support.mozilla.org/products/firefox?as=u&utm_source=inproduct"

+      Services.prefs.getStringPref("browser.base-browser-support-url", "")

     ),

   },

   firefoxview: {

     onPick: () => {

       lazy.BrowserWindowTracker.getTopWindow().FirefoxViewHandler.openTab();

     },

+    // Hide in base-browser since firefoxview is disabled.

+    // tor-browser#43864 and tor-browser#42037.

+    disabled: () => true,

   },

   inspect: {

     l10nCommands: ["quickactions-cmd-inspector2"],

     let keys = Object.keys(DEFAULT_ACTIONS);

     for (const key of keys) {

       let actionData = DEFAULT_ACTIONS[key];

+      if (actionData.disabled?.()) {

+        continue;

+      }

       let messages = await lazy.gFluentStrings.formatMessages(

         actionData.l10nCommands.map(id => ({ id }))

       );

       if (!lazy.UrlbarPrefs.get(pref)) {

         continue;

       }

+      if (

+        source === lazy.UrlbarUtils.RESULT_SOURCE.HISTORY &&

+        lazy.PrivateBrowsingUtils.permanentPrivateBrowsing

+      ) {

+        // Do not show the search history option in PBM. tor-browser#43864.

+        // Although, it can still be triggered with "^" restrict keyword or

+        // through an app menu item. See also mozilla bug 1980928.

+        continue;

+      }

       let name = lazy.UrlbarUtils.getResultSourceName(source);

       let { icon } = await this.#getDisplayedEngineDetails({

         source,

       return;

     }

     let supportPage = this.getAttribute("support-page") ?? "";

-    // For tor-browser we sometimes want to override firefox support links with

+    // For base-browser we sometimes want to override firefox support links with

     // our own.

     // See tor-browser#40899.

     switch (supportPage) {

         // Instead of directing to support for preferences, we link to general

         // tor browser support.

         // See tor-browser#32092.

-        this.href = "https://support.torproject.org/tbb";

+        this.href = Services.prefs.getStringPref(

+          "browser.base-browser-support-url",

+          ""

+        );

         return;

       // Fall through to support.mozilla.org

     }

henry pushed to branch tor-browser-140.1.0esr-15.0-1 at The Tor Project / Applications / Tor Browser

Commits:

4 changed files:

Changes: