Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1210)

Unified Diff: content/renderer/media/crypto/ppapi_decryptor.cc

Issue 136343002: Remove Chrome for TV code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 6 years, 11 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:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/crypto/ppapi_decryptor.cc
diff --git a/content/renderer/media/crypto/ppapi_decryptor.cc b/content/renderer/media/crypto/ppapi_decryptor.cc
index b60afaa757bf14c8342e13b56c1f9978fc8e0f7a..cf7808c3f5d5312b66fee9ddccd3fdaf761fa21b 100644
--- a/content/renderer/media/crypto/ppapi_decryptor.cc
+++ b/content/renderer/media/crypto/ppapi_decryptor.cc
@@ -143,18 +143,7 @@ void PpapiDecryptor::ReleaseSession(uint32 session_id) {
}
media::Decryptor* PpapiDecryptor::GetDecryptor() {
-#if defined(GOOGLE_TV)
- // Google TV only uses PpapiDecrytor as a MediaKeys and does not need the
- // Decryptor interface of the PpapiDecryptor.
- // Details: If we don't do this GTV will be broken. The reason is that during
- // initialization, MediaSourceDelegate tries to use DecryptingDemuxerStream
- // to decrypt the stream in the renderer process (for ClearKey support).
- // However, for GTV, PpapiDecryptor cannot do decryption at all. By returning
- // NULL, DDS init will fail and we fallback to what GTV used to do.
- return NULL;
-#else
return this;
-#endif // defined(GOOGLE_TV)
}
void PpapiDecryptor::RegisterNewKeyCB(StreamType stream_type,
« no previous file with comments | « content/renderer/media/crypto/key_systems.cc ('k') | content/renderer/media/media_stream_dependency_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698