content/shell/browser/shell_permission_manager.h - Issue 1373883003: Move geolocation and permission mojoms into 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: content/shell/browser/shell_permission_manager.h

Issue 1373883003: Move geolocation and permission mojoms into components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 2 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 | « content/shell/browser/layout_test/layout_test_push_messaging_service.cc ('k') | content/shell/browser/shell_permission_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/browser/shell_permission_manager.h

diff --git a/content/shell/browser/shell_permission_manager.h b/content/shell/browser/shell_permission_manager.h

index 0b195d4d7180afae40b0c3eb939314155c6c5973..515a7b9cfbaf3a276f5d08a4c633f66410ad25f9 100644

--- a/content/shell/browser/shell_permission_manager.h

+++ b/content/shell/browser/shell_permission_manager.h

@@ -22,14 +22,14 @@ class ShellPermissionManager : public PermissionManager {

RenderFrameHost* render_frame_host,

const GURL& requesting_origin,

bool user_gesture,

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

+ const base::Callback<void(permission::Status)>& callback) override;

void CancelPermissionRequest(int request_id) override;

void ResetPermission(PermissionType permission,

const GURL& requesting_origin,

const GURL& embedding_origin) override;

- PermissionStatus GetPermissionStatus(PermissionType permission,

- const GURL& requesting_origin,

- const GURL& embedding_origin) override;

+ permission::Status GetPermissionStatus(PermissionType permission,

+ const GURL& requesting_origin,

+ const GURL& embedding_origin) override;

void RegisterPermissionUsage(PermissionType permission,

const GURL& requesting_origin,

const GURL& embedding_origin) override;

@@ -37,7 +37,7 @@ class ShellPermissionManager : public PermissionManager {

PermissionType permission,

const GURL& requesting_origin,

const GURL& embedding_origin,

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

+ const base::Callback<void(permission::Status)>& callback) override;

void UnsubscribePermissionStatusChange(int subscription_id) override;

private: