Pier Angelo Vendrame pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 2404a7c1 by Pier Angelo Vendrame at 2025-09-08T11:39:58+02:00 dropme! TB 42891: Set the bundled search engine for Tor Browser. BB 43525: Skip Remote Settings for search engine customization. Undo some changes to this commit, as they need to be moved to Base Browser. - - - - - 10cd8e31 by Pier Angelo Vendrame at 2025-09-08T11:39:58+02:00 BB 43525: Skip Remote Settings for search engine customization. Also, add some bundled search engines. - - - - - d28d9f49 by Pier Angelo Vendrame at 2025-09-08T11:39:59+02:00 amend! TB 42891: Set the bundled search engine for Tor Browser. TB 42891: Set the bundled search engine for Tor Browser. - - - - - 4 changed files: - toolkit/components/search/AppProvidedSearchEngine.sys.mjs - toolkit/components/search/SearchEngineSelector.sys.mjs - toolkit/components/search/content/torBrowserSearchEngineIcons.json → toolkit/components/search/content/base-browser-search-engine-icons.json - toolkit/components/search/content/torBrowserSearchEngines.json → toolkit/components/search/content/base-browser-search-engines.json Changes: ===================================== toolkit/components/search/AppProvidedSearchEngine.sys.mjs ===================================== @@ -116,8 +116,10 @@ class IconHandler { await this.#buildIconMap(); } - return this.#iconMap.get(engineIdentifier); - // eslint-disable-next-line no-unreachable + if (AppConstants.BASE_BROWSER_VERSION) { + return this.#iconMap.get(engineIdentifier); + } + let iconList = this.#iconMap.get(this.getKey(engineIdentifier)) || []; return iconList.filter(r => this.#identifierMatches(engineIdentifier, r.engineIdentifiers) @@ -223,7 +225,7 @@ class IconHandler { Object.entries( await ( await fetch( - "chrome://global/content/search/torBrowserSearchEngineIcons.json" + "chrome://global/content/search/base-browser-search-engine-icons.json" ) ).json() ) ===================================== toolkit/components/search/SearchEngineSelector.sys.mjs ===================================== @@ -97,7 +97,9 @@ export class SearchEngineSelector { let { promise, resolve } = Promise.withResolvers(); this._getConfigurationPromise = promise; this._configuration = await ( - await fetch("chrome://global/content/search/torBrowserSearchEngines.json") + await fetch( + "chrome://global/content/search/base-browser-search-engines.json" + ) ).json(); this._configurationOverrides = []; resolve(this._configuration); ===================================== toolkit/components/search/content/torBrowserSearchEngineIcons.json → toolkit/components/search/content/base-browser-search-engine-icons.json ===================================== @@ -1,15 +1,9 @@ { "ddg": [ - { - "url": "chrome://global/content/search/duckduckgo.ico", - "imageSize": 32 - } + { "url": "chrome://global/content/search/duckduckgo.ico", "imageSize": 32 } ], "ddg-onion": [ - { - "url": "chrome://global/content/search/duckduckgo.ico", - "imageSize": 32 - } + { "url": "chrome://global/content/search/duckduckgo.ico", "imageSize": 32 } ], "startpage": [ { @@ -32,9 +26,6 @@ } ], "wikipedia": [ - { - "url": "chrome://global/content/search/wikipedia.ico", - "imageSize": 32 - } + { "url": "chrome://global/content/search/wikipedia.ico", "imageSize": 32 } ] } ===================================== toolkit/components/search/content/torBrowserSearchEngines.json → toolkit/components/search/content/base-browser-search-engines.json ===================================== @@ -15,13 +15,7 @@ "id": "04e99a38-13ee-47d8-8aa4-64482b3dea99", "identifier": "ddg", "recordType": "engine", - "variants": [ - { - "environment": { - "allRegionsAndLocales": true - } - } - ] + "variants": [{ "environment": { "allRegionsAndLocales": true } }] }, { "base": { @@ -39,13 +33,7 @@ "id": "1e431da4-a60c-4411-9251-a95a841d451f", "identifier": "ddg-onion", "recordType": "engine", - "variants": [ - { - "environment": { - "allRegionsAndLocales": true - } - } - ] + "variants": [{ "environment": { "allRegionsAndLocales": true } }] }, { "base": { @@ -63,13 +51,7 @@ "id": "927bbd9f-b2f3-48b4-8974-1c1148028f4d", "identifier": "startpage", "recordType": "engine", - "variants": [ - { - "environment": { - "allRegionsAndLocales": true - } - } - ] + "variants": [{ "environment": { "allRegionsAndLocales": true } }] }, { "base": { @@ -87,13 +69,7 @@ "id": "e7eaba8d-6b9e-43fb-a799-b01b096c03ff", "identifier": "startpage-onion", "recordType": "engine", - "variants": [ - { - "environment": { - "allRegionsAndLocales": true - } - } - ] + "variants": [{ "environment": { "allRegionsAndLocales": true } }] }, { "base": { @@ -111,13 +87,7 @@ "id": "7f6d23c2-191e-483e-af3a-ce6451e3a8dd", "identifier": "wikipedia", "recordType": "engine", - "variants": [ - { - "environment": { - "allRegionsAndLocales": true - } - } - ] + "variants": [{ "environment": { "allRegionsAndLocales": true } }] }, { "recordType": "defaultEngines", View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/d244ff5... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/d244ff5... You're receiving this email because of your account on gitlab.torproject.org.