| Index: chrome/browser/permissions/permission_manager.h
|
| diff --git a/chrome/browser/permissions/permission_manager.h b/chrome/browser/permissions/permission_manager.h
|
| index 033b56a7400c51dfcaa30fe3f35423ecdc3ae232..979b91e1a0d5bbf63230e621052ffcfd5a9e9f2c 100644
|
| --- a/chrome/browser/permissions/permission_manager.h
|
| +++ b/chrome/browser/permissions/permission_manager.h
|
| @@ -55,6 +55,13 @@ class PermissionManager : public KeyedService,
|
| const GURL& requesting_origin,
|
| const GURL& embedding_origin);
|
|
|
| + // Returns the permission status for a given frame. This should be preferred
|
| + // over GetPermissionStatus as additional checks can be performed when we know
|
| + // the exact context the request is coming from.
|
| + PermissionResult GetPermissionStatusForFrame(
|
| + ContentSettingsType permission,
|
| + content::RenderFrameHost* render_frame_host);
|
| +
|
| // content::PermissionManager implementation.
|
| int RequestPermission(
|
| content::PermissionType permission,
|
| @@ -119,6 +126,12 @@ class PermissionManager : public KeyedService,
|
| ContentSettingsType content_type,
|
| std::string resource_identifier) override;
|
|
|
| + PermissionResult GetPermissionStatusHelper(
|
| + ContentSettingsType permission,
|
| + content::RenderFrameHost* render_frame_host,
|
| + const GURL& requesting_origin,
|
| + const GURL& embedding_origin);
|
| +
|
| Profile* profile_;
|
| PendingRequestsMap pending_requests_;
|
| SubscriptionsMap subscriptions_;
|
|
|