media/blink/encrypted_media_player_support.h - Issue 1070853004: media: CdmFactory creates CDM (MediaKeys) asynchronously.

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/encrypted_media_player_support.h

Issue 1070853004: media: CdmFactory creates CDM (MediaKeys) asynchronously. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase only Created 5 years, 8 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

« media/blink/cdm_session_adapter.cc ('K') | « media/blink/cdm_session_adapter.cc ('k') | media/blink/encrypted_media_player_support.cc » ('j') | media/blink/encrypted_media_player_support.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/blink/encrypted_media_player_support.h

diff --git a/media/blink/encrypted_media_player_support.h b/media/blink/encrypted_media_player_support.h

index 30d8708602bc41b2451d271a09a6a47106d0342f..15c355ecba4f9a473632554fce46295d48d93597 100644

--- a/media/blink/encrypted_media_player_support.h

+++ b/media/blink/encrypted_media_player_support.h

@@ -37,9 +37,9 @@ class WebContentDecryptionModuleImpl;

class EncryptedMediaPlayerSupport

: public base::SupportsWeakPtr<EncryptedMediaPlayerSupport> {

public:

- typedef base::Callback<void(CdmContext*, const CdmAttachedCB&)>

- SetCdmContextCB;

+ using SetCdmContextCB = ProxyDecryptor::SetCdmContextCB;

+ // |set_cdm_context_cb| is called when the real CDM is created successfully.

ddorwin 2015/04/10 00:59:43 "real"? Is there a fake/stub/temporary one? "CDM

xhwang 2015/04/10 17:41:17 Done.

EncryptedMediaPlayerSupport(CdmFactory* cdm_factory,

blink::WebMediaPlayerClient* client,

MediaPermission* media_permission,