5f4b628014
This makes two major changes: Split `AdmWikipedia` into `AmpSuggestions` and `OfflineWikipediaSuggestions`. I included "offline" in the name because Merino also serves Wikipedia suggestions, but they're the so-called "dynamic Wikipedia" suggestions served from Elasticsearch, and they have never been managed by a `BaseFeature`/`SuggestFeature` in Firefox. Send the `quick-suggest` ping only for AMP suggestions, in `AmpSuggestions`. Stop sending it for offline Wikipedia suggestions. @bholley and I discussed this on the data-review@mozilla.com list after I emailed it for the senstive data review in D233752 [1]. We only use the ping for AMP suggestions, and Wikipedia telemetry should follow the usual data opt-out. @nanj agreed the ping isn't necessary for Wikipedia. [1] https://groups.google.com/a/mozilla.com/g/data-review/c/BC2JKaXA7nA Depends on D234440 Differential Revision: https://phabricator.services.mozilla.com/D234449
108 lines
3.7 KiB
Plaintext
108 lines
3.7 KiB
Plaintext
# 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/.
|
|
|
|
with Files("**"):
|
|
BUG_COMPONENT = ("Firefox", "Address Bar")
|
|
|
|
JAR_MANIFESTS += ["jar.mn"]
|
|
|
|
DIRS += [
|
|
"unitconverters",
|
|
]
|
|
|
|
EXTRA_JS_MODULES += [
|
|
"ActionsProvider.sys.mjs",
|
|
"ActionsProviderContextualSearch.sys.mjs",
|
|
"ActionsProviderQuickActions.sys.mjs",
|
|
"ActionsProviderTabGroups.sys.mjs",
|
|
"MerinoClient.sys.mjs",
|
|
"QuickActionsLoaderDefault.sys.mjs",
|
|
"QuickSuggest.sys.mjs",
|
|
"SearchModeSwitcher.sys.mjs",
|
|
"UrlbarController.sys.mjs",
|
|
"UrlbarEventBufferer.sys.mjs",
|
|
"UrlbarInput.sys.mjs",
|
|
"UrlbarMuxerUnifiedComplete.sys.mjs",
|
|
"UrlbarPrefs.sys.mjs",
|
|
"UrlbarProviderAboutPages.sys.mjs",
|
|
"UrlbarProviderActionsSearchMode.sys.mjs",
|
|
"UrlbarProviderAliasEngines.sys.mjs",
|
|
"UrlbarProviderAutofill.sys.mjs",
|
|
"UrlbarProviderBookmarkKeywords.sys.mjs",
|
|
"UrlbarProviderCalculator.sys.mjs",
|
|
"UrlbarProviderClipboard.sys.mjs",
|
|
"UrlbarProviderGlobalActions.sys.mjs",
|
|
"UrlbarProviderHeuristicFallback.sys.mjs",
|
|
"UrlbarProviderHistoryUrlHeuristic.sys.mjs",
|
|
"UrlbarProviderInputHistory.sys.mjs",
|
|
"UrlbarProviderInterventions.sys.mjs",
|
|
"UrlbarProviderOmnibox.sys.mjs",
|
|
"UrlbarProviderOpenTabs.sys.mjs",
|
|
"UrlbarProviderPlaces.sys.mjs",
|
|
"UrlbarProviderPrivateSearch.sys.mjs",
|
|
"UrlbarProviderQuickSuggest.sys.mjs",
|
|
"UrlbarProviderQuickSuggestContextualOptIn.sys.mjs",
|
|
"UrlbarProviderRecentSearches.sys.mjs",
|
|
"UrlbarProviderRemoteTabs.sys.mjs",
|
|
"UrlbarProviderRestrictKeywords.sys.mjs",
|
|
"UrlbarProviderRestrictKeywordsAutofill.sys.mjs",
|
|
"UrlbarProviderSearchSuggestions.sys.mjs",
|
|
"UrlbarProviderSearchTips.sys.mjs",
|
|
"UrlbarProvidersManager.sys.mjs",
|
|
"UrlbarProviderTabToSearch.sys.mjs",
|
|
"UrlbarProviderTokenAliasEngines.sys.mjs",
|
|
"UrlbarProviderTopSites.sys.mjs",
|
|
"UrlbarProviderUnitConversion.sys.mjs",
|
|
"UrlbarResult.sys.mjs",
|
|
"UrlbarSearchOneOffs.sys.mjs",
|
|
"UrlbarSearchTermsPersistence.sys.mjs",
|
|
"UrlbarSearchUtils.sys.mjs",
|
|
"UrlbarTokenizer.sys.mjs",
|
|
"UrlbarUtils.sys.mjs",
|
|
"UrlbarValueFormatter.sys.mjs",
|
|
"UrlbarView.sys.mjs",
|
|
]
|
|
|
|
EXTRA_JS_MODULES["urlbar/private"] += [
|
|
"private/AddonSuggestions.sys.mjs",
|
|
"private/AmpSuggestions.sys.mjs",
|
|
"private/BlockedSuggestions.sys.mjs",
|
|
"private/ExposureSuggestions.sys.mjs",
|
|
"private/FakespotSuggestions.sys.mjs",
|
|
"private/GeolocationUtils.sys.mjs",
|
|
"private/ImpressionCaps.sys.mjs",
|
|
"private/MDNSuggestions.sys.mjs",
|
|
"private/MLSuggest.sys.mjs",
|
|
"private/OfflineWikipediaSuggestions.sys.mjs",
|
|
"private/PocketSuggestions.sys.mjs",
|
|
"private/SuggestBackendMerino.sys.mjs",
|
|
"private/SuggestBackendMl.sys.mjs",
|
|
"private/SuggestBackendRust.sys.mjs",
|
|
"private/SuggestFeature.sys.mjs",
|
|
"private/WeatherSuggestions.sys.mjs",
|
|
"private/YelpSuggestions.sys.mjs",
|
|
]
|
|
|
|
TESTING_JS_MODULES += [
|
|
"tests/quicksuggest/MerinoTestUtils.sys.mjs",
|
|
"tests/quicksuggest/QuickSuggestTestUtils.sys.mjs",
|
|
"tests/quicksuggest/RemoteSettingsServer.sys.mjs",
|
|
"tests/UrlbarTestUtils.sys.mjs",
|
|
]
|
|
BROWSER_CHROME_MANIFESTS += [
|
|
"tests/browser-tips/browser.toml",
|
|
"tests/browser-tips/suppress-tips/browser.toml",
|
|
"tests/browser-updateResults/browser.toml",
|
|
"tests/browser/browser.toml",
|
|
"tests/browser/browserSidebarRevamp.toml",
|
|
"tests/engagementTelemetry/browser/browser.toml",
|
|
"tests/quicksuggest/browser/browser.toml",
|
|
]
|
|
XPCSHELL_TESTS_MANIFESTS += [
|
|
"tests/quicksuggest/unit/xpcshell.toml",
|
|
"tests/unit/xpcshell.toml",
|
|
]
|
|
|
|
SPHINX_TREES["/browser/urlbar"] = "docs"
|