forked from mirrors/gecko-dev
481ae95c00
This is a rollup of all the patches that have landed on the cedar project branch:891252fdd0Bug 1492475 - Part 1: Migrate most, if not all nsSearchService consumers to use async APIs. r=florian79b2eb2367Bug 1492475 - Part 2: Move nsIBrowserSearchService.idl to toolkit/components/search/nsISearchService.idl and update references. r=floriana947d3cdf0Bug 1492475 - Part 3: The search service init() method should simply return a Promise. r=florianc1e172dfacBug 1492475 - Part 4: Remove the synchronous initialization flow. r=floriancd41189eacBug 1492475 - Part 5: Since async initialization of the search service now is implicit behavior, remove the distinctive verbiage used internally. r=florian2ae7189dfaBug 1492475 - Part 6: Update the cache build task to work with an actual Promise and re-initialize only once at the same time - all to fix race conditions here. r=florianc8ee92973fBug 1492475 - Part 7: Make the region fetch not block the init flow, to ensure it's as fast as possible. r=florianc44e674e16Bug 1492475 - Part 8: Introduce an init flag, which can only be used privately, that allows to explicitly skip waiting for the region check process to complete. r=florian6c79eaf1d3Bug 1492475 - Part 9: Update unit tests to stop using 'currentEngine', in favor of 'defaultEngine'. r=Standard821b3aa17eeBug 1492475 - Part 10: Update unit tests to be fully aware of the new, async signatures of the search service API and remove sync init flow tests. r=mkaply,floriance5ba69019Bug 1492475 - Part 11: Repair incorrect usage of the `identifier` property of nsISearchEngine instances. r=florianfd177a7994Bug 1518543 - Fix up the Android (Fennec) nsISearchService shim to work with the new asynchronous API. r=florian3653d8ee22Bug 1523708 - Change the search service interaction in the show-heartbeat action to use the new async API. r=florian Differential Revision: https://phabricator.services.mozilla.com/D18355 --HG-- rename : netwerk/base/nsIBrowserSearchService.idl => toolkit/components/search/nsISearchService.idl extra : moz-landing-system : lando
47 lines
2.5 KiB
JavaScript
47 lines
2.5 KiB
JavaScript
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
"use strict";
|
|
|
|
const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
|
|
|
// List of sites we match against Topsites in order to identify sites
|
|
// that should be converted to search Topsites
|
|
const SEARCH_SHORTCUTS = [
|
|
{keyword: "@amazon", shortURL: "amazon", url: "https://amazon.com"},
|
|
{keyword: "@\u767E\u5EA6", shortURL: "baidu", url: "https://baidu.com"},
|
|
{keyword: "@google", shortURL: "google", url: "https://google.com"},
|
|
{keyword: "@\u044F\u043D\u0434\u0435\u043A\u0441", shortURL: "yandex", url: "https://yandex.com"},
|
|
];
|
|
this.SEARCH_SHORTCUTS = SEARCH_SHORTCUTS;
|
|
|
|
// These can be added via the editor but will not be added organically
|
|
this.CUSTOM_SEARCH_SHORTCUTS = [
|
|
...SEARCH_SHORTCUTS,
|
|
{keyword: "@bing", shortURL: "bing", url: "https://bing.com"},
|
|
{keyword: "@duckduckgo", shortURL: "duckduckgo", url: "https://duckduckgo.com"},
|
|
{keyword: "@ebay", shortURL: "ebay", url: "https://ebay.com"},
|
|
{keyword: "@twitter", shortURL: "twitter", url: "https://twitter.com"},
|
|
{keyword: "@wikipedia", shortURL: "wikipedia", url: "https://wikipedia.org"},
|
|
];
|
|
|
|
// Note: you must add the activity stream branch to the beginning of this if using outside activity stream
|
|
this.SEARCH_SHORTCUTS_EXPERIMENT = "improvesearch.topSiteSearchShortcuts";
|
|
this.SEARCH_SHORTCUTS_SEARCH_ENGINES_PREF = "improvesearch.topSiteSearchShortcuts.searchEngines";
|
|
this.SEARCH_SHORTCUTS_HAVE_PINNED_PREF = "improvesearch.topSiteSearchShortcuts.havePinned";
|
|
|
|
function getSearchProvider(candidateShortURL) {
|
|
return SEARCH_SHORTCUTS.filter(match => candidateShortURL === match.shortURL)[0] || null;
|
|
}
|
|
this.getSearchProvider = getSearchProvider;
|
|
|
|
// Check topsite against predefined list of valid search engines
|
|
// https://searchfox.org/mozilla-central/rev/ca869724246f4230b272ed1c8b9944596e80d920/toolkit/components/search/nsSearchService.js#939
|
|
async function checkHasSearchEngine(keyword) {
|
|
return (await Services.search.getDefaultEngines())
|
|
.find(e => e.wrappedJSObject._internalAliases.includes(keyword));
|
|
}
|
|
this.checkHasSearchEngine = checkHasSearchEngine;
|
|
|
|
const EXPORTED_SYMBOLS = ["checkHasSearchEngine", "getSearchProvider", "SEARCH_SHORTCUTS", "CUSTOM_SEARCH_SHORTCUTS", "SEARCH_SHORTCUTS_EXPERIMENT",
|
|
"SEARCH_SHORTCUTS_SEARCH_ENGINES_PREF", "SEARCH_SHORTCUTS_HAVE_PINNED_PREF"];
|