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

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

Patch Set: rebase 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.h

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

index 43c0c88ef009f8991b078669066d131f164f4796..d3ffabb9853996a8b33c9569cb5aa0e45c25893c 100644

--- a/media/cdm/aes_decryptor.h

+++ b/media/cdm/aes_decryptor.h

@@ -60,9 +60,7 @@ class MEDIA_EXPORT AesDecryptor : public MediaKeys,

// CdmContext implementation.

Decryptor* GetDecryptor() override;

-#if defined(ENABLE_BROWSER_CDMS)

int GetCdmId() const override;

-#endif // defined(ENABLE_BROWSER_CDMS)

// Decryptor implementation.

void RegisterNewKeyCB(StreamType stream_type,