content/browser/geolocation/geolocation_dispatcher_host.cc - Issue 571483002: Refactor content client to include a single Request/CancelPermission method.

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/browser/geolocation/geolocation_dispatcher_host.cc

Issue 571483002: Refactor content client to include a single Request/CancelPermission method. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@geoloc_permission

Patch Set: Created 6 years, 3 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/media/protected_media_identifier_permission_context.cc ('k') | content/browser/media/cdm/browser_cdm_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/geolocation/geolocation_dispatcher_host.cc

diff --git a/content/browser/geolocation/geolocation_dispatcher_host.cc b/content/browser/geolocation/geolocation_dispatcher_host.cc

index a778dfab2a3092096f9f43514f2c7b0d1475139d..2aaad9b6b9d6481c194a3939db6fb8af179e166a 100644

--- a/content/browser/geolocation/geolocation_dispatcher_host.cc

+++ b/content/browser/geolocation/geolocation_dispatcher_host.cc

@@ -156,7 +156,8 @@ void GeolocationDispatcherHost::OnRequestPermission(

render_frame_id, render_process_id, bridge_id);

pending_permissions_.push_back(pending_permission);

- GetContentClient()->browser()->RequestGeolocationPermission(

+ GetContentClient()->browser()->RequestPermission(

+ content::PERMISSION_GEOLOCATION,

web_contents(),

bridge_id,

requesting_frame,

@@ -176,8 +177,9 @@ void GeolocationDispatcherHost::OnCancelPermissionRequest(

if (pending_permissions_[i].render_process_id == render_process_id &&

pending_permissions_[i].render_frame_id == render_frame_id &&

pending_permissions_[i].bridge_id == bridge_id) {

- GetContentClient()->browser()->CancelGeolocationPermissionRequest(

- web_contents(), bridge_id, requesting_frame);

+ GetContentClient()->browser()->CancelPermissionRequest(

+ content::PERMISSION_GEOLOCATION,

+ web_contents(), bridge_id, requesting_frame);

pending_permissions_.erase(pending_permissions_.begin() + i);

return;