chrome/browser/media/media_stream_device_permissions.cc - 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.cc

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, 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

« chrome/browser/media/media_stream_device_permission_context.h ('K') | « chrome/browser/media/media_stream_device_permissions.h ('k') | chrome/browser/media/media_stream_devices_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media/media_stream_device_permissions.cc

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

index e1a1c738b87a4fff9a8abd9ddf4d5cceabe3f4bd..71b77ae150da8ac58a2a0dc93b95bb8bde2e6f6f 100644

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

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

@@ -16,7 +16,7 @@

bool ShouldPersistContentSetting(ContentSetting setting,

const GURL& origin,

- content::MediaStreamRequestType type) {

+ bool is_pepper_request) {

// When the request is from an invalid scheme we don't persist it.

if (!ContentSettingsPattern::FromURLNoWildcard(origin).IsValid())

return false;

@@ -27,7 +27,7 @@ bool ShouldPersistContentSetting(ContentSetting setting,

// Pepper requests should always be persisted to prevent annoying users of

// plugins.

- if (type == content::MEDIA_OPEN_DEVICE)

+ if (is_pepper_request)

return true;

// We persist requests from secure origins.