media/base/android/media_player_android.h - Issue 1407933010: media: Make MediaKeys ref-counted.

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_player_android.h

Issue 1407933010: media: Make MediaKeys ref-counted. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase only Created 5 years, 1 month 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_player_android.h

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

index e24ad6c87448cce2e404bf9fecf9a3cd7c7807db..24fb599b077c8c4551f6b508b6ee905fd933dc72 100644

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

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

@@ -19,7 +19,7 @@

namespace media {

-class BrowserCdm;

+class MediaKeys;

class MediaPlayerManager;

// This class serves as the base class for different media player

@@ -78,7 +78,7 @@ class MEDIA_EXPORT MediaPlayerAndroid {

virtual GURL GetFirstPartyForCookies();

// Associates the |cdm| with this player.

- virtual void SetCdm(BrowserCdm* cdm);

+ virtual void SetCdm(const scoped_refptr<MediaKeys>& cdm);

// Requests playback permission from MediaPlayerManager.

// Overridden in MediaCodecPlayer to pass data between threads.