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

Unified Diff: media/base/android/media_drm_bridge.h

Issue 265993002: Add Promises for EME (Chromium side) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: latest CDM_5 Created 6 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:
View side-by-side diff with in-line comments
Download patch
Index: media/base/android/media_drm_bridge.h
diff --git a/media/base/android/media_drm_bridge.h b/media/base/android/media_drm_bridge.h
index f34bbc43b22a2f13a2ae63f713f87640b831d8a9..360bdb0f16c401c664b6b46191adb8f1b161c549 100644
--- a/media/base/android/media_drm_bridge.h
+++ b/media/base/android/media_drm_bridge.h
@@ -24,7 +24,7 @@ class MediaPlayerManager;
// This class provides DRM services for android EME implementation.
// TODO(qinmin): implement all the functions in this class.
-class MEDIA_EXPORT MediaDrmBridge : public MediaKeys {
+class MEDIA_EXPORT MediaDrmBridge {
public:
enum SecurityLevel {
SECURITY_LEVEL_NONE = 0,
@@ -73,17 +73,16 @@ class MEDIA_EXPORT MediaDrmBridge : public MediaKeys {
// object. Calling this function multiples times may cause errors.
bool SetSecurityLevel(SecurityLevel security_level);
- // MediaKeys implementations.
- virtual bool CreateSession(uint32 session_id,
- const std::string& content_type,
- const uint8* init_data,
- int init_data_length) OVERRIDE;
- virtual void LoadSession(uint32 session_id,
- const std::string& web_session_id) OVERRIDE;
- virtual void UpdateSession(uint32 session_id,
- const uint8* response,
- int response_length) OVERRIDE;
- virtual void ReleaseSession(uint32 session_id) OVERRIDE;
+ // Media key operations.
+ bool CreateSession(uint32 session_id,
+ const std::string& content_type,
+ const uint8* init_data,
+ int init_data_length);
+ void LoadSession(uint32 session_id, const std::string& web_session_id);
+ void UpdateSession(uint32 session_id,
+ const uint8* response,
+ int response_length);
+ void ReleaseSession(uint32 session_id);
// Returns a MediaCrypto object if it's already created. Returns a null object
// otherwise.

Powered by Google App Engine
This is Rietveld 408576698