content/shell/browser/layout_test/layout_test_permission_manager.cc - Issue 1342833002: permissions: handle request ids for permissions in permission manager

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 1342833002: permissions: handle request ids for permissions in permission manager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address review comment Created 5 years, 2 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 21300f30e3c44f13d11f453dbe925c573692426e..e354f7b700e33da8ca06c6c1fafdba0363b2f31b 100644

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

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

@@ -61,10 +61,9 @@ LayoutTestPermissionManager::LayoutTestPermissionManager()

LayoutTestPermissionManager::~LayoutTestPermissionManager() {

}

-void LayoutTestPermissionManager::RequestPermission(

+int LayoutTestPermissionManager::RequestPermission(

PermissionType permission,

RenderFrameHost* render_frame_host,

- int request_id,

const GURL& requesting_origin,

bool user_gesture,

const base::Callback<void(PermissionStatus)>& callback) {

@@ -74,6 +73,7 @@ void LayoutTestPermissionManager::RequestPermission(

permission, requesting_origin,

WebContents::FromRenderFrameHost(render_frame_host)

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

+ return kNoPendingOperation;

}

void LayoutTestPermissionManager::CancelPermissionRequest(