Backed out changeset e01ec8694924 (bug 1700957) as requested. CLOSED TREE

2021-04-28 18:09:01 +03:00 · 2021-04-28 18:09:01 +03:00 · a76b78d543
--- a/browser/actors/EncryptedMediaParent.jsm
+++ b/browser/actors/EncryptedMediaParent.jsm
@ -30,8 +30,8 @@ XPCOMUtils.defineLazyGetter(this, "gFluentStrings", function() {

 XPCOMUtils.defineLazyPreferenceGetter(
  this,
-  "gProtonEnabled",
-  "browser.proton.enabled",
+  "gProtonDoorhangersEnabled",
+  "browser.proton.doorhangers.enabled",
  false
 );

@ -246,7 +246,7 @@ class EncryptedMediaParent extends JSWindowActorParent {
        aBrowser.ownerGlobal.openPreferences("general-drm");
      },
      dismiss: true,
-      disableHighlight: gProtonEnabled,
+      disableHighlight: gProtonDoorhangersEnabled,
    };

    let secondaryActions = [
--- a/browser/actors/WebRTCParent.jsm
+++ b/browser/actors/WebRTCParent.jsm
@ -47,8 +47,8 @@ XPCOMUtils.defineLazyServiceGetter(

 XPCOMUtils.defineLazyPreferenceGetter(
  this,
-  "gProtonEnabled",
-  "browser.proton.enabled",
+  "gProtonDoorhangersEnabled",
+  "browser.proton.doorhangers.enabled",
  false
 );

@ -1112,7 +1112,7 @@ function prompt(aActor, aBrowser, aRequest) {
        "webRTC-selectMicrophone-menupopup"
      );
      let describedByIDs = ["webRTC-shareDevices-notification-description"];
-      let describedBySuffix = gProtonEnabled ? "icon" : "label";
+      let describedBySuffix = gProtonDoorhangersEnabled ? "icon" : "label";

      if (sharingScreen) {
        listScreenShareDevices(windowMenupopup, videoDevices);
@ -1324,7 +1324,7 @@ function prompt(aActor, aBrowser, aRequest) {
  }
  let anchorId = "webRTC-share" + iconType + "-notification-icon";

-  if (!gProtonEnabled) {
+  if (!gProtonDoorhangersEnabled) {
    let iconClass = iconType.toLowerCase();
    if (iconClass == "devices") {
      iconClass = "camera";
@ -1339,7 +1339,7 @@ function prompt(aActor, aBrowser, aRequest) {
    );
  }

-  if (gProtonEnabled) {
+  if (gProtonDoorhangersEnabled) {
    mainAction.disableHighlight = true;
  }

--- a/browser/base/content/browser-places.js
+++ b/browser/base/content/browser-places.js
@ -1679,7 +1679,7 @@ var BookmarkingUI = {
      entry: "subviewbutton",
    };

-    if (!gProton) {
+    if (!gProtonDoorhangers) {
      extraClasses.footer = "panel-subview-footer";
    }

--- a/browser/base/content/browser-siteIdentity.js
+++ b/browser/base/content/browser-siteIdentity.js
@ -423,7 +423,7 @@ var gIdentityHandler = {
    XPCOMUtils.defineLazyPreferenceGetter(
      this,
      "_protonEnabled",
-      "browser.proton.enabled",
+      "browser.proton.doorhangers.enabled",
      false
    );
    return this._protonEnabled;
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@ -154,7 +154,7 @@ panelview[mainview] > .panel-header {
  transition: height var(--panelui-subview-transition-duration);
 }

-@media (-moz-proton) {
+@media (-moz-proton-doorhangers) {
 :is(panel, menupopup)::part(arrow) {
  display: none;
 }
@ -1662,7 +1662,7 @@ toolbar[keyNav=true]:not([collapsed=true], [customizing=true]) toolbartabstop {
 * End Dialogs
 */

-@media not (-moz-proton) {
+@media not (-moz-proton-doorhangers) {
 /* Password update/save doorhanger */
 #password-notification-username,
 #password-notification-password {
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@ -573,7 +573,7 @@ XPCOMUtils.defineLazyPreferenceGetter(
 XPCOMUtils.defineLazyPreferenceGetter(
  this,
  "gProtonDoorhangers",
-  "browser.proton.enabled",
+  "browser.proton.doorhangers.enabled",
  false
 );

@ -7513,7 +7513,7 @@ var IndexedDBPromptHelper = {
          Ci.nsIPermissionManager.ALLOW_ACTION
        );
      },
-      disableHighlight: gProton,
+      disableHighlight: gProtonDoorhangers,
    };

    var secondaryActions = [
@ -7612,7 +7612,7 @@ var CanvasPermissionPromptHelper = {
          state && state.checkboxChecked
        );
      },
-      disableHighlight: gProton,
+      disableHighlight: gProtonDoorhangers,
    };

    let secondaryActions = [
@ -7786,7 +7786,7 @@ var WebAuthnPromptHelper = {
      }
    };

-    if (gProton) {
+    if (gProtonDoorhangers) {
      mainAction.disableHighlight = true;
    }

--- a/browser/base/content/test/popupNotifications/head.js
+++ b/browser/base/content/test/popupNotifications/head.js
@ -211,7 +211,7 @@ function checkPopup(popup, notifyObj) {
  // With Proton enabled, PopupNotifications are not expected to show icons
  // unless popupIconURL or popupIconClass is passed in the options object.
  if (
-    !gProton ||
+    !gProtonDoorhangers ||
    notifyObj.options.popupIconURL ||
    notifyObj.options.popupIconClass
  ) {
--- a/browser/base/content/test/webrtc/browser_devices_get_user_media.js
+++ b/browser/base/content/test/webrtc/browser_devices_get_user_media.js
@ -26,7 +26,7 @@ var gTests = [
      checkDeviceSelectors(true, true);

      // With Proton enabled, the icon does not appear in the panel.
-      if (!gProton) {
+      if (!gProtonDoorhangers) {
        let iconclass = PopupNotifications.panel.firstElementChild.getAttribute(
          "iconclass"
        );
@ -75,7 +75,7 @@ var gTests = [
      checkDeviceSelectors(true);

      // With Proton enabled, the icon does not appear in the panel.
-      if (!gProton) {
+      if (!gProtonDoorhangers) {
        let iconclass = PopupNotifications.panel.firstElementChild.getAttribute(
          "iconclass"
        );
@ -126,7 +126,7 @@ var gTests = [
      checkDeviceSelectors(false, true);

      // With Proton enabled, the icon does not appear in the panel.
-      if (!gProton) {
+      if (!gProtonDoorhangers) {
        let iconclass = PopupNotifications.panel.firstElementChild.getAttribute(
          "iconclass"
        );
--- a/browser/base/content/test/webrtc/browser_devices_get_user_media_default_permissions.js
+++ b/browser/base/content/test/webrtc/browser_devices_get_user_media_default_permissions.js
@ -46,7 +46,7 @@ var gTests = [
      checkDeviceSelectors(true);

      // With Proton enabled, the icon does not appear in the panel.
-      if (!gProton) {
+      if (!gProtonDoorhangers) {
        let iconclass = PopupNotifications.panel.firstElementChild.getAttribute(
          "iconclass"
        );
@ -151,7 +151,7 @@ var gTests = [
      checkDeviceSelectors(false, true);

      // With Proton enabled, the icon does not appear in the panel.
-      if (!gProton) {
+      if (!gProtonDoorhangers) {
        let iconclass = PopupNotifications.panel.firstElementChild.getAttribute(
          "iconclass"
        );
--- a/browser/base/content/test/webrtc/browser_devices_get_user_media_in_xorigin_frame.js
+++ b/browser/base/content/test/webrtc/browser_devices_get_user_media_in_xorigin_frame.js
@ -99,7 +99,7 @@ async function promptNoDelegateScreenSharing(aThirdPartyOrgin) {
  const notification = PopupNotifications.panel.firstElementChild;

  // With Proton enabled, the icon does not appear in the panel.
-  if (!gProton) {
+  if (!gProtonDoorhangers) {
    const iconclass = notification.getAttribute("iconclass");
    ok(iconclass.includes("screen-icon"), "panel using screen icon");
  }
@ -228,7 +228,7 @@ var gTests = [
      const notification = PopupNotifications.panel.firstElementChild;

      // With Proton enabled, the icon does not appear in the panel.
-      if (!gProton) {
+      if (!gProtonDoorhangers) {
        const iconclass = notification.getAttribute("iconclass");
        ok(iconclass.includes("screen-icon"), "panel using screen icon");
      }
--- a/browser/base/content/test/webrtc/browser_devices_get_user_media_paused.js
+++ b/browser/base/content/test/webrtc/browser_devices_get_user_media_paused.js
@ -333,7 +333,7 @@ var gTests = [
      let notification = PopupNotifications.panel.firstElementChild;

      // With Proton enabled, the icon does not appear in the panel.
-      if (!gProton) {
+      if (!gProtonDoorhangers) {
        let iconclass = notification.getAttribute("iconclass");
        ok(iconclass.includes("screen-icon"), "panel using screen icon");
      }
--- a/browser/base/content/test/webrtc/browser_devices_get_user_media_screen.js
+++ b/browser/base/content/test/webrtc/browser_devices_get_user_media_screen.js
@ -46,7 +46,7 @@ var gTests = [
      let notification = PopupNotifications.panel.firstElementChild;

      // With Proton enabled, the icon does not appear in the panel.
-      if (!gProton) {
+      if (!gProtonDoorhangers) {
        let iconclass = notification.getAttribute("iconclass");
        ok(iconclass.includes("screen-icon"), "panel using screen icon");
      }
@ -220,7 +220,7 @@ var gTests = [
      let notification = PopupNotifications.panel.firstElementChild;

      // With Proton enabled, the icon does not appear in the panel.
-      if (!gProton) {
+      if (!gProtonDoorhangers) {
        let iconclass = notification.getAttribute("iconclass");
        ok(iconclass.includes("screen-icon"), "panel using screen icon");
      }
@ -433,7 +433,7 @@ var gTests = [
      checkDeviceSelectors(true, false, true);

      // With Proton enabled, the icon does not appear in the panel.
-      if (!gProton) {
+      if (!gProtonDoorhangers) {
        let iconclass = PopupNotifications.panel.firstElementChild.getAttribute(
          "iconclass"
        );
--- a/browser/components/customizableui/test/browser_981305_separator_insertion.js
+++ b/browser/components/customizableui/test/browser_981305_separator_insertion.js
@ -72,10 +72,9 @@ async function checkSeparatorInsertion(menuId, buttonId, subviewId) {
 }

 add_task(async function check_devtools_separator() {
-  const protonEnabled = Services.prefs.getBoolPref(
-    "browser.proton.enabled",
-    false
-  );
+  const protonEnabled =
+    Services.prefs.getBoolPref("browser.proton.doorhangers.enabled", false) &&
+    Services.prefs.getBoolPref("browser.proton.enabled", false);
  const panelviewId = protonEnabled ? "appmenu-moreTools" : "PanelUI-developer";

  await checkSeparatorInsertion(
--- a/browser/components/customizableui/test/browser_proton_moreTools_panel.js
+++ b/browser/components/customizableui/test/browser_proton_moreTools_panel.js
@ -15,7 +15,10 @@ add_task(async function testMoreToolsPanelInToolbar() {
  // proton prefs are applied to the new browser window for this test.
  DevToolsStartup.developerToggleCreated = false;
  await SpecialPowers.pushPrefEnv({
-    set: [["browser.proton.enabled", true]],
+    set: [
+      ["browser.proton.enabled", true],
+      ["browser.proton.doorhangers.enabled", true],
+    ],
  });
  CustomizableUI.destroyWidget("developer-button");

--- a/browser/components/downloads/content/downloads.css
+++ b/browser/components/downloads/content/downloads.css
@ -88,7 +88,7 @@
  max-width: unset;
 }

-@media (-moz-proton) {
+@media (-moz-proton-doorhangers) {
 #downloadsPanel-blockedSubview,
 #downloadsPanel-mainView {
  font: caption;
--- a/browser/components/fxmonitor/FirefoxMonitor.jsm
+++ b/browser/components/fxmonitor/FirefoxMonitor.jsm
@ -37,7 +37,7 @@ this.FirefoxMonitor = {
  strings: null,

  kEnabledPref: "extensions.fxmonitor.enabled",
-  kProtonPref: "browser.proton.enabled",
+  kProtonPref: "browser.proton.doorhangers.enabled",

  // This is here for documentation, will be redefined to a pref getter
  // using XPCOMUtils.defineLazyPreferenceGetter in delayedInit().
--- a/browser/components/fxmonitor/test/browser/browser_fxmonitor_doorhanger.js
+++ b/browser/components/fxmonitor/test/browser/browser_fxmonitor_doorhanger.js
@ -76,7 +76,7 @@ add_task(async function setup() {
  // There is a test later in this file that checks that the panel doesn't appear
  // with Proton enabled.
  await SpecialPowers.pushPrefEnv({
-    set: [["browser.proton.enabled", false]],
+    set: [["browser.proton.doorhangers.enabled", false]],
  });
 });

@ -310,7 +310,7 @@ add_task(async function test_proton_disabled() {

  // Enable proton
  await SpecialPowers.pushPrefEnv({
-    set: [["browser.proton.enabled", true]],
+    set: [["browser.proton.doorhangers.enabled", true]],
  });

  // Open a tab and wait for the alert.
--- a/browser/components/places/content/editBookmark.js
+++ b/browser/components/places/content/editBookmark.js
@ -465,7 +465,7 @@ var gEditItemOverlay = {
      menupopup.removeChild(menupopup.lastElementChild);
    }

-    if (!this.protonEnabled) {
+    if (!this.protonDoorhangersEnabled) {
      this._folderMenuList.classList.add("panel-button");
    }

@ -1341,8 +1341,8 @@ XPCOMUtils.defineLazyGetter(gEditItemOverlay, "_folderTree", () => {

 XPCOMUtils.defineLazyPreferenceGetter(
  gEditItemOverlay,
-  "protonEnabled",
-  "browser.proton.enabled",
+  "protonDoorhangersEnabled",
+  "browser.proton.doorhangers.enabled",
  false
 );

--- a/browser/modules/PermissionUI.jsm
+++ b/browser/modules/PermissionUI.jsm
@ -99,8 +99,8 @@ XPCOMUtils.defineLazyGetter(this, "gBrowserBundle", function() {

 XPCOMUtils.defineLazyPreferenceGetter(
  this,
-  "protonEnabled",
-  "browser.doorhangers.enabled",
+  "protonDoorhangersEnabled",
+  "browser.proton.doorhangers.enabled",
  false
 );

@ -596,7 +596,10 @@ var PermissionPromptPrototype = {
      options.hideClose = true;
    }

-    if (protonEnabled && !mainAction.hasOwnProperty("disableHighlight")) {
+    if (
+      protonDoorhangersEnabled &&
+      !mainAction.hasOwnProperty("disableHighlight")
+    ) {
      mainAction.disableHighlight = true;
    }

--- a/browser/themes/linux/places/editBookmark.css
+++ b/browser/themes/linux/places/editBookmark.css
@ -2,7 +2,7 @@
 * 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/. */

-@media not (-moz-proton) {
+@media not (-moz-proton-doorhangers) {
 #editBookmarkPanelRows > vbox {
  margin-bottom: .5em;
 }
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@ -376,7 +376,7 @@ moz-input-box > menupopup .context-menu-add-engine > .menu-iconic-left {
  text-align: start;
 }

-@media not (-moz-proton) {
+@media not (-moz-proton-doorhangers) {
 #editBookmarkPanelRows > vbox > html|input,
 #editBookmarkPanelRows > vbox > hbox > html|input {
  appearance: none;
--- a/browser/themes/osx/downloads/downloads.css
+++ b/browser/themes/osx/downloads/downloads.css
@ -24,7 +24,7 @@
  outline-offset: -2px;
 }

-@media not (-moz-proton) {
+@media not (-moz-proton-doorhangers) {
@item@[verdict="Malware"]:not(:hover) {
  color: #aa1b08;
 }
--- a/browser/themes/osx/places/editBookmark.css
+++ b/browser/themes/osx/places/editBookmark.css
@ -2,7 +2,7 @@
 * 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/. */

-@media not (-moz-proton) {
+@media not (-moz-proton-doorhangers) {
 #editBookmarkPanelRows > vbox {
  margin-bottom: .5em;
 }
--- a/browser/themes/shared/browser.inc.css
+++ b/browser/themes/shared/browser.inc.css
@ -851,7 +851,7 @@ menupopup::part(drop-indicator) {
  flex: 1;
 }

-@media not (-moz-proton) {
+@media not (-moz-proton-doorhangers) {
 .webRTC-selectDevice-label {
  margin-top: 6px;
  font-weight: 600;
@ -868,11 +868,7 @@ menupopup::part(drop-indicator) {
 }
 } /** END not Proton **/

-@media (-moz-proton) {
-popupnotification {
-  font-size: var(--panel-font-size);
-}
-
+@media (-moz-proton-doorhangers) {
 popupnotificationcontent {
  margin-block-start: 8px;
 }
--- a/browser/themes/shared/controlcenter/panel.inc.css
+++ b/browser/themes/shared/controlcenter/panel.inc.css
@ -25,16 +25,6 @@
  --height-offset: 0px;
 }

-@media not (-moz-proton) {
-#identity-popup,
-#permission-popup,
-#protections-popup {
-%if defined(XP_MACOSX) || defined(XP_WIN)
-  font-size: 1.18em;
-%endif
-}
-} /** END not PROTON **/
-
 #protections-popup {
  --protections-popup-switch-off-background: #f9f9fa;
  --protections-popup-switch-off-hover-background: #c9c9ca;
@ -187,7 +177,7 @@
  background-position: calc(100% - 1em) 1em;
 }

-@media not (-moz-proton) {
+@media not (-moz-proton-doorhangers) {
 #identity-popup-securityView .identity-popup-security-content {
  border-bottom: 1px solid var(--panel-separator-color);
 }
@ -253,7 +243,7 @@
 }
 } /** END not PROTON **/

-@media not (-moz-proton) {
+@media not (-moz-proton-doorhangers) {
 .identity-popup-security-content,
 #permission-popup-permissions-content {
  padding-block: 1em;
@ -346,7 +336,7 @@
  margin-top: 4px;
 }

-@media not (-moz-proton) {
+@media not (-moz-proton-doorhangers) {
 #permission-popup-mainView-panel-header,
 #identity-popup-mainView-panel-header {
  padding: var(--vertical-section-padding) 2px;
@ -397,7 +387,7 @@

 /* SECURITY */

-@media not (-moz-proton) {
+@media not (-moz-proton-doorhangers) {
 .identity-popup-connection-secure {
  color: #058B00;
 }
@ -477,7 +467,7 @@
  padding-top: 4px;
 }

-@media not (-moz-proton) {
+@media not (-moz-proton-doorhangers) {
 #identity-popup-securityView-body {
  /* icon indent + 16px icon width + 6px description margin
    (total of 12px margin with the native 6px description margin) */
@ -490,7 +480,7 @@
 }
 } /** END not PROTON **/

-@media (-moz-proton) {
+@media (-moz-proton-doorhangers) {
 #identity-popup-multiView {
  height: -moz-fit-content;
 }
@ -904,7 +894,7 @@ description#identity-popup-content-verifier,
  margin-inline-start: 8px;
 }

-@media not (-moz-proton) {
+@media not (-moz-proton-doorhangers) {
 .permission-popup-permission-icon {
  margin-inline-start: 3px;
 }
@ -1054,7 +1044,7 @@ description#identity-popup-content-verifier,
  transition: padding .2s ease;
 }

-@media (-moz-proton) {
+@media (-moz-proton-doorhangers) {
 .protections-popup-tp-switch {
  min-width: 30px;
 }
@ -1077,7 +1067,7 @@ description#identity-popup-content-verifier,
  padding-inline-start: 12px;
 }

-@media (-moz-proton) {
+@media (-moz-proton-doorhangers) {
 .protections-popup-tp-switch[enabled] {
  padding-inline-start: 16px;
 }
@ -1208,7 +1198,7 @@ description#identity-popup-content-verifier,
  stroke: #ffbd4f;
 }

-@media not (-moz-proton) {
+@media not (-moz-proton-doorhangers) {
 #protections-popup-mainView-panel-header-section {
  color: white;
  background: radial-gradient(circle farthest-side at top right, #9059FF, #0250BB);
@ -1272,7 +1262,7 @@ description#identity-popup-content-verifier,
 }
 }/** END not PROTON **/

-@media (-moz-proton) {
+@media (-moz-proton-doorhangers) {
 #protections-popup-mainView-panel-header {
  min-height: 43.5px;
 }
--- a/browser/themes/shared/customizableui/panelUI.inc.css
+++ b/browser/themes/shared/customizableui/panelUI.inc.css
@ -399,7 +399,7 @@ panelmultiview[transitioning] > .panel-viewcontainer > .panel-viewstack > panelv
  max-width: @standaloneSubviewWidth@;
 }

-@media (-moz-proton) {
+@media (-moz-proton-doorhangers) {
 #BMB_bookmarksPopup::part(arrowscrollbox) {
  border: 0;
 }
@ -414,7 +414,7 @@ panelmultiview[transitioning] > .panel-viewcontainer > .panel-viewstack > panelv
 }
 } /** END Proton **/

-@media not (-moz-proton) {
+@media not (-moz-proton-doorhangers) {
 #BMB_bookmarksPopup::part(arrowscrollbox) {
  padding: 0;
 }
@ -1816,7 +1816,7 @@ menuitem.panel-subview-footer@menuStateActive@,
  margin-inline-end: 3px;
 }

-@media not (-moz-proton) {
+@media not (-moz-proton-doorhangers) {
 #BMB_bookmarksPopup menupopup > .bookmarks-actions-menuseparator {
  /* Hide bottom separator as the styled footer includes a top border serving the same purpose */
  display: none;
@ -2472,7 +2472,7 @@ panelview:not([mainview]) #PanelUI-whatsNew-title {
  margin: 0 calc(-10px + var(--horizontal-padding)) var(--vertical-section-padding);
 }

-@media (-moz-proton) {
+@media (-moz-proton-doorhangers) {
 #protections-popup-message .whatsNew-message-body {
  margin-inline: 6px;
 }
--- a/browser/themes/shared/downloads/downloads.inc.css
+++ b/browser/themes/shared/downloads/downloads.inc.css
@ -26,7 +26,7 @@
  pointer-events: none;
 }

-@media (-moz-proton) {
+@media (-moz-proton-doorhangers) {
 #emptyDownloads {
  padding: 1.5em 0.62em 2.1em;
 }
@ -130,7 +130,7 @@ button.downloadButton {
 }
 }/** END Proton **/

-@media not (-moz-proton) {
+@media not (-moz-proton-doorhangers) {
@item@ {
  height: var(--downloads-item-height);
  border-bottom: 1px solid var(--panel-separator-color);
@ -224,7 +224,7 @@ button.downloadButton {
  padding-inline-end: 59px;
 }

-@media not (-moz-proton) {
+@media not (-moz-proton-doorhangers) {
 #downloadsHistory {
  padding-inline: 14px;
 }
--- a/browser/themes/shared/notification-icons.inc.css
+++ b/browser/themes/shared/notification-icons.inc.css
@ -224,7 +224,7 @@
  margin-inline-end: 0;
 }

-@media (-moz-proton) {
+@media (-moz-proton-doorhangers) {
 #webRTC-preview:not([hidden]) {
  min-width: 368px;
  min-height: 10em;
@ -276,7 +276,7 @@
 }
 } /** END not Proton **/

-@media not (-moz-proton) {
+@media not (-moz-proton-doorhangers) {
 #webRTC-preview:not([hidden]) {
  border-radius: 4px;
  border: 1px solid var(--panel-separator-color);
@ -492,7 +492,7 @@
 %endif

 /* UPDATE */
-@media (-moz-proton) {
+@media (-moz-proton-doorhangers) {
 .popup-notification-icon[popupid="update-available"],
 .popup-notification-icon[popupid="update-downloading"],
 .popup-notification-icon[popupid="update-manual"],
@ -510,7 +510,7 @@
 }
 } /** END Proton **/

-@media not (-moz-proton) {
+@media not (-moz-proton-doorhangers) {
 .popup-notification-icon[popupid="update-available"],
 .popup-notification-icon[popupid="update-downloading"],
 .popup-notification-icon[popupid="update-manual"],
--- a/browser/themes/shared/places/editBookmarkPanel.inc.css
+++ b/browser/themes/shared/places/editBookmarkPanel.inc.css
@ -160,7 +160,7 @@ html|img#editBookmarkPanelFavicon[src] {
  margin-bottom: 0;
 }

-@media (-moz-proton) {
+@media (-moz-proton-doorhangers) {
 #editBookmarkPanel {
  font: caption;
 }
@ -277,7 +277,7 @@ html|img#editBookmarkPanelFavicon[src] {
 }
 } /** END Proton **/

-@media not (-moz-proton) {
+@media not (-moz-proton-doorhangers) {
 #editBookmarkPanelInfoArea {
  margin: 6px 8px 0;
 }
--- a/browser/themes/shared/tabs.inc.css
+++ b/browser/themes/shared/tabs.inc.css
@ -1099,7 +1099,7 @@
  font-weight: bold;
 }

-@media not (-moz-proton) {
+@media not (-moz-proton-doorhangers) {
 .all-tabs-item[selected] {
  box-shadow: inset 4px 0 var(--blue-40);
 }
--- a/browser/themes/windows/downloads/downloads.css
+++ b/browser/themes/windows/downloads/downloads.css
@ -27,7 +27,7 @@
 }

@media (-moz-windows-default-theme) {
-  @media not (-moz-proton) {
+  @media not (-moz-proton-doorhangers) {
  @item@[verdict="Malware"]:not(:hover) {
    color: #aa1b08;
  }
--- a/browser/themes/windows/places/editBookmark.css
+++ b/browser/themes/windows/places/editBookmark.css
@ -2,7 +2,7 @@
 * 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/. */

-@media not (-moz-proton) {
+@media not (-moz-proton-doorhangers) {
 #editBookmarkPanelRows > vbox {
  margin-bottom: .5em;
 }
--- a/devtools/startup/DevToolsStartup.jsm
+++ b/devtools/startup/DevToolsStartup.jsm
@ -561,10 +561,9 @@ DevToolsStartup.prototype = {
      return;
    }

-    const protonEnabled = Services.prefs.getBoolPref(
-      "browser.proton.enabled",
-      false
-    );
+    const protonEnabled =
+      Services.prefs.getBoolPref("browser.proton.doorhangers.enabled", false) &&
+      Services.prefs.getBoolPref("browser.proton.enabled", false);
    const panelviewId = protonEnabled
      ? "appmenu-moreTools"
      : "PanelUI-developer";
--- a/layout/style/test/chrome/chrome-only-media-queries.js
+++ b/layout/style/test/chrome/chrome-only-media-queries.js
@ -29,6 +29,7 @@ const CHROME_ONLY_TOGGLES = [
  "-moz-proton",
  "-moz-proton-contextmenus",
  "-moz-proton-modals",
+  "-moz-proton-doorhangers",
  "-moz-proton-places-tooltip",
 ];

--- a/servo/components/style/gecko/media_features.rs
+++ b/servo/components/style/gecko/media_features.rs
@ -663,7 +663,7 @@ macro_rules! bool_pref_feature {
 /// to support new types in these entries and (2) ensuring that either
 /// nsPresContext::MediaFeatureValuesChanged is called when the value that
 /// would be returned by the evaluator function could change.
-pub static MEDIA_FEATURES: [MediaFeatureDescription; 61] = [
+pub static MEDIA_FEATURES: [MediaFeatureDescription; 62] = [
    feature!(
        atom!("width"),
        AllowsRanges::Yes,
@ -907,5 +907,6 @@ pub static MEDIA_FEATURES: [MediaFeatureDescription; 61] = [
    bool_pref_feature!(atom!("-moz-proton"), "browser.proton.enabled"),
    bool_pref_feature!(atom!("-moz-proton-modals"), "browser.proton.modals.enabled"),
    bool_pref_feature!(atom!("-moz-proton-contextmenus"), "browser.proton.contextmenus.enabled"),
+    bool_pref_feature!(atom!("-moz-proton-doorhangers"), "browser.proton.doorhangers.enabled"),
    bool_pref_feature!(atom!("-moz-proton-places-tooltip"), "browser.proton.places-tooltip.enabled"),
 ];
--- a/toolkit/components/passwordmgr/LoginManagerPrompter.jsm
+++ b/toolkit/components/passwordmgr/LoginManagerPrompter.jsm
@ -33,8 +33,8 @@ XPCOMUtils.defineLazyGetter(this, "strBundle", () => {

 XPCOMUtils.defineLazyPreferenceGetter(
  this,
-  "gProtonEnabled",
-  "browser.proton.enabled",
+  "gProtonDoorhangersEnabled",
+  "browser.proton.doorhangers.enabled",
  false
 );

@ -778,7 +778,7 @@ class LoginManagerPrompter {
      showOptions
    );

-    if (gProtonEnabled) {
+    if (gProtonDoorhangersEnabled) {
      mainAction.disableHighlight = true;
    }

--- a/toolkit/themes/linux/global/popupnotification.css
+++ b/toolkit/themes/linux/global/popupnotification.css
@ -5,7 +5,7 @@
 %endif
 %include ../../shared/popupnotification.inc.css

-@media not (-moz-proton) {
+@media not (-moz-proton-doorhangers) {
 .popup-notification-secondary-button:not([hidden="true"]) ~ .popup-notification-primary-button:not([default]) {
  border-inline-start: 1px solid var(--panel-separator-color);
 }
--- a/toolkit/themes/osx/global/popupnotification.css
+++ b/toolkit/themes/osx/global/popupnotification.css
@ -5,7 +5,7 @@
 %endif
 %include ../../shared/popupnotification.inc.css

-@media not (-moz-proton) {
+@media not (-moz-proton-doorhangers) {
 .popup-notification-secondary-button:not([hidden="true"]) ~ .popup-notification-primary-button:not([default]) {
  border-inline-start: 1px solid var(--panel-separator-color);
 }
--- a/toolkit/themes/shared/global.inc.css
+++ b/toolkit/themes/shared/global.inc.css
@ -33,7 +33,7 @@
  --toolbarbutton-icon-fill: currentColor;
 }

-@media not (-moz-proton) {
+@media not (-moz-proton-doorhangers) {
 :root {
  --popup-notification-body-width: 25em;
 }
@ -161,7 +161,7 @@ xul|label[disabled="true"] {

 /* Panel footers */

-@media not (-moz-proton) {
+@media not (-moz-proton-doorhangers) {
 .panel-footer {
  background-color: var(--arrowpanel-dimmed);
 }
--- a/toolkit/themes/shared/popupnotification.inc.css
+++ b/toolkit/themes/shared/popupnotification.inc.css
@ -76,7 +76,7 @@
  flex: 1;
 }

-@media not (-moz-proton) {
+@media not (-moz-proton-doorhangers) {
 .popup-notification-dropmarker {
  flex: none;
  padding: 0 15px !important;
@ -112,7 +112,11 @@
 }

 /** PopupNotifications **/
-@media (-moz-proton) {
+@media (-moz-proton-doorhangers) {
+popupnotification {
+  font: caption;
+}
+
 .panel-footer {
  justify-content: flex-end;
  margin: 8px 16px 16px;
--- a/toolkit/themes/windows/global/popupnotification.css
+++ b/toolkit/themes/windows/global/popupnotification.css
@ -17,7 +17,7 @@
  order: -1;
 }

-@media not (-moz-proton) {
+@media not (-moz-proton-doorhangers) {
 .popup-notification-secondary-button:not([hidden="true"]) ~ .popup-notification-primary-button:not([default]) {
  border-inline-end: 1px solid var(--panel-separator-color);
 }
--- a/widget/nsXPLookAndFeel.cpp
+++ b/widget/nsXPLookAndFeel.cpp
@ -420,6 +420,7 @@ static constexpr nsLiteralCString kMediaQueryPrefs[] = {
    "browser.proton.enabled"_ns,
    "browser.proton.contextmenus.enabled"_ns,
    "browser.proton.modals.enabled"_ns,
+    "browser.proton.doorhangers.enabled"_ns,
    "browser.proton.places-tooltip.enabled"_ns,
    "browser.theme.toolbar-theme"_ns,
 };