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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/blink/null_encrypted_media_player_support.h

Issue 594713002: Pass initial CDM to CreateMediaPlayer() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« content/renderer/render_frame_impl.cc ('K') | « media/blink/encrypted_media_player_support.h ('k') | media/blink/null_encrypted_media_player_support.cc » ('j') | media/blink/null_encrypted_media_player_support.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/null_encrypted_media_player_support.h
diff --git a/media/blink/null_encrypted_media_player_support.h b/media/blink/null_encrypted_media_player_support.h
index 140bef164ee1744cac483355fff8d7e9bb7266cc..b7277c02381a0006fe2123f686cb3ef3fdf765b4 100644
--- a/media/blink/null_encrypted_media_player_support.h
+++ b/media/blink/null_encrypted_media_player_support.h
@@ -42,13 +42,14 @@ class MEDIA_EXPORT NullEncryptedMediaPlayerSupport
// Unprefixed API methods.
+ virtual void SetInitialContentDecryptionModule(
+ blink::WebContentDecryptionModule* cdm) OVERRIDE;
+
ddorwin 2014/09/23 18:03:23 remove empty line
jrummell 2014/09/23 20:01:38 Done.
virtual void SetContentDecryptionModule(
blink::WebContentDecryptionModule* cdm) OVERRIDE;
virtual void SetContentDecryptionModule(
blink::WebContentDecryptionModule* cdm,
blink::WebContentDecryptionModuleResult result) OVERRIDE;
- virtual void SetContentDecryptionModuleSync(
- blink::WebContentDecryptionModule* cdm) OVERRIDE;
// Callback factory and notification methods used by WebMediaPlayerImpl.
« content/renderer/render_frame_impl.cc ('K') | « media/blink/encrypted_media_player_support.h ('k') | media/blink/null_encrypted_media_player_support.cc » ('j') | media/blink/null_encrypted_media_player_support.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698