chrome/browser/media/media_stream_device_permissions.h - Issue 1318173002: Integrate MediaPermission with PermissionManager by using PermissionContext.

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/media/media_stream_device_permissions.h

Issue 1318173002: Integrate MediaPermission with PermissionManager by using PermissionContext. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 3 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/media/media_stream_device_permission_context.cc ('k') | chrome/browser/media/media_stream_device_permissions.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media/media_stream_device_permissions.h

diff --git a/chrome/browser/media/media_stream_device_permissions.h b/chrome/browser/media/media_stream_device_permissions.h

index b0ad5df8493a92b0a7b4018b4fec63801d7505cb..839c4f54bfd9e9252686088873da5f533b2e3465 100644

--- a/chrome/browser/media/media_stream_device_permissions.h

+++ b/chrome/browser/media/media_stream_device_permissions.h

@@ -21,7 +21,7 @@ enum MediaStreamDevicePolicy {

// Returns true if the given media content setting should be persisted.

bool ShouldPersistContentSetting(ContentSetting setting,

const GURL& origin,

- content::MediaStreamRequestType type);

+ bool is_pepper_request);

// Get the device policy for |security_origin| and |profile|.

MediaStreamDevicePolicy GetDevicePolicy(const Profile* profile,