chrome/browser/permissions/permission_manager.h - Issue 1943963004: Revert of (reland) Move permission.mojom from WebKit/public/platform/ to components/

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/permissions/permission_manager.h

Issue 1943963004: Revert of (reland) Move permission.mojom from WebKit/public/platform/ to components/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 7 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/notifications/platform_notification_service_unittest.cc ('k') | chrome/browser/permissions/permission_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/permissions/permission_manager.h

diff --git a/chrome/browser/permissions/permission_manager.h b/chrome/browser/permissions/permission_manager.h

index 351cd589e5d99287ed49d9d7ba70f2b7c8b3c605..3e7731470164cbfdbdcd45253a8b23a9ae4b4517 100644

--- a/chrome/browser/permissions/permission_manager.h

+++ b/chrome/browser/permissions/permission_manager.h

@@ -38,20 +38,20 @@

content::PermissionType permission,

content::RenderFrameHost* render_frame_host,

const GURL& requesting_origin,

- const base::Callback<void(permissions::mojom::PermissionStatus)>&

- callback) override;

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

+ override;

int RequestPermissions(

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

content::RenderFrameHost* render_frame_host,

const GURL& requesting_origin,

- const base::Callback<void(

- const std::vector<permissions::mojom::PermissionStatus>&)>& callback)

+ 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;

- permissions::mojom::PermissionStatus GetPermissionStatus(

+ blink::mojom::PermissionStatus GetPermissionStatus(

content::PermissionType permission,

const GURL& requesting_origin,

const GURL& embedding_origin) override;

@@ -62,8 +62,8 @@

content::PermissionType permission,

const GURL& requesting_origin,

const GURL& embedding_origin,

- const base::Callback<void(permissions::mojom::PermissionStatus)>&

- callback) override;

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

+ override;

void UnsubscribePermissionStatusChange(int subscription_id) override;

private:

@@ -93,7 +93,7 @@

void OnPermissionsRequestResponseStatus(

int request_id,

int permission_id,

- permissions::mojom::PermissionStatus status);

+ blink::mojom::PermissionStatus status);

// content_settings::Observer implementation.

void OnContentSettingChanged(const ContentSettingsPattern& primary_pattern,