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

expose handler from session and remove permission-request event

Browse source
This commit is contained in:
Robo 2016-02-01 03:05:34 +05:30
parent 04c3e083fb
commit db26dcaf4c
14 changed files with 134 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

32
atom/browser/atom_permission_manager.h
View file

@ -7,10 +7,13 @@
#include <map>
#include "base/callback_forward.h"
#include "base/macros.h"
#include "base/callback.h"
#include "content/public/browser/permission_manager.h"
namespace content {
class WebContents;
}
namespace atom {
class AtomPermissionManager : public content::PermissionManager {
@ -21,22 +24,13 @@ class AtomPermissionManager : public content::PermissionManager {
using ResponseCallback =
base::Callback<void(content::PermissionStatus)>;
using RequestHandler =
base::Callback<void(content::PermissionType,
base::Callback<void(content::WebContents*,
content::PermissionType,
const ResponseCallback&)>;
// Handler to dispatch permission requests in JS.
void SetPermissionRequestHandler(int id, const RequestHandler& handler);
void SetPermissionRequestHandler(const RequestHandler& handler);
void RequestPermission(
content::PermissionType permission,
content::RenderFrameHost* render_frame_host,
const GURL& origin,
const base::Callback<void(bool)>& callback);
void OnPermissionResponse(
const base::Callback<void(bool)>& callback,
content::PermissionStatus status);
protected:
// content::PermissionManager:
int RequestPermission(
content::PermissionType permission,
@ -44,6 +38,14 @@ class AtomPermissionManager : public content::PermissionManager {
const GURL& requesting_origin,
bool user_gesture,
const ResponseCallback& callback) override;
protected:
void OnPermissionResponse(int request_id,
const GURL& url,
const ResponseCallback& callback,
content::PermissionStatus status);
// content::PermissionManager:
void CancelPermissionRequest(int request_id) override;
void ResetPermission(content::PermissionType permission,
const GURL& requesting_origin,
@ -63,7 +65,7 @@ class AtomPermissionManager : public content::PermissionManager {
void UnsubscribePermissionStatusChange(int subscription_id) override;
private:
std::map<int, RequestHandler> request_handler_map_;
RequestHandler request_handler_;
std::map<int, ResponseCallback> pending_requests_;