diff --git a/devtools/client/framework/dev-edition-promo/dev-edition-logo.png b/devtools/client/framework/dev-edition-promo/dev-edition-logo.png deleted file mode 100644 index 4b90768d2d..0000000000 Binary files a/devtools/client/framework/dev-edition-promo/dev-edition-logo.png and /dev/null differ diff --git a/devtools/client/framework/dev-edition-promo/dev-edition-promo.css b/devtools/client/framework/dev-edition-promo/dev-edition-promo.css deleted file mode 100644 index 01489fd47f..0000000000 --- a/devtools/client/framework/dev-edition-promo/dev-edition-promo.css +++ /dev/null @@ -1,94 +0,0 @@ -/* 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/. */ - -window { - -moz-appearance: none; - background-color: transparent; -} - -#doorhanger-container { - width: 450px; -} - -#top-panel { - padding: 20px; - background: #343c45; /* toolbars */ - color: #8fa1b2; /* body text */ -/* - * Sloppy preprocessing since UNIX_BUT_NOT_MAC is only defined - * in `browser/app/profile/firefox.js`, which this file cannot - * depend on. Must style font-size to target linux. - */ -%ifdef XP_UNIX -%ifndef XP_MACOSX - font-size: 13px; -%else - font-size: 15px; -%endif -%else - font-size: 15px; -%endif - line-height: 19px; - min-height: 100px; -} - -#top-panel h1 { - font-weight: bold; - font-family: Open Sans, sans-serif; - font-size: 1.1em; -} - -#top-panel p { - font-family: Open Sans, sans-serif; - font-size: 0.9em; - width: 300px; - display: block; - margin: 5px 0px 0px 0px; -} - -#icon { - background-image: url("chrome://devtools/content/framework/dev-edition-promo/dev-edition-logo.png"); - background-size: 64px 64px; - background-repeat: no-repeat; - width: 64px; - height: 64px; - margin-right: 20px; -} - -#lower-panel { - padding: 20px; - background-color: #252c33; /* tab toolbars */ - min-height: 75px; - border-top: 1px solid #292e33; /* text high contrast (light) */ -} - -#button-container { - margin: auto 20px; -} - -#button-container button { - font: message-box !important; - font-size: 16px !important; - cursor: pointer; - width: 125px; - opacity: 1; - position: static; - -moz-appearance: none; - border-radius: 5px; - height: 30px; - width: 450px; - /* Override embossed borders on Windows/Linux */ - border: none; -} - -#close { - background-color: transparent; - color: #8fa1b2; /* body text */ -} - -#go { - margin-left: 100px; - background-color: #70bf53; /* green */ - color: #f5f7fa; /* selection text color */ -} diff --git a/devtools/client/framework/dev-edition-promo/dev-edition-promo.xul b/devtools/client/framework/dev-edition-promo/dev-edition-promo.xul deleted file mode 100644 index ca2515ab09..0000000000 --- a/devtools/client/framework/dev-edition-promo/dev-edition-promo.xul +++ /dev/null @@ -1,36 +0,0 @@ - - - - %toolboxDTD; -]> - - - - - - - - -

Using Developer Tools in your browser?

-

Download Firefox Developer Edition, our first browser made just for you.

