wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-21 07:47:32 +09:00
Code Issues Projects Releases Packages Wiki Activity

USBPermissionRequest pt.2

Browse source
This commit is contained in:
wuggy 2026-09-19 14:55:56 -07:00
commit e1e5fbf698
2 changed files with 52 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

58
browser/modules/PermissionUI.jsm
View file

@ -490,19 +490,24 @@ function USBPermissionPrompt(request) {
function getUSBDeviceChoices(request) {
let choices = [];
let types = request.types.QueryInterface(Ci.nsIArray);
if (!types.length) {
return choices;
}
try {
let types = request.types.QueryInterface(Ci.nsIArray);
if (!types.length) {
return choices;
}
let type = types.queryElementAt(0, Ci.nsIContentPermissionType);
let options = type.options;
if (!options) {
return choices;
}
let type = types.queryElementAt(0, Ci.nsIContentPermissionType);
let options = type.options;
if (!options) {
return choices;
}
for (let i = 0; i < options.length; ++i) {
choices.push(options.queryElementAt(i, Ci.nsISupportsString).data);
for (let i = 0; i < options.length; ++i) {
let option = options.queryElementAt(i, Ci.nsISupportsString);
choices.push(option.data || "USB device");
}
} catch (ex) {
Cu.reportError("Unable to read WebUSB device choices: " + ex);
}
return choices;
}
@ -510,6 +515,37 @@ function getUSBDeviceChoices(request) {
USBPermissionPrompt.prototype = {
__proto__: PermissionPromptForRequestPrototype,
// UXP builds do not always expose the requesting <browser> through
// nsIContentPermissionRequest.element. Resolve the active browser window
// here so the USB doorhanger is still shown for those requests.
get browser() {
let element = this.request.element;
if (element && element.ownerGlobal && element.ownerGlobal.PopupNotifications) {
return element;
}
try {
let window = this.request.window;
if (window) {
let browser = window.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIWebNavigation)
.QueryInterface(Ci.nsIDocShell)
.chromeEventHandler;
if (browser && browser.ownerGlobal &&
browser.ownerGlobal.PopupNotifications) {
return browser;
}
}
} catch (ex) {
// Fall through to the most recent browser window below.
}
let chromeWindow = Services.wm.getMostRecentWindow("navigator:browser");
return chromeWindow && chromeWindow.gBrowser
? chromeWindow.gBrowser.selectedBrowser
: element;
},
get notificationID() {
return "web-usb";
},