github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: cherry-pick 74c9ad9a53 from chromium (#28761)

Browse Source
This commit is contained in:
Pedro Pontes
2021-04-22 19:57:47 +02:00
committed by GitHub
parent f8738fb355
commit 840ff8d720
4 changed files with 959 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
shell/browser/electron_permission_manager.cc
View File

@@ -227,16 +227,17 @@ blink::mojom::PermissionStatus ElectronPermissionManager::GetPermissionStatus(
return blink::mojom::PermissionStatus::GRANTED;
}
int ElectronPermissionManager::SubscribePermissionStatusChange(
ElectronPermissionManager::SubscriptionId
ElectronPermissionManager::SubscribePermissionStatusChange(
content::PermissionType permission,
content::RenderFrameHost* render_frame_host,
const GURL& requesting_origin,
base::RepeatingCallback<void(blink::mojom::PermissionStatus)> callback) {
return -1;
return SubscriptionId();
}
void ElectronPermissionManager::UnsubscribePermissionStatusChange(
int subscription_id) {}
SubscriptionId subscription_id) {}
bool ElectronPermissionManager::CheckPermissionWithDetails(
content::PermissionType permission,

5
shell/browser/electron_permission_manager.h
View File

@@ -90,13 +90,14 @@ class ElectronPermissionManager : public content::PermissionControllerDelegate {
content::PermissionType permission,
const GURL& requesting_origin,
const GURL& embedding_origin) override;
int SubscribePermissionStatusChange(
SubscriptionId SubscribePermissionStatusChange(
content::PermissionType permission,
content::RenderFrameHost* render_frame_host,
const GURL& requesting_origin,
base::RepeatingCallback<void(blink::mojom::PermissionStatus)> callback)
override;
void UnsubscribePermissionStatusChange(int subscription_id) override;
void UnsubscribePermissionStatusChange(
SubscriptionId subscription_id) override;
private:
class PendingRequest;