- - - - - - - - - - diff --git a/devtools/client/framework/toolbox.js b/devtools/client/framework/toolbox.js index cde7de0e41..4ec8647eb5 100644 --- a/devtools/client/framework/toolbox.js +++ b/devtools/client/framework/toolbox.js @@ -117,7 +117,6 @@ function Toolbox(target, selectedTool, hostType, contentWindow, frameId) { this._saveSplitConsoleHeight = this._saveSplitConsoleHeight.bind(this); this._onFocus = this._onFocus.bind(this); this._onBrowserMessage = this._onBrowserMessage.bind(this); - this._showDevEditionPromo = this._showDevEditionPromo.bind(this); this._updateTextBoxMenuItems = this._updateTextBoxMenuItems.bind(this); this._onBottomHostMinimized = this._onBottomHostMinimized.bind(this); this._onBottomHostMaximized = this._onBottomHostMaximized.bind(this); @@ -149,8 +148,6 @@ function Toolbox(target, selectedTool, hostType, contentWindow, frameId) { this.on("host-changed", this._refreshHostTitle); this.on("select", this._refreshHostTitle); - this.on("ready", this._showDevEditionPromo); - gDevTools.on("tool-registered", this._toolRegistered); gDevTools.on("tool-unregistered", this._toolUnregistered); @@ -2095,7 +2092,6 @@ Toolbox.prototype = { this._target.off("frame-update", this._updateFrames); this.off("select", this._refreshHostTitle); this.off("host-changed", this._refreshHostTitle); - this.off("ready", this._showDevEditionPromo); gDevTools.off("tool-registered", this._toolRegistered); gDevTools.off("tool-unregistered", this._toolUnregistered); @@ -2251,18 +2247,6 @@ Toolbox.prototype = { this.emit("highlighter-hide"); }, - /** - * For displaying the promotional Doorhanger on first opening of - * the developer tools, promoting the Developer Edition. - */ - _showDevEditionPromo: function () { - // Do not display in browser toolbox - if (this.target.chrome) { - return; - } - showDoorhanger({ window: this.win, type: "deveditionpromo" }); - }, - /** * Enable / disable necessary textbox menu items using globalOverlay.js. */ diff --git a/devtools/client/jar.mn b/devtools/client/jar.mn index 95965873f0..a6334057e3 100644 --- a/devtools/client/jar.mn +++ b/devtools/client/jar.mn @@ -111,9 +111,6 @@ devtools.jar: content/framework/options-panel.css (framework/options-panel.css) content/framework/toolbox-process-window.xul (framework/toolbox-process-window.xul) * content/framework/toolbox-process-window.js (framework/toolbox-process-window.js) - content/framework/dev-edition-promo/dev-edition-promo.xul (framework/dev-edition-promo/dev-edition-promo.xul) -* content/framework/dev-edition-promo/dev-edition-promo.css (framework/dev-edition-promo/dev-edition-promo.css) - content/framework/dev-edition-promo/dev-edition-logo.png (framework/dev-edition-promo/dev-edition-logo.png) content/inspector/inspector.xhtml (inspector/inspector.xhtml) content/framework/connect/connect.xhtml (framework/connect/connect.xhtml) content/framework/connect/connect.css (framework/connect/connect.css) diff --git a/devtools/client/responsivedesign/responsivedesign.jsm b/devtools/client/responsivedesign/responsivedesign.jsm index fbedbc4469..116ee3fb8e 100644 --- a/devtools/client/responsivedesign/responsivedesign.jsm +++ b/devtools/client/responsivedesign/responsivedesign.jsm @@ -255,14 +255,6 @@ ResponsiveUI.prototype = { yield this.connectToServer(); this.userAgentInput.hidden = false; - // Hook to display promotional Developer Edition doorhanger. - // Only displayed once. - showDoorhanger({ - window: this.mainWindow, - type: "deveditionpromo", - anchor: this.chromeDoc.querySelector("#content") - }); - // Notify that responsive mode is on. this._telemetry.toolOpened("responsive"); ResponsiveUIManager.emit("on", { tab: this.tab }); diff --git a/devtools/client/shared/doorhanger.js b/devtools/client/shared/doorhanger.js index fc27679660..4c6d6f8cb7 100644 --- a/devtools/client/shared/doorhanger.js +++ b/devtools/client/shared/doorhanger.js @@ -12,40 +12,13 @@ const defer = require("devtools/shared/defer"); const { getMostRecentBrowserWindow } = require("sdk/window/utils"); const XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; -const DEV_EDITION_PROMO_URL = "chrome://devtools/content/framework/dev-edition-promo/dev-edition-promo.xul"; -const DEV_EDITION_PROMO_ENABLED_PREF = "devtools.devedition.promo.enabled"; -const DEV_EDITION_PROMO_SHOWN_PREF = "devtools.devedition.promo.shown"; -const DEV_EDITION_PROMO_URL_PREF = "devtools.devedition.promo.url"; const LOCALE = Cc["@mozilla.org/chrome/chrome-registry;1"] .getService(Ci.nsIXULChromeRegistry) .getSelectedLocale("global"); -/** - * Only show Dev Edition promo if it's enabled (beta channel), - * if it has not been shown before, and it's a locale build - * for `en-US` - */ -function shouldDevEditionPromoShow() { - return Services.prefs.getBoolPref(DEV_EDITION_PROMO_ENABLED_PREF) && - !Services.prefs.getBoolPref(DEV_EDITION_PROMO_SHOWN_PREF) && - LOCALE === "en-US"; -} - var TYPES = { - // The Developer Edition promo doorhanger, called by - // opening the toolbox, browser console, WebIDE, or responsive design mode - // in Beta releases. Only displayed once per profile. - deveditionpromo: { - predicate: shouldDevEditionPromoShow, - success: () => { - return Services.prefs.setBoolPref(DEV_EDITION_PROMO_SHOWN_PREF, true); - }, - action: () => { - let url = Services.prefs.getCharPref(DEV_EDITION_PROMO_URL_PREF); - getGBrowser().selectedTab = getGBrowser().addTab(url); - }, - url: DEV_EDITION_PROMO_URL - } + // We don't support any doorhanger types at the moment. + // This is vestigial from the FF dev edition promo. }; var panelAttrs = { diff --git a/devtools/client/webconsole/hudservice.js b/devtools/client/webconsole/hudservice.js index 3023b7bb3b..fbb58ce743 100644 --- a/devtools/client/webconsole/hudservice.js +++ b/devtools/client/webconsole/hudservice.js @@ -682,12 +682,6 @@ BrowserConsole.prototype = extend(WebConsole.prototype, { this._telemetry.toolOpened("browserconsole"); - // Create an onFocus handler just to display the dev edition promo. - // This is to prevent race conditions in some environments. - // Hook to display promotional Developer Edition doorhanger. Only displayed once. - let onFocus = () => showDoorhanger({ window, type: "deveditionpromo" }); - window.addEventListener("focus", onFocus); - this._bc_init = this.$init(); return this._bc_init; },