Bug 1494615 - Accept source parameter in adb-addon install();r=ladybenko

Depends on D7404. The install method should not hardcode "webide"
for the addon manager telemetry info

Differential Revision: https://phabricator.services.mozilla.com/D7405

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Julian Descottes 2018-10-04 18:43:29 +00:00
parent c1b5abb562
commit 419fc776a0
3 changed files with 11 additions and 4 deletions

View File

@ -80,7 +80,7 @@ function BuildUI() {
const installButton = document.createElement("button");
installButton.className = "install-button";
installButton.onclick = () => adbAddon.install();
installButton.onclick = () => adbAddon.install("webide");
installButton.textContent = Strings.GetStringFromName("addons_install_button");
li.appendChild(installButton);

View File

@ -87,7 +87,7 @@ var UI = {
// If the user decides to uninstall any of this addon, we won't install it again.
const autoinstallADBExtension = Services.prefs.getBoolPref("devtools.webide.autoinstallADBExtension");
if (autoinstallADBExtension) {
adbAddon.install();
adbAddon.install("webide");
}
Services.prefs.setBoolPref("devtools.webide.autoinstallADBExtension", false);

View File

@ -72,7 +72,14 @@ ADBAddon.prototype = {
}
},
install: async function() {
/**
* Install and enable the adb extension. Returns a promise that resolves when ADB is
* enabled.
*
* @param {String} source
* String passed to the AddonManager for telemetry.
*/
install: async function(source) {
const addon = await AddonManager.getAddonByID(ADB_ADDON_ID);
if (addon && !addon.userDisabled) {
this.status = "installed";
@ -86,7 +93,7 @@ ADBAddon.prototype = {
this.xpiLink,
"application/x-xpinstall",
null, null, null, null, null,
{ source: "webide" }
{ source }
);
install.addListener(this);
install.install();