media/blink/null_encrypted_media_player_support.h - Issue 594713002: Pass initial CDM to CreateMediaPlayer()

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/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: fixes for android + mojo 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:

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..615b893cb98944a984ef2e8801266b126da8e9df 100644

--- a/media/blink/null_encrypted_media_player_support.h

+++ b/media/blink/null_encrypted_media_player_support.h

@@ -42,13 +42,13 @@ class MEDIA_EXPORT NullEncryptedMediaPlayerSupport

// Unprefixed API methods.

+ virtual void SetInitialContentDecryptionModule(

+ blink::WebContentDecryptionModule* initial_cdm) OVERRIDE;

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.