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

add spec for new permissions

Browse source
This commit is contained in:
Robo 2016-01-30 19:01:10 +05:30
parent 2a278ceb8f
commit f7556de9fb
12 changed files with 61 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
atom/browser/atom_permission_manager.cc
View file

@ -4,6 +4,7 @@
#include "atom/browser/atom_permission_manager.h"
#include "content/public/browser/child_process_security_policy.h"
#include "content/public/browser/permission_type.h"
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/render_process_host.h"
@ -53,8 +54,14 @@ int AtomPermissionManager::RequestPermission(
const GURL& requesting_origin,
bool user_gesture,
const ResponseCallback& callback) {
auto request_handler =
request_handler_map_.find(render_frame_host->GetProcess()->GetID());
int process_id = render_frame_host->GetProcess()->GetID();
auto request_handler = request_handler_map_.find(process_id);
if (permission == content::PermissionType::MIDI_SYSEX) {
content::ChildProcessSecurityPolicy::GetInstance()->
GrantSendMidiSysExMessage(process_id);
}
if (request_handler != request_handler_map_.end()) {
pending_requests_[++request_id_] = callback;
request_handler->second.Run(permission, callback);
@ -83,7 +90,7 @@ content::PermissionStatus AtomPermissionManager::GetPermissionStatus(
content::PermissionType permission,
const GURL& requesting_origin,
const GURL& embedding_origin) {
return content::PERMISSION_STATUS_DENIED;
return content::PERMISSION_STATUS_GRANTED;
}
void AtomPermissionManager::RegisterPermissionUsage(