media/base/media_keys.cc - 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/media_keys.cc

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

Patch Set: Comments & Updated ProxyMediaKeys 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/media_keys.cc

diff --git a/media/base/media_keys.cc b/media/base/media_keys.cc

index fd01de12f90d2b7923565d2e795fcedb5bcd4219..263453c7dd4e027d8eee5dea3d01de339f2be2b4 100644

--- a/media/base/media_keys.cc

+++ b/media/base/media_keys.cc

@@ -10,6 +10,14 @@ MediaKeys::MediaKeys() {}

MediaKeys::~MediaKeys() {}

-Decryptor* MediaKeys::GetDecryptor() { return NULL; }

+Decryptor* MediaKeys::GetDecryptor() {

+ return NULL;

+#if defined(ENABLE_BROWSER_CDMS)

+int MediaKeys::GetCdmId() const {

+ return kInvalidCdmId;

+#endif

} // namespace media

« media/base/media_keys.h ('K') | « media/base/media_keys.h ('k') | no next file » | no next file with comments »