chrome/browser/media/protected_media_identifier_permission_context.cc - Issue 2675483002: Replace PermissionType in chrome/ with ContentSettingsType

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/protected_media_identifier_permission_context.cc

Issue 2675483002: Replace PermissionType in chrome/ with ContentSettingsType (Closed)

Patch Set: rebase + include content_settings_types.h more Created 3 years, 10 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/protected_media_identifier_infobar_delegate_android.cc ('k') | chrome/browser/media/webrtc/media_permission.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media/protected_media_identifier_permission_context.cc

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

index ea8bd5c0a51277743fea01003de83f1258d4f994..1dbfcc974671538b10c1665ee7965f64116b684d 100644

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

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

@@ -12,7 +12,6 @@

#include "chrome/common/pref_names.h"

#include "components/prefs/pref_service.h"

#include "content/public/browser/browser_thread.h"

-#include "content/public/browser/permission_type.h"

#include "content/public/browser/render_frame_host.h"

#include "content/public/browser/user_metrics.h"

#include "content/public/browser/web_contents.h"

@@ -37,7 +36,6 @@ using chromeos::attestation::PlatformVerificationDialog;

ProtectedMediaIdentifierPermissionContext::

ProtectedMediaIdentifierPermissionContext(Profile* profile)

: PermissionContextBase(profile,

- content::PermissionType::PROTECTED_MEDIA_IDENTIFIER,

CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER)

#if defined(OS_CHROMEOS)