media/base/cdm_factory.h - Issue 665563002: Add MediaKeys::GetCdmId().

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: media/base/cdm_factory.h

Issue 665563002: Add MediaKeys::GetCdmId(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master

Patch Set: Make GetCdmId() pure virtual. Created 6 years, 2 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: media/base/cdm_factory.h

diff --git a/media/base/cdm_factory.h b/media/base/cdm_factory.h

index 17dea810513b97fc10923a8d89a41857d64b2126..570c042db65a7f18bc97474b9a4bb916263d7311 100644

--- a/media/base/cdm_factory.h

+++ b/media/base/cdm_factory.h

@@ -23,9 +23,6 @@ class MEDIA_EXPORT CdmFactory {

virtual scoped_ptr<MediaKeys> Create(

const std::string& key_system,

const GURL& security_origin,

-#if defined(ENABLE_BROWSER_CDMS)

- int* cdm_id, // Output parameter indicating the CDM ID of the MediaKeys.

-#endif

const SessionMessageCB& session_message_cb,

const SessionReadyCB& session_ready_cb,

const SessionClosedCB& session_closed_cb,

« no previous file with comments | « content/renderer/media/crypto/renderer_cdm_manager.cc ('k') | media/base/media_keys.h » ('j') | no next file with comments »