diff --git a/devtools/client/jsonview/converter-observer.js b/devtools/client/jsonview/converter-observer.js index 72dbc5f841..a73e228229 100644 --- a/devtools/client/jsonview/converter-observer.js +++ b/devtools/client/jsonview/converter-observer.js @@ -39,9 +39,8 @@ function ConverterObserver() { ConverterObserver.prototype = { initialize: function () { - // Only the DevEdition has this feature available by default. // Users need to manually flip 'devtools.jsonview.enabled' preference - // to have it available in other distributions. + // to have it available. if (this.isEnabled()) { this.register(); } diff --git a/devtools/client/preferences/devtools.js b/devtools/client/preferences/devtools.js index 5bbd5a0946..fb018d81ab 100644 --- a/devtools/client/preferences/devtools.js +++ b/devtools/client/preferences/devtools.js @@ -3,17 +3,6 @@ # 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/. -// Developer edition promo preferences -pref("devtools.devedition.promo.shown", false); -pref("devtools.devedition.promo.url", "https://www.mozilla.org/firefox/developer/?utm_source=firefox-dev-tools&utm_medium=firefox-browser&utm_content=betadoorhanger"); - -// Only potentially show in beta release -#if MOZ_UPDATE_CHANNEL == beta - pref("devtools.devedition.promo.enabled", true); -#else - pref("devtools.devedition.promo.enabled", false); -#endif - // DevTools development workflow pref("devtools.loader.hotreload", false);