android_webview/native/aw_contents.cc - Issue 1158813002: Use RenderFrameHost for ::RequestPermission() and ::CancelPermission().

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: android_webview/native/aw_contents.cc

Issue 1158813002: Use RenderFrameHost for ::RequestPermission() and ::CancelPermission(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: build fixes Created 5 years, 7 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 | « android_webview/browser/aw_permission_manager.cc ('k') | chrome/browser/content_settings/permission_context_base_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/native/aw_contents.cc

diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc

index c7af67fb7f51d095989becbfe15a2c361f37295c..732d8ffca2b942b55bb3308097905c1eb73811f2 100644

--- a/android_webview/native/aw_contents.cc

+++ b/android_webview/native/aw_contents.cc

@@ -158,9 +158,11 @@ AwContents* AwContents::FromID(int render_process_id, int render_view_id) {

// static

AwBrowserPermissionRequestDelegate* AwBrowserPermissionRequestDelegate::FromID(

- int render_process_id, int render_view_id) {

- AwContents* aw_contents = AwContents::FromID(render_process_id,

- render_view_id);

+ int render_process_id, int render_frame_id) {

+ AwContents* aw_contents = AwContents::FromWebContents(

+ content::WebContents::FromRenderFrameHost(

+ content::RenderFrameHost::FromID(render_process_id,

+ render_frame_id)));

return implicit_cast<AwBrowserPermissionRequestDelegate*>(aw_contents);

}