media/cdm/aes_decryptor.cc - Issue 835683002: media: Always define |cdm_id| in CdmContext.

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/cdm/aes_decryptor.cc

Issue 835683002: media: Always define |cdm_id| in CdmContext. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: comments addressed 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: media/cdm/aes_decryptor.cc

diff --git a/media/cdm/aes_decryptor.cc b/media/cdm/aes_decryptor.cc

index 2468c748b5f7b725e20691218218d7212475be95..eba09c44fe5e3e46eef0348b86fdd8e62dbbbf24 100644

--- a/media/cdm/aes_decryptor.cc

+++ b/media/cdm/aes_decryptor.cc

@@ -425,11 +425,9 @@ Decryptor* AesDecryptor::GetDecryptor() {

return this;

}

-#if defined(ENABLE_BROWSER_CDMS)

int AesDecryptor::GetCdmId() const {

return kInvalidCdmId;

}

-#endif // defined(ENABLE_BROWSER_CDMS)

void AesDecryptor::RegisterNewKeyCB(StreamType stream_type,

const NewKeyCB& new_key_cb) {

« no previous file with comments | « media/cdm/aes_decryptor.h ('k') | media/test/pipeline_integration_test.cc » ('j') | no next file with comments »