From c9446a43192900d5322debfbfdf8b492f71a3d81 Mon Sep 17 00:00:00 2001 From: NTD Date: Tue, 1 May 2018 16:14:17 -0400 Subject: [PATCH] [TychoAM] Make the Add-ons Manager conditionally devtools free --- toolkit/mozapps/extensions/content/extensions.js | 4 ++++ toolkit/mozapps/extensions/content/extensions.xml | 2 ++ toolkit/mozapps/extensions/content/extensions.xul | 6 ++++++ .../mozapps/extensions/internal/XPIProvider.jsm | 15 +++++++++++++++ 4 files changed, 27 insertions(+) diff --git a/toolkit/mozapps/extensions/content/extensions.js b/toolkit/mozapps/extensions/content/extensions.js index 8d9c132e61..fc43922312 100644 --- a/toolkit/mozapps/extensions/content/extensions.js +++ b/toolkit/mozapps/extensions/content/extensions.js @@ -18,10 +18,12 @@ Cu.import("resource://gre/modules/addons/AddonRepository.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "PluralForm", "resource://gre/modules/PluralForm.jsm"); +#ifdef MOZ_DEVTOOLS XPCOMUtils.defineLazyGetter(this, "BrowserToolboxProcess", function () { return Cu.import("resource://devtools/client/framework/ToolboxProcess.jsm", {}). BrowserToolboxProcess; }); +#endif const PREF_DISCOVERURL = "extensions.webservice.discoverURL"; const PREF_DISCOVER_ENABLED = "extensions.getAddons.showPane"; @@ -1002,6 +1004,7 @@ var gViewController = { } }, +#ifdef MOZ_DEVTOOLS cmd_debugItem: { doCommand: function cmd_debugItem_doCommand(aAddon) { BrowserToolboxProcess.init({ addonID: aAddon.id }); @@ -1015,6 +1018,7 @@ var gViewController = { return aAddon && aAddon.isDebuggable && debuggerEnabled && remoteEnabled; } }, +#endif cmd_showItemPreferences: { isEnabled: function cmd_showItemPreferences_isEnabled(aAddon) { diff --git a/toolkit/mozapps/extensions/content/extensions.xml b/toolkit/mozapps/extensions/content/extensions.xml index 7fe17be2ab..cbd05bfa95 100644 --- a/toolkit/mozapps/extensions/content/extensions.xml +++ b/toolkit/mozapps/extensions/content/extensions.xml @@ -1628,11 +1628,13 @@ ]]> +#ifdef MOZ_DEVTOOLS +#endif +#ifdef MOZ_DEVTOOLS +#endif +#ifdef MOZ_DEVTOOLS +#endif @@ -631,9 +635,11 @@ #endif command="cmd_showItemPreferences"/> +#ifdef MOZ_DEVTOOLS