content/shell/browser/layout_test/layout_test_permission_manager.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: content/shell/browser/layout_test/layout_test_permission_manager.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 | « content/shell/browser/layout_test/layout_test_permission_manager.h ('k') | content/shell/browser/shell_permission_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/browser/layout_test/layout_test_permission_manager.cc

diff --git a/content/shell/browser/layout_test/layout_test_permission_manager.cc b/content/shell/browser/layout_test/layout_test_permission_manager.cc

index 8445e68b4beaef83efea6fdd04f7d76962fa36b8..21300f30e3c44f13d11f453dbe925c573692426e 100644

--- a/content/shell/browser/layout_test/layout_test_permission_manager.cc

+++ b/content/shell/browser/layout_test/layout_test_permission_manager.cc

@@ -63,7 +63,7 @@ LayoutTestPermissionManager::~LayoutTestPermissionManager() {

void LayoutTestPermissionManager::RequestPermission(

PermissionType permission,

- WebContents* web_contents,

+ RenderFrameHost* render_frame_host,

int request_id,

const GURL& requesting_origin,

bool user_gesture,

@@ -72,12 +72,13 @@ void LayoutTestPermissionManager::RequestPermission(

callback.Run(GetPermissionStatus(

permission, requesting_origin,

- web_contents->GetLastCommittedURL().GetOrigin()));

+ WebContents::FromRenderFrameHost(render_frame_host)

+ ->GetLastCommittedURL().GetOrigin()));

}

void LayoutTestPermissionManager::CancelPermissionRequest(

PermissionType permission,

- WebContents* web_contents,

+ RenderFrameHost* render_frame_host,

int request_id,

const GURL& requesting_origin) {

DCHECK_CURRENTLY_ON(BrowserThread::UI);