chrome/browser/geolocation/geolocation_permission_context_extensions.cc - Issue 464533002: Move guest_view to extensions.

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_extensions.cc

Issue 464533002: Move guest_view to extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Small changes are made in guest_view_manager_unittest.cc Created 6 years, 4 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/extensions/api/web_request/web_request_permissions.cc ('k') | chrome/browser/guest_view/app_view/app_view_guest.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/geolocation/geolocation_permission_context_extensions.cc

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

index e0496b19cb94ff64d90100ec16c05fbb4ae5cc05..04873f97c536b8dcbb3ca1e2bcc0da574a63f1de 100644

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

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

@@ -41,8 +41,8 @@ bool GeolocationPermissionContextExtensions::RequestPermission(

#if defined(ENABLE_EXTENSIONS)

GURL requesting_frame_origin = requesting_frame.GetOrigin();

- WebViewPermissionHelper* web_view_permission_helper =

- WebViewPermissionHelper::FromWebContents(web_contents);

+ extensions::WebViewPermissionHelper* web_view_permission_helper =

+ extensions::WebViewPermissionHelper::FromWebContents(web_contents);

if (web_view_permission_helper) {

web_view_permission_helper->RequestGeolocationPermission(

bridge_id, requesting_frame, user_gesture, callback);

@@ -90,9 +90,10 @@ bool GeolocationPermissionContextExtensions::CancelPermissionRequest(

content::WebContents* web_contents,

int bridge_id) {

#if defined(ENABLE_EXTENSIONS)

- WebViewPermissionHelper* web_view_permission_helper =

- web_contents ? WebViewPermissionHelper::FromWebContents(web_contents)

- : NULL;

+ extensions::WebViewPermissionHelper* web_view_permission_helper =

+ web_contents ?

+ extensions::WebViewPermissionHelper::FromWebContents(web_contents)

+ : NULL;

if (web_view_permission_helper) {

web_view_permission_helper->CancelGeolocationPermissionRequest(bridge_id);

return true;