BB 43864: Modify the urlbar for Base Browser. (edb72586) · Commits · The Tor Project / Applications / Tor Browser

browser/components/urlbar/QuickActionsLoaderDefault.sys.mjs

+38 −1

Changes for browser/components/urlbar/QuickActionsLoaderDefault.sys.mjs: 38 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
		ScreenshotsUtils:
		"moz-src:///browser/components/screenshots/ScreenshotsUtils.sys.mjs",
		TranslationsParent: "resource://gre/actors/TranslationsParent.sys.mjs",
		PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
		});

		import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs";
		@@ -82,6 +83,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"],
		@@ -105,6 +109,12 @@ const DEFAULT_ACTIONS = {
		.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"],
		@@ -117,13 +127,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: {
		@@ -133,6 +148,9 @@ const DEFAULT_ACTIONS = {
		onPick: (_queryContext, controller) => {
		controller.browserWindow.FirefoxViewHandler.openTab();
		},
		// Hide in base-browser since firefoxview is disabled.
		// tor-browser#43864 and tor-browser#42037.
		disabled: () => true,
		},
		inspect: {
		l10nCommands: ["quickactions-cmd-inspector2"],
		@@ -183,6 +201,10 @@ const DEFAULT_ACTIONS = {
		icon: "chrome://browser/skin/login.svg",
		label: "quickactions-logins2",
		onPick: openUrlFun("about:logins"),
		// Disabled in base browser since saved passwords is not well supported in
		// Tor Browser, and should be disabled in Mullvad Browser.
		// tor-browser#44177.
		disabled: () => true,
		},
		mute: {
		l10nCommands: ["quickactions-cmd-mute"],
		@@ -213,6 +235,10 @@ const DEFAULT_ACTIONS = {
		onPick: (_queryContext, controller) => {
		controller.browserWindow.OpenBrowserWindow({ private: true });
		},
		// Disable in permanent private browsing. tor-browser#44177.
		disabled: () => {
		return lazy.PrivateBrowsingUtils.permanentPrivateBrowsing;
		},
		},
		refresh: {
		l10nCommands: ["quickactions-cmd-refresh"],
		@@ -292,6 +318,12 @@ const DEFAULT_ACTIONS = {
		)
		);
		},
		// Remove the translate action. Bugzilla bug 1989252 means that the actions
		// still appears in the full list, despite isVisible being `false`. So we
		// explicitly remove it from the list instead. tor-browser#43864.
		disabled() {
		return !this.isVisible();
		},
		onPick: async (_queryContext, controller) => {
		await lazy.TranslationsParent.openAboutTranslationsPage({
		browserWindow: controller.browserWindow,
		@@ -331,6 +363,8 @@ const DEFAULT_ACTIONS = {
		icon: "chrome://global/skin/icons/experiments.svg",
		label: "quickactions-labs",
		onPick: openUrlFun("about:preferences#experimental"),
		// Disabled in base browser since labs is disabled. tor-browser#44883.
		disabled: () => true,
		},
		};

		@@ -385,6 +419,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/content/SearchModeSwitcher.mjs

+13 −3

Changes for browser/components/urlbar/content/SearchModeSwitcher.mjs: 13 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -457,10 +457,20 @@ export class SearchModeSwitcher {
		// search modes. Hence when the settings redesign is enabled we show
		// all local search modes regardless of the prefs.
		this.#engines = searchEngines.concat(
		lazy.UrlbarUtils.LOCAL_SEARCH_MODES.filter(
		engine =>
		lazy.UrlbarUtils.LOCAL_SEARCH_MODES.filter(engine => {
		// 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.
		if (
		engine.source === lazy.UrlbarUtils.RESULT_SOURCE.HISTORY &&
		lazy.PrivateBrowsingUtils.permanentPrivateBrowsing
		) {
		return false;
		}
		return (
		lazy.settingsRedesignEnabled \|\| lazy.UrlbarPrefs.get(engine.pref)
		)
		);
		})
		);
		}
		}