henry pushed to branch mullvad-browser-140.1.0esr-15.0-1 at The Tor Project / Applications / Mullvad Browser Commits: f5000c1f by Henry Wilkes at 2025-08-05T16:34:57+01:00 dropme! fixup! MB 1: Mullvad Browser branding TB 43864: Move moz-support-link "preferences" patch out of mullvad-browser commits. The target commit no longer needs to modify moz-support-link.mjs since the changes were moved to base-browser. - - - - - 9ba2a7bf by Henry Wilkes at 2025-08-05T16:35:17+01:00 fixup! BB 42583: Modify moz-support-link for Base Browser. TB 43864: Move moz-support-link "preferences" patch to base-browser. - - - - - bf086fe6 by Henry Wilkes at 2025-08-05T16:35:18+01:00 fixup! MB 38: Mullvad Browser configuration TB 43864: Move to Mullvad Browser help URL to preferences. - - - - - 9fe4d6f4 by Henry Wilkes at 2025-08-05T16:35:19+01:00 BB 43864: Modify the urlbar for Base Browser. - - - - - 4 changed files: - browser/app/profile/000-mullvad-browser.js - browser/components/urlbar/QuickActionsLoaderDefault.sys.mjs - browser/components/urlbar/SearchModeSwitcher.sys.mjs - toolkit/content/widgets/moz-support-link/moz-support-link.mjs Changes: ===================================== browser/app/profile/000-mullvad-browser.js ===================================== @@ -2,6 +2,9 @@ pref("browser.startup.homepage", "about:mullvad-browser"); +// General browser support url. tor-browser#43864 and mullvad-browser#244. +pref("browser.base-browser-support-url", "https://mullvad.net/en/help/"); + // Do not show the bookmark panel for now, because it makes the initial browser // window (about:home) bigger, and regular pages will show letterbox margins as // a result. ===================================== browser/components/urlbar/QuickActionsLoaderDefault.sys.mjs ===================================== @@ -13,6 +13,7 @@ ChromeUtils.defineESModuleGetters(lazy, { 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"; @@ -78,6 +79,9 @@ const DEFAULT_ACTIONS = { 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"], @@ -100,6 +104,12 @@ const DEFAULT_ACTIONS = { .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"], @@ -112,13 +122,18 @@ const DEFAULT_ACTIONS = { 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: { @@ -128,6 +143,9 @@ const DEFAULT_ACTIONS = { 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"], @@ -311,6 +329,9 @@ export class QuickActionsLoaderDefault { 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 })) ); ===================================== browser/components/urlbar/SearchModeSwitcher.sys.mjs ===================================== @@ -413,6 +413,15 @@ export class SearchModeSwitcher { 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, ===================================== toolkit/content/widgets/moz-support-link/moz-support-link.mjs ===================================== @@ -125,11 +125,21 @@ export default class MozSupportLink extends HTMLAnchorElement { return; } let supportPage = this.getAttribute("support-page") ?? ""; - // Customize the link in about:preferences. - // See mullvad-browser#244 and tor-browser#41910. - if (supportPage === "preferences") { - this.href = "https://mullvad.net/en/help/"; - return; + // For base-browser we sometimes want to override firefox support links with + // our own. + // See tor-browser#40899. + switch (supportPage) { + case "preferences": + // Shown twice in preferences, both as `{ -brand-short-name } Support`. + // Instead of directing to support for preferences, we link to general + // tor browser support. + // See tor-browser#32092. + this.href = Services.prefs.getStringPref( + "browser.base-browser-support-url", + "" + ); + return; + // Fall through to support.mozilla.org } let base = MozSupportLink.SUPPORT_URL + supportPage; this.href = this.hasAttribute("utm-content") View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/6ed... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/6ed... You're receiving this email because of your account on gitlab.torproject.org.