| Index: content/shell/browser/shell_permission_manager.h
|
| diff --git a/content/shell/browser/shell_permission_manager.h b/content/shell/browser/shell_permission_manager.h
|
| index b91837257106c56627427de4107b7f3820954bec..b210a1661ab2bedb91d0b46bb18a6b2df90859e9 100644
|
| --- a/content/shell/browser/shell_permission_manager.h
|
| +++ b/content/shell/browser/shell_permission_manager.h
|
| @@ -23,10 +23,14 @@ class ShellPermissionManager : public PermissionManager {
|
| const GURL& requesting_origin,
|
| bool user_gesture,
|
| const base::Callback<void(PermissionStatus)>& callback) override;
|
| - void CancelPermissionRequest(PermissionType permission,
|
| - RenderFrameHost* render_frame_host,
|
| - int request_id,
|
| - const GURL& requesting_origin) override;
|
| + int RequestPermissions(
|
| + const std::vector<PermissionType>& permission,
|
| + RenderFrameHost* render_frame_host,
|
| + const GURL& requesting_origin,
|
| + bool user_gesture,
|
| + const base::Callback<void(
|
| + const std::vector<PermissionStatus>&)>& callback) override;
|
| + void CancelPermissionRequest(int request_id) override;
|
| void ResetPermission(PermissionType permission,
|
| const GURL& requesting_origin,
|
| const GURL& embedding_origin) override;
|
|
|