media/base/cdm_promise.h - Issue 448893002: Update ClearKey to support CDM_6

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

Issue 448893002: Update ClearKey to support CDM_6 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cdm6

Patch Set: Changes2 Created 6 years, 4 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/cdm_promise.h

diff --git a/media/base/cdm_promise.h b/media/base/cdm_promise.h

index ad1d196ad6e003f2fcb86be2c8ec6ae07e51db35..041504d30a2d039b9a5b3193e6699a4ae2f08e48 100644

--- a/media/base/cdm_promise.h

+++ b/media/base/cdm_promise.h

@@ -57,6 +57,11 @@ class MEDIA_EXPORT CdmPromiseTemplate : public CdmPromise {

virtual ~CdmPromiseTemplate();

virtual void resolve(const T& result);

+ protected:

+ // Allow subclasses to completely override the implementation.

+ // TODO(jrummell): Remove when derived classes are no longer needed.

ddorwin 2014/08/13 21:35:52 Which derived classes? Be specific so it's easy to

jrummell 2014/08/13 21:44:08 Done.

+ CdmPromiseTemplate();

private:

base::Callback<void(const T&)> resolve_cb_;

« no previous file with comments | « content/renderer/media/crypto/proxy_decryptor.cc ('k') | media/base/cdm_promise.cc » ('j') | no next file with comments »