Index: chrome/browser/permissions/permission_manager.h |
diff --git a/chrome/browser/permissions/permission_manager.h b/chrome/browser/permissions/permission_manager.h |
index 8f21c6501ba34df4c16d6db1e5eff2c0bb2d471c..a4fd3b3bccb6b38b7c8ac38548027100d8a37db5 100644 |
--- a/chrome/browser/permissions/permission_manager.h |
+++ b/chrome/browser/permissions/permission_manager.h |
@@ -35,11 +35,16 @@ class PermissionManager : public KeyedService, |
content::RenderFrameHost* render_frame_host, |
const GURL& requesting_origin, |
bool user_gesture, |
- const base::Callback<void(content::PermissionStatus)>& callback) override; |
- void CancelPermissionRequest(content::PermissionType permission, |
- content::RenderFrameHost* render_frame_host, |
- int request_id, |
- const GURL& requesting_origin) override; |
+ const base::Callback<void( |
+ content::PermissionStatus)>& callback) override; |
+ int RequestPermissions( |
+ const std::vector<content::PermissionType>& permissions, |
+ content::RenderFrameHost* render_frame_host, |
+ const GURL& requesting_origin, |
+ bool user_gesture, |
+ const base::Callback<void( |
+ const std::vector<content::PermissionStatus>&)>& callback) override; |
+ void CancelPermissionRequest(int request_id) override; |
void ResetPermission(content::PermissionType permission, |
const GURL& requesting_origin, |
const GURL& embedding_origin) override; |
@@ -64,10 +69,14 @@ class PermissionManager : public KeyedService, |
struct Subscription; |
using SubscriptionsMap = IDMap<Subscription, IDMapOwnPointer>; |
- void OnPermissionRequestResponse( |
+ void OnPermissionsRequestResponse( |
int request_id, |
- const base::Callback<void(content::PermissionStatus)>& callback, |
+ int type_index, |
ContentSetting content_setting); |
+ void OnPermissionsRequestResponseStatus( |
+ int request_id, |
+ int type_index, |
+ content::PermissionStatus status); |
// Not all WebContents are able to display permission requests. If the PBM |
// is required but missing for |web_contents|, don't pass along the request. |