From d889bdef491adbe547dce75b66ef7039e4e18b44 Mon Sep 17 00:00:00 2001 From: "Brian R. Bondy" Date: Wed, 27 Apr 2016 14:20:43 -0400 Subject: [PATCH] Remove user_gesture parameter from PermissionManager::RequestPermission --- atom/browser/atom_permission_manager.cc | 2 -- atom/browser/atom_permission_manager.h | 2 -- atom/browser/web_contents_permission_helper.cc | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/atom/browser/atom_permission_manager.cc b/atom/browser/atom_permission_manager.cc index 144643178504..a102a1cb5c9a 100644 --- a/atom/browser/atom_permission_manager.cc +++ b/atom/browser/atom_permission_manager.cc @@ -51,7 +51,6 @@ int AtomPermissionManager::RequestPermission( content::PermissionType permission, content::RenderFrameHost* render_frame_host, const GURL& requesting_origin, - bool user_gesture, const ResponseCallback& response_callback) { int process_id = render_frame_host->GetProcess()->GetID(); @@ -82,7 +81,6 @@ int AtomPermissionManager::RequestPermissions( const std::vector& permissions, content::RenderFrameHost* render_frame_host, const GURL& requesting_origin, - bool user_gesture, const base::Callback&)>& callback) { // FIXME(zcbenz): Just ignore multiple permissions request for now. diff --git a/atom/browser/atom_permission_manager.h b/atom/browser/atom_permission_manager.h index e16893fd8bb5..7361e6bc0541 100644 --- a/atom/browser/atom_permission_manager.h +++ b/atom/browser/atom_permission_manager.h @@ -37,13 +37,11 @@ class AtomPermissionManager : public content::PermissionManager { content::PermissionType permission, content::RenderFrameHost* render_frame_host, const GURL& requesting_origin, - bool user_gesture, const ResponseCallback& callback) override; int RequestPermissions( const std::vector& permissions, content::RenderFrameHost* render_frame_host, const GURL& requesting_origin, - bool user_gesture, const base::Callback&)>& callback) override; diff --git a/atom/browser/web_contents_permission_helper.cc b/atom/browser/web_contents_permission_helper.cc index 088e0b52d04b..83274591e71e 100644 --- a/atom/browser/web_contents_permission_helper.cc +++ b/atom/browser/web_contents_permission_helper.cc @@ -60,7 +60,7 @@ void WebContentsPermissionHelper::RequestPermission( web_contents_->GetBrowserContext()->GetPermissionManager()); auto origin = web_contents_->GetLastCommittedURL(); permission_manager->RequestPermission( - permission, rfh, origin, user_gesture, + permission, rfh, origin, base::Bind(&OnPermissionResponse, callback)); }