content/renderer/pepper/content_decryptor_delegate.h - Issue 1102363005: Initialize the CDM 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: content/renderer/pepper/content_decryptor_delegate.h

Issue 1102363005: Initialize the CDM asynchronously (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase + Android compile changes Created 5 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: content/renderer/pepper/content_decryptor_delegate.h

diff --git a/content/renderer/pepper/content_decryptor_delegate.h b/content/renderer/pepper/content_decryptor_delegate.h

index cb3791dab081475860a896d4372b0cdc550ddda9..09b0917cbfdf6bd9c29c2dad2bf54b164730e797 100644

--- a/content/renderer/pepper/content_decryptor_delegate.h

+++ b/content/renderer/pepper/content_decryptor_delegate.h

@@ -56,7 +56,8 @@ class ContentDecryptorDelegate {

const media::LegacySessionErrorCB& legacy_session_error_cb,

const media::SessionKeysChangeCB& session_keys_change_cb,

const media::SessionExpirationUpdateCB& session_expiration_update_cb,

- const base::Closure& fatal_plugin_error_cb);

+ const base::Closure& fatal_plugin_error_cb,

+ scoped_ptr<media::SimpleCdmPromise> promise);

void InstanceCrashed();