media/base/android/media_source_player.h - Issue 265993002: Add Promises for EME (Chromium side)

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/base/android/media_source_player.h

Issue 265993002: Add Promises for EME (Chromium side) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Android changes Created 6 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: media/base/android/media_source_player.h

diff --git a/media/base/android/media_source_player.h b/media/base/android/media_source_player.h

index 6389ec1687dade77426c59e92e504aaefeb19ddb..409a4678182b47cd4826963dc3e26ea0f4f0ea8b 100644

--- a/media/base/android/media_source_player.h

+++ b/media/base/android/media_source_player.h

@@ -61,7 +61,7 @@ class MEDIA_EXPORT MediaSourcePlayer : public MediaPlayerAndroid,

virtual bool CanSeekForward() OVERRIDE;

virtual bool CanSeekBackward() OVERRIDE;

virtual bool IsPlayerReady() OVERRIDE;

- virtual void SetCdm(MediaKeys* cdm) OVERRIDE;

+ virtual void SetCdm(MediaDrmBridge* cdm) OVERRIDE;

virtual void OnKeyAdded() OVERRIDE;

virtual bool IsSurfaceInUse() const OVERRIDE;