Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(796)

Issues Search
    My Issues | Starred     Open | Closed | All

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: Changes 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:
View side-by-side diff with in-line comments
Download patch
« content/renderer/media/crypto/proxy_decryptor.cc ('K') | « content/renderer/media/crypto/proxy_decryptor.cc ('k') | media/base/cdm_promise.cc » ('j') | media/cdm/ppapi/external_clear_key/clear_key_cdm.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/cdm_promise.h
diff --git a/media/base/cdm_promise.h b/media/base/cdm_promise.h
index ad1d196ad6e003f2fcb86be2c8ec6ae07e51db35..1c9422fed3be5ada0221b7dd05ea9b7e66d020b1 100644
--- a/media/base/cdm_promise.h
+++ b/media/base/cdm_promise.h
@@ -57,6 +57,10 @@ class MEDIA_EXPORT CdmPromiseTemplate : public CdmPromise {
virtual ~CdmPromiseTemplate();
virtual void resolve(const T& result);
+ protected:
+ // Allow subclasses to completely override the implementation.
+ CdmPromiseTemplate();
ddorwin 2014/08/11 20:34:16 Add a TODO to remove it so we don't forget.
jrummell 2014/08/13 21:18:06 Done.
+
private:
base::Callback<void(const T&)> resolve_cb_;
« content/renderer/media/crypto/proxy_decryptor.cc ('K') | « content/renderer/media/crypto/proxy_decryptor.cc ('k') | media/base/cdm_promise.cc » ('j') | media/cdm/ppapi/external_clear_key/clear_key_cdm.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698