Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6748)

Unified Diff: chrome/browser/permissions/permission_manager.cc

Issue 2745453002: Add requesting origin param to PermissionManager::GetPermissionStatusForFrame (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/permissions/permission_manager.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/permissions/permission_manager.cc
diff --git a/chrome/browser/permissions/permission_manager.cc b/chrome/browser/permissions/permission_manager.cc
index 3554494de2ce3bcee2d67350928704962bec582b..45d34f028e78c14fe8b13415cebf410535127930 100644
--- a/chrome/browser/permissions/permission_manager.cc
+++ b/chrome/browser/permissions/permission_manager.cc
@@ -340,13 +340,13 @@ PermissionResult PermissionManager::GetPermissionStatus(
PermissionResult PermissionManager::GetPermissionStatusForFrame(
ContentSettingsType permission,
- content::RenderFrameHost* render_frame_host) {
+ content::RenderFrameHost* render_frame_host,
+ const GURL& requesting_origin) {
content::WebContents* web_contents =
content::WebContents::FromRenderFrameHost(render_frame_host);
GURL embedding_origin = web_contents->GetLastCommittedURL().GetOrigin();
- return GetPermissionStatusHelper(
- permission, render_frame_host,
- render_frame_host->GetLastCommittedURL().GetOrigin(), embedding_origin);
+ return GetPermissionStatusHelper(permission, render_frame_host,
+ requesting_origin, embedding_origin);
}
int PermissionManager::RequestPermission(
« no previous file with comments | « chrome/browser/permissions/permission_manager.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698