chrome/browser/content_settings/permission_context_uma_util.cc - Issue 769103002: Refactor ProtectedMediaIdentifierPermissionContext to derive from PermissionContextBase.

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/content_settings/permission_context_uma_util.cc

Issue 769103002: Refactor ProtectedMediaIdentifierPermissionContext to derive from PermissionContextBase. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: add #ifdef OS_CHROMEOS and clean-up includes Created 6 years 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/content_settings/permission_context_base.cc ('k') | chrome/browser/media/protected_media_identifier_permission_context.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/permission_context_uma_util.cc

diff --git a/chrome/browser/content_settings/permission_context_uma_util.cc b/chrome/browser/content_settings/permission_context_uma_util.cc

index 566e9aaf401308754129cc3e4c0a3895fbb1d835..2712646cbb1e0c16042a9d6764ab5a1b95919e77 100644

--- a/chrome/browser/content_settings/permission_context_uma_util.cc

+++ b/chrome/browser/content_settings/permission_context_uma_util.cc

@@ -78,10 +78,14 @@ void RecordPermissionAction(

"ContentSettings.PermissionActionsInsecureOrigin_PushMessaging",

action);

break;

-#if defined(OS_ANDROID)

+#if defined(OS_ANDROID) || defined(OS_CHROMEOS)

case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:

- // TODO(miguelg): support protected media through

- // the generic permission class.

+ PERMISSION_ACTION_UMA(

+ secure_origin,

+ "ContentSettings.PermissionActions_ProtectedMedia",

+ "ContentSettings.PermissionActionsSecureOrigin_ProtectedMedia",

+ "ContentSettings.PermissionActionsInsecureOrigin_ProtectedMedia",

+ action);

break;

#endif

default:

@@ -105,6 +109,11 @@ void RecordPermissionRequest(

case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:

type = content::PERMISSION_PUSH_MESSAGING;

break;

+#if defined(OS_ANDROID) || defined(OS_CHROMEOS)

+ case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:

+ type = content::PERMISSION_PROTECTED_MEDIA;

+ break;

+#endif

default:

NOTREACHED() << "PERMISSION " << permission << " not accounted for";

return;