chrome/browser/geolocation/geolocation_permission_context.cc - Issue 955383003: ContentBrowserClient::RequestPermission replies with PermissionStatus instead of bool.

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: chrome/browser/geolocation/geolocation_permission_context.cc

Issue 955383003: ContentBrowserClient::RequestPermission replies with PermissionStatus instead of bool. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix android geolocation breakage Created 5 years, 10 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

« chrome/browser/content_settings/permission_context_base.cc ('K') | « chrome/browser/content_settings/permission_queue_controller_unittest.cc ('k') | chrome/browser/geolocation/geolocation_permission_context_android.cc » ('j') | content/public/browser/content_browser_client.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/geolocation/geolocation_permission_context.cc

diff --git a/chrome/browser/geolocation/geolocation_permission_context.cc b/chrome/browser/geolocation/geolocation_permission_context.cc

index a183871da7fbe65a1e31966f1111826818804084..7110b4fdbfea8829568a0c5db7e0787421c463f3 100644

--- a/chrome/browser/geolocation/geolocation_permission_context.cc

+++ b/chrome/browser/geolocation/geolocation_permission_context.cc

@@ -36,12 +36,14 @@ void GeolocationPermissionContext::RequestPermission(

web_contents, id, id.bridge_id(), requesting_frame_origin, user_gesture,

callback, &permission_set, &new_permission)) {

if (permission_set) {

+ ContentSetting content_setting =

+ new_permission ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK;

NotifyPermissionSet(id,

requesting_frame_origin,

web_contents->GetLastCommittedURL().GetOrigin(),

callback,

true,

- new_permission);

+ content_setting);

}

return;

}