media/crypto/aes_decryptor.h - Issue 17381007: EME: ProxyDecryptor creates MediaKeys instead of Decryptor.

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

Issue 17381007: EME: ProxyDecryptor creates MediaKeys instead of Decryptor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 6 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/crypto/aes_decryptor.h

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

index b91ccd48dae99a521aff37830703cd1f8f8ed8e9..9cac2f76535d9ba7d911657dfffd283ef553de7f 100644

--- a/media/crypto/aes_decryptor.h

+++ b/media/crypto/aes_decryptor.h

@@ -44,9 +44,9 @@ class MEDIA_EXPORT AesDecryptor : public MediaKeys, public Decryptor {

const std::string& session_id) OVERRIDE;

virtual void CancelKeyRequest(const std::string& key_system,

const std::string& session_id) OVERRIDE;

+ virtual Decryptor* GetDecryptor() OVERRIDE;

// Decryptor implementation.

- virtual MediaKeys* GetMediaKeys() OVERRIDE;

virtual void RegisterNewKeyCB(StreamType stream_type,

const NewKeyCB& key_added_cb) OVERRIDE;

virtual void Decrypt(StreamType stream_type,