chromecast/browser/cast_permission_manager.h - Issue 1771743002: Move geolocation and permission mojoms into WebKit/public/platform.

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: chromecast/browser/cast_permission_manager.h

Issue 1771743002: Move geolocation and permission mojoms into WebKit/public/platform. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 9 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/push_messaging/push_messaging_service_impl.cc ('k') | chromecast/browser/cast_permission_manager.cc » ('j') | content/browser/geolocation/geolocation_service_context.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chromecast/browser/cast_permission_manager.h

diff --git a/chromecast/browser/cast_permission_manager.h b/chromecast/browser/cast_permission_manager.h

index 432fef26505598fb3e681004febf4cbfa68223f1..d96ec8e0a8ed0863c0ffabe714f25f642be12fd1 100644

--- a/chromecast/browser/cast_permission_manager.h

+++ b/chromecast/browser/cast_permission_manager.h

@@ -22,18 +22,20 @@ class CastPermissionManager : public content::PermissionManager {

content::PermissionType permission,

content::RenderFrameHost* render_frame_host,

const GURL& requesting_origin,

- const base::Callback<void(content::PermissionStatus)>& callback) override;

+ const base::Callback<void(blink::mojom::PermissionStatus)>& callback)

+ override;

int RequestPermissions(

const std::vector<content::PermissionType>& permission,

content::RenderFrameHost* render_frame_host,

const GURL& requesting_origin,

- const base::Callback<void(

- const std::vector<content::PermissionStatus>&)>& callback) override;

+ const base::Callback<

+ void(const std::vector<blink::mojom::PermissionStatus>&)>& callback)

+ override;

void CancelPermissionRequest(int request_id) override;

void ResetPermission(content::PermissionType permission,

const GURL& requesting_origin,

const GURL& embedding_origin) override;

- content::PermissionStatus GetPermissionStatus(

+ blink::mojom::PermissionStatus GetPermissionStatus(

content::PermissionType permission,

const GURL& requesting_origin,

const GURL& embedding_origin) override;

@@ -44,7 +46,8 @@ class CastPermissionManager : public content::PermissionManager {

content::PermissionType permission,

const GURL& requesting_origin,

const GURL& embedding_origin,

- const base::Callback<void(content::PermissionStatus)>& callback) override;

+ const base::Callback<void(blink::mojom::PermissionStatus)>& callback)

+ override;

void UnsubscribePermissionStatusChange(int subscription_id) override;

private: