nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1865382 - Get rid of legacy indicator branches in WebRTC UI. r=pbz

Browse source 
Depends on D193932

Differential Revision: https://phabricator.services.mozilla.com/D193933
This commit is contained in:
Mike Conley 2023-11-27 16:43:32 +00:00
parent 152e38ff67
commit 73a56de07f
2 changed files with 10 additions and 40 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
browser/app/profile/firefox.js
View file

@ -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

48
browser/modules/webrtcUI.sys.mjs
View file

@ -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
);
}
/**