Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-23 01:58:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix merge

Browse Source
This commit is contained in:
Simon Siefke
2024-11-28 18:49:02 +01:00
parent fdc5a008b1
commit 82f65a4e45
1 changed files with 3 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/vs/code/electron-main/app.ts
View File

@@ -169,42 +169,25 @@ export class CodeApplication extends Disposable {
'clipboard-sanitized-write',
]);
<<<<<<< HEAD
const allowedPermissionsDefault = new Set(['font-access', 'local-fonts']);
=======
const allowedPermissionsInCore = new Set([
'media',
'font-access',
'local-fonts',
]);
>>>>>>> origin/main
session.defaultSession.setPermissionRequestHandler((_webContents, permission, callback, details) => {
if (isUrlFromWebview(details.requestingUrl)) {
return callback(allowedPermissionsInWebview.has(permission));
}
<<<<<<< HEAD
return callback(allowedPermissionsDefault.has(permission));
=======
if (isUrlFromWindow(details.requestingUrl)) {
return callback(allowedPermissionsInCore.has(permission));
}
return callback(false);
>>>>>>> origin/main
return callback(allowedPermissionsInCore.has(permission));
});
session.defaultSession.setPermissionCheckHandler((_webContents, permission, _origin, details) => {
if (isUrlFromWebview(details.requestingUrl)) {
return allowedPermissionsInWebview.has(permission);
}
<<<<<<< HEAD
return allowedPermissionsDefault.has(permission);
=======
if (isUrlFromWindow(details.requestingUrl)) {
return allowedPermissionsInCore.has(permission);
}
return false;
>>>>>>> origin/main
return allowedPermissionsInCore.has(permission);
});
//#endregion