diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index ae86171b9a37..b5251505b4e7 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -2130,8 +2130,6 @@ pref("privacy.userContext.newTabContainerOnLeftClick.enabled", false); // Set to true to allow the user to silence all notifications when // sharing the screen. pref("privacy.webrtc.allowSilencingNotifications", true); -// Set to true to use the legacy WebRTC global indicator -pref("privacy.webrtc.legacyGlobalIndicator", false); pref("privacy.webrtc.hideGlobalIndicator", false); // Set to true to add toggles to the WebRTC indicator for globally diff --git a/browser/modules/webrtcUI.sys.mjs b/browser/modules/webrtcUI.sys.mjs index 357ee32ca548..b51346795057 100644 --- a/browser/modules/webrtcUI.sys.mjs +++ b/browser/modules/webrtcUI.sys.mjs @@ -89,12 +89,6 @@ export var webrtcUI = { Services.obs.addObserver(this, "browser-delayed-startup-finished"); this.initialized = true; - XPCOMUtils.defineLazyPreferenceGetter( - this, - "useLegacyGlobalIndicator", - "privacy.webrtc.legacyGlobalIndicator", - true - ); XPCOMUtils.defineLazyPreferenceGetter( this, "deviceGracePeriodTimeoutMs", @@ -876,10 +870,7 @@ export var webrtcUI = { } } } else if (gIndicatorWindow) { - if ( - !webrtcUI.useLegacyGlobalIndicator && - gIndicatorWindow.closingInternally - ) { + if (gIndicatorWindow.closingInternally) { // Before calling .close(), we call .closingInternally() to allow us to // differentiate between situations where the indicator closes because // we no longer want to show the indicator (this case), and cases where @@ -979,35 +970,16 @@ export var webrtcUI = { }; function getGlobalIndicator() { - if (!webrtcUI.useLegacyGlobalIndicator) { - const INDICATOR_CHROME_URI = - "chrome://browser/content/webrtcIndicator.xhtml"; - let features = "chrome,titlebar=no,alwaysontop,minimizable,dialog"; + const INDICATOR_CHROME_URI = "chrome://browser/content/webrtcIndicator.xhtml"; + let features = "chrome,titlebar=no,alwaysontop,minimizable,dialog"; - return Services.ww.openWindow( - null, - INDICATOR_CHROME_URI, - "_blank", - features, - null - ); - } - - if (AppConstants.platform != "macosx") { - const LEGACY_INDICATOR_CHROME_URI = - "chrome://browser/content/webrtcLegacyIndicator.xhtml"; - const features = "chrome,dialog=yes,titlebar=no,popup=yes"; - - return Services.ww.openWindow( - null, - LEGACY_INDICATOR_CHROME_URI, - "_blank", - features, - null - ); - } - - return new MacOSWebRTCStatusbarIndicator(); + return Services.ww.openWindow( + null, + INDICATOR_CHROME_URI, + "_blank", + features, + null + ); } /**