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

Remove user_gesture parameter from PermissionManager::RequestPermission

Browse source
This commit is contained in:
Brian R. Bondy 2016-04-27 14:20:43 -04:00 • committed by Cheng Zhao
parent c04353a845
commit d889bdef49
3 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/atom_permission_manager.cc
View file

@ -51,7 +51,6 @@ int AtomPermissionManager::RequestPermission(
content::PermissionType permission, content::PermissionType permission,
content::RenderFrameHost* render_frame_host, content::RenderFrameHost* render_frame_host,
const GURL& requesting_origin, const GURL& requesting_origin,
bool user_gesture,
const ResponseCallback& response_callback) { const ResponseCallback& response_callback) {
int process_id = render_frame_host->GetProcess()->GetID(); int process_id = render_frame_host->GetProcess()->GetID();
@ -82,7 +81,6 @@ int AtomPermissionManager::RequestPermissions(
const std::vector<content::PermissionType>& permissions, const std::vector<content::PermissionType>& permissions,
content::RenderFrameHost* render_frame_host, content::RenderFrameHost* render_frame_host,
const GURL& requesting_origin, const GURL& requesting_origin,
bool user_gesture,
const base::Callback<void( const base::Callback<void(
const std::vector<content::PermissionStatus>&)>& callback) { const std::vector<content::PermissionStatus>&)>& callback) {
// FIXME(zcbenz): Just ignore multiple permissions request for now. // FIXME(zcbenz): Just ignore multiple permissions request for now.

2
atom/browser/atom_permission_manager.h
View file

@ -37,13 +37,11 @@ class AtomPermissionManager : public content::PermissionManager {
content::PermissionType permission, content::PermissionType permission,
content::RenderFrameHost* render_frame_host, content::RenderFrameHost* render_frame_host,
const GURL& requesting_origin, const GURL& requesting_origin,
bool user_gesture,
const ResponseCallback& callback) override; const ResponseCallback& callback) override;
int RequestPermissions( int RequestPermissions(
const std::vector<content::PermissionType>& permissions, const std::vector<content::PermissionType>& permissions,
content::RenderFrameHost* render_frame_host, content::RenderFrameHost* render_frame_host,
const GURL& requesting_origin, const GURL& requesting_origin,
bool user_gesture,
const base::Callback<void( const base::Callback<void(
const std::vector<content::PermissionStatus>&)>& callback) override; const std::vector<content::PermissionStatus>&)>& callback) override;

2
atom/browser/web_contents_permission_helper.cc
View file

@ -60,7 +60,7 @@ void WebContentsPermissionHelper::RequestPermission(
web_contents_->GetBrowserContext()->GetPermissionManager()); web_contents_->GetBrowserContext()->GetPermissionManager());
auto origin = web_contents_->GetLastCommittedURL(); auto origin = web_contents_->GetLastCommittedURL();
permission_manager->RequestPermission( permission_manager->RequestPermission(
permission, rfh, origin, user_gesture, permission, rfh, origin,
base::Bind(&OnPermissionResponse, callback)); base::Bind(&OnPermissionResponse, callback));
} }