diff --git a/devtools/client/locales/en-US/responsiveUI.properties b/devtools/client/locales/en-US/responsiveUI.properties index 5a2f41a5694c..6a4930246175 100644 --- a/devtools/client/locales/en-US/responsiveUI.properties +++ b/devtools/client/locales/en-US/responsiveUI.properties @@ -11,6 +11,7 @@ # A good criteria is the language in which you'd find the best # documentation on web development on the web. + # LOCALIZATION NOTE (responsiveUI.rotate2): tooltip of the rotate button. responsiveUI.rotate2=Rotate @@ -66,13 +67,3 @@ responsiveUI.notificationReload=Reload responsiveUI.notificationReload_accesskey=R responsiveUI.dontShowReloadNotification=Never show again responsiveUI.dontShowReloadNotification_accesskey=N - -# LOCALIZATION NOTE (responsiveUI.newVersionUserDisabled): notification that appears -# when old RDM is displayed because the user has disabled new RDM. -responsiveUI.newVersionUserDisabled=A new version of Responsive Design Mode is available, but it appears to be disabled. Please enable it and provide feedback, as this version will be removed. -# LOCALIZATION NOTE (responsiveUI.newVersionE10sDisabled): notification that appears -# when old RDM is displayed because e10s is disabled. -responsiveUI.newVersionE10sDisabled=A new version of Responsive Design Mode is available, but it requires multi-process mode, which is currently disabled. Please enable it and provide feedback, as this version will be removed. -# LOCALIZATION NOTE (responsiveUI.newVersionEnableAndRestart): button text in notification -# to enable new RDM itself or e10s as a prerequisite for new RDM. -responsiveUI.newVersionEnableAndRestart=Enable and Restart \ No newline at end of file diff --git a/devtools/client/responsivedesign/responsivedesign.jsm b/devtools/client/responsivedesign/responsivedesign.jsm index b4288bba5273..57da28464b44 100644 --- a/devtools/client/responsivedesign/responsivedesign.jsm +++ b/devtools/client/responsivedesign/responsivedesign.jsm @@ -14,8 +14,6 @@ const EventEmitter = require("devtools/shared/event-emitter"); loader.lazyImporter(this, "SystemAppProxy", "resource://gre/modules/SystemAppProxy.jsm"); -loader.lazyImporter(this, "BrowserUtils", - "resource://gre/modules/BrowserUtils.jsm"); loader.lazyRequireGetter(this, "Telemetry", "devtools/client/shared/telemetry"); loader.lazyRequireGetter(this, "showDoorhanger", "devtools/client/shared/doorhanger", true); @@ -29,12 +27,9 @@ loader.lazyRequireGetter(this, "DebuggerClient", "devtools/shared/client/main", true); loader.lazyRequireGetter(this, "DebuggerServer", "devtools/server/main", true); -loader.lazyRequireGetter(this, "system", "devtools/shared/system"); this.EXPORTED_SYMBOLS = ["ResponsiveUIManager"]; -const NEW_RDM_ENABLED = "devtools.responsive.html.enabled"; - const MIN_WIDTH = 50; const MIN_HEIGHT = 50; @@ -141,7 +136,7 @@ EventEmitter.decorate(Manager); // the new HTML RDM UI to function), delegate the ResponsiveUIManager API over to that // tool instead. Performing this delegation here allows us to contain the pref check to a // single place. -if (Services.prefs.getBoolPref(NEW_RDM_ENABLED) && +if (Services.prefs.getBoolPref("devtools.responsive.html.enabled") && Services.appinfo.browserTabsRemoteAutostart) { let { ResponsiveUIManager } = require("devtools/client/responsive.html/manager"); @@ -271,8 +266,6 @@ ResponsiveUI.prototype = { anchor: this.chromeDoc.querySelector("#content") }); - this.showNewUINotification(); - // Notify that responsive mode is on. this._telemetry.toolOpened("responsive"); ResponsiveUIManager.emit("on", { tab: this.tab }); @@ -412,8 +405,6 @@ ResponsiveUI.prototype = { yield stopped; } - this.hideNewUINotification(); - this.inited = null; ResponsiveUIManager.emit("off", { tab: this.tab }); }), @@ -692,66 +683,6 @@ ResponsiveUI.prototype = { this.container.appendChild(bottomToolbar); }, - showNewUINotification() { - let nbox = this.mainWindow.gBrowser.getNotificationBox(this.browser); - - // One reason we might be using old RDM is that the user explcitly disabled new RDM. - // We should encourage them to use the new one, since the old one will be removed. - if (Services.prefs.prefHasUserValue(NEW_RDM_ENABLED) && - !Services.prefs.getBoolPref(NEW_RDM_ENABLED)) { - let buttons = [{ - label: this.strings.GetStringFromName("responsiveUI.newVersionEnableAndRestart"), - callback: () => { - Services.prefs.setBoolPref(NEW_RDM_ENABLED, true); - BrowserUtils.restartApplication(); - }, - }]; - nbox.appendNotification( - this.strings.GetStringFromName("responsiveUI.newVersionUserDisabled"), - "responsive-ui-new-version-user-disabled", - null, - nbox.PRIORITY_INFO_LOW, - buttons - ); - return; - } - - // Only show a notification about the new RDM UI on channels where there is an e10s - // switch in the preferences UI (Dev. Ed, Nightly). On other channels, it is less - // clear how a user would proceed here, so don't show a message. - if (!system.constants.E10S_TESTING_ONLY) { - return; - } - - let buttons = [{ - label: this.strings.GetStringFromName("responsiveUI.newVersionEnableAndRestart"), - callback: () => { - Services.prefs.setBoolPref("browser.tabs.remote.autostart", true); - Services.prefs.setBoolPref("browser.tabs.remote.autostart.2", true); - BrowserUtils.restartApplication(); - }, - }]; - nbox.appendNotification( - this.strings.GetStringFromName("responsiveUI.newVersionE10sDisabled"), - "responsive-ui-new-version-e10s-disabled", - null, - nbox.PRIORITY_INFO_LOW, - buttons - ); - }, - - hideNewUINotification() { - let nbox = this.mainWindow.gBrowser.getNotificationBox(this.browser); - let n = nbox.getNotificationWithValue("responsive-ui-new-version-user-disabled"); - if (n) { - n.close(); - } - n = nbox.getNotificationWithValue("responsive-ui-new-version-e10s-disabled"); - if (n) { - n.close(); - } - }, - /** * Validate and apply any user input on the editable menulist */