Index: android_webview/browser/aw_permission_manager.cc |
diff --git a/android_webview/browser/aw_permission_manager.cc b/android_webview/browser/aw_permission_manager.cc |
index e6eafa0552eab261fa04272956fcd4b1d1e6d3de..907dfe6475fdb96eb4cc7c9aa9a0a31157fc4fd5 100644 |
--- a/android_webview/browser/aw_permission_manager.cc |
+++ b/android_webview/browser/aw_permission_manager.cc |
@@ -489,12 +489,15 @@ void AwPermissionManager::ResetPermission(PermissionType permission, |
result_cache_->ClearResult(permission, requesting_origin, embedding_origin); |
} |
-PermissionStatus AwPermissionManager::GetPermissionStatus( |
+PermissionStatus AwPermissionManager::GetPermissionStatusForFrame( |
PermissionType permission, |
- const GURL& requesting_origin, |
- const GURL& embedding_origin) { |
+ content::RenderFrameHost* render_frame_host, |
+ const GURL& requesting_origin) { |
// Method is called outside the Permissions API only for this permission. |
if (permission == PermissionType::PROTECTED_MEDIA_IDENTIFIER) { |
+ content::WebContents* web_contents = |
+ content::WebContents::FromRenderFrameHost(render_frame_host); |
+ GURL embedding_origin = web_contents->GetLastCommittedURL().GetOrigin(); |
return result_cache_->GetResult(permission, requesting_origin, |
embedding_origin); |
} else if (permission == PermissionType::MIDI) { |
@@ -504,6 +507,12 @@ PermissionStatus AwPermissionManager::GetPermissionStatus( |
return PermissionStatus::DENIED; |
} |
+PermissionStatus AwPermissionManager::GetPermissionStatusForWorker( |
+ PermissionType permission, |
+ const GURL& requesting_origin) { |
+ return PermissionStatus::DENIED; |
benwells
2017/05/30 06:49:12
Can you add a comment why this is always denied?
benwells
2017/05/31 01:48:10
Nit: ^^^
raymes
2017/06/01 02:54:40
Done.
|
+} |
+ |
int AwPermissionManager::SubscribePermissionStatusChange( |
PermissionType permission, |
const GURL& requesting_origin, |