| Index: chrome/browser/permissions/permission_manager.h
|
| diff --git a/chrome/browser/permissions/permission_manager.h b/chrome/browser/permissions/permission_manager.h
|
| index 979b91e1a0d5bbf63230e621052ffcfd5a9e9f2c..0dbc1cfd046e86281a902e7bea0121c455a0e7ef 100644
|
| --- a/chrome/browser/permissions/permission_manager.h
|
| +++ b/chrome/browser/permissions/permission_manager.h
|
| @@ -58,9 +58,13 @@ class PermissionManager : public KeyedService,
|
| // 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.
|
| + // TODO(raymes): Currently we still pass the |requesting_origin| as a separate
|
| + // parameter because we can't yet guarantee that it matches the last committed
|
| + // origin of the RenderFrameHost. See crbug.com/698985.
|
| PermissionResult GetPermissionStatusForFrame(
|
| ContentSettingsType permission,
|
| - content::RenderFrameHost* render_frame_host);
|
| + content::RenderFrameHost* render_frame_host,
|
| + const GURL& requesting_origin);
|
|
|
| // content::PermissionManager implementation.
|
| int RequestPermission(
|
|
|