content/browser/media/cdm/browser_cdm_manager.cc - Issue 1020683003: Make content::PermissionType an enum class.

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/browser/media/cdm/browser_cdm_manager.cc

Issue 1020683003: Make content::PermissionType an enum class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix android compile Created 5 years, 9 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:

Index: content/browser/media/cdm/browser_cdm_manager.cc

diff --git a/content/browser/media/cdm/browser_cdm_manager.cc b/content/browser/media/cdm/browser_cdm_manager.cc

index 1c1b157968d727916ff94ce14e9389966eac5275..2f33760aedbb0fa171cf8961b263fe9de585089d 100644

--- a/content/browser/media/cdm/browser_cdm_manager.cc

+++ b/content/browser/media/cdm/browser_cdm_manager.cc

@@ -13,6 +13,7 @@

#include "content/common/media/cdm_messages.h"

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

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

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

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

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

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

@@ -522,7 +523,7 @@ void BrowserCdmManager::CheckPermissionStatusOnUIThread(

PermissionStatus permission_status =

GetContentClient()->browser()->GetPermissionStatus(

- content::PERMISSION_PROTECTED_MEDIA_IDENTIFIER,

+ content::PermissionType::PROTECTED_MEDIA_IDENTIFIER,

web_contents->GetBrowserContext(), security_origin, embedding_origin);

bool allowed = (permission_status == PERMISSION_STATUS_GRANTED);