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

Unified Diff: Source/core/platform/graphics/MediaPlayerPrivate.h

Issue 15178010: Remove ENABLE_ENCRYPTED_MEDIA #define as it's always enabled (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/platform/graphics/MediaPlayer.cpp ('k') | Source/core/testing/MockCDM.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/platform/graphics/MediaPlayerPrivate.h
diff --git a/Source/core/platform/graphics/MediaPlayerPrivate.h b/Source/core/platform/graphics/MediaPlayerPrivate.h
index 8e8d6d347e1c27fb2179b9ffdba3074f93609872..91e5168123c4277465c3518719bb38e00f91f3ea 100644
--- a/Source/core/platform/graphics/MediaPlayerPrivate.h
+++ b/Source/core/platform/graphics/MediaPlayerPrivate.h
@@ -150,11 +150,9 @@ public:
virtual AudioSourceProvider* audioSourceProvider() { return 0; }
#endif
-#if ENABLE(ENCRYPTED_MEDIA)
virtual MediaPlayer::MediaKeyException addKey(const String&, const unsigned char*, unsigned, const unsigned char*, unsigned, const String&) { return MediaPlayer::KeySystemNotSupported; }
virtual MediaPlayer::MediaKeyException generateKeyRequest(const String&, const unsigned char*, unsigned) { return MediaPlayer::KeySystemNotSupported; }
virtual MediaPlayer::MediaKeyException cancelKeyRequest(const String&, const String&) { return MediaPlayer::KeySystemNotSupported; }
-#endif
virtual bool requiresTextTrackRepresentation() const { return false; }
virtual void setTextTrackRepresentation(TextTrackRepresentation*) { }
« no previous file with comments | « Source/core/platform/graphics/MediaPlayer.cpp ('k') | Source/core/testing/MockCDM.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698