mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

refactor: use content::GlobalRenderFrameHostId (#38843)

Browse source 
Co-authored-by: Milan Burda <miburda@microsoft.com>
This commit is contained in:
Milan Burda 2023-06-20 15:32:31 +02:00 • committed by GitHub
parent 93024be3b2
commit 2b3902e526
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
shell/browser/electron_permission_manager.cc
View file

@ -55,8 +55,7 @@ class ElectronPermissionManager::PendingRequest {
PendingRequest(content::RenderFrameHost* render_frame_host,
const std::vector<blink::PermissionType>& permissions,
StatusesCallback callback)
: render_process_id_(render_frame_host->GetProcess()->GetID()),
render_frame_id_(render_frame_host->GetGlobalId()),
: render_frame_host_id_(render_frame_host->GetGlobalId()),
callback_(std::move(callback)),
permissions_(permissions),
results_(permissions.size(), blink::mojom::PermissionStatus::DENIED),
@ -70,7 +69,7 @@ class ElectronPermissionManager::PendingRequest {
const auto permission = permissions_[permission_id];
if (permission == blink::PermissionType::MIDI_SYSEX) {
content::ChildProcessSecurityPolicy::GetInstance()
->GrantSendMidiSysExMessage(render_process_id_);
->GrantSendMidiSysExMessage(render_frame_host_id_.child_id);
} else if (permission == blink::PermissionType::GEOLOCATION) {
ElectronBrowserMainParts::Get()
->GetGeolocationControl()
@ -83,7 +82,7 @@ class ElectronPermissionManager::PendingRequest {
}
content::RenderFrameHost* GetRenderFrameHost() {
return content::RenderFrameHost::FromID(render_frame_id_);
return content::RenderFrameHost::FromID(render_frame_host_id_);
}
bool IsComplete() const { return remaining_results_ == 0; }
@ -95,8 +94,7 @@ class ElectronPermissionManager::PendingRequest {
}
private:
int render_process_id_;
content::GlobalRenderFrameHostId render_frame_id_;
content::GlobalRenderFrameHostId render_frame_host_id_;
StatusesCallback callback_;
std::vector<blink::PermissionType> permissions_;
std::vector<blink::mojom::PermissionStatus> results_;