webkit/media/crypto/proxy_decryptor.h - Issue 15028015: Conditionally build support for Pepper-based CDMs.

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: webkit/media/crypto/proxy_decryptor.h

Issue 15028015: Conditionally build support for Pepper-based CDMs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Use AppendAscii() where possible. Created 7 years, 7 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: webkit/media/crypto/proxy_decryptor.h

diff --git a/webkit/media/crypto/proxy_decryptor.h b/webkit/media/crypto/proxy_decryptor.h

index 0b26dd226c05c59f4dd9e8cbb53433276913fb36..3e81ce37e7b5bbae46e8f7d5c8a2cb981789f74b 100644

--- a/webkit/media/crypto/proxy_decryptor.h

+++ b/webkit/media/crypto/proxy_decryptor.h

@@ -51,8 +51,10 @@ class ProxyDecryptor {

private:

// Helper functions to create decryptors to handle the given |key_system|.

+#if defined(ENABLE_PEPPER_CDMS)

scoped_ptr<media::Decryptor> CreatePpapiDecryptor(

const std::string& key_system);

+#endif // defined(ENABLE_PEPPER_CDMS)

scoped_ptr<media::Decryptor> CreateDecryptor(const std::string& key_system);

// Callbacks for firing key events.

« no previous file with comments | « webkit/media/crypto/key_systems_unittest.cc ('k') | webkit/media/crypto/proxy_decryptor.cc » ('j') | no next file with comments »