chrome/browser/geolocation/geolocation_permission_context.cc - Issue 7003098: Start refractoring extension permissions into ExtensionPermissionSet.

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 7003098: Start refractoring extension permissions into ExtensionPermissionSet. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix a bad merge Created 9 years, 6 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:

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 54ed24dcd5a983c2be6f044238c45151af40f706..a3323cecca9bb8fa97135fe6bdd06bb30a6e66ba 100644

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

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

@@ -519,7 +519,7 @@ void GeolocationPermissionContext::RequestGeolocationPermission(

const Extension* ext = extensions->GetExtensionByURL(requesting_frame);

if (!ext)

ext = extensions->GetExtensionByWebExtent(requesting_frame);

- if (ext && ext->HasApiPermission(Extension::kGeolocationPermission)) {

+ if (ext && ext->HasApiPermission(ExtensionAPIPermission::Geolocation())) {

ExtensionProcessManager* epm = profile_->GetExtensionProcessManager();

RenderProcessHost* process = epm->GetExtensionProcess(requesting_frame);

if (process && process->id() == render_process_id) {