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

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

Issue 17101027: Add a function to convert key system into UUID (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nits Created 7 years, 6 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
« no previous file with comments | « content/browser/android/media_player_manager_impl.cc ('k') | media/base/android/media_drm_bridge.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 60ecfa14a9cf43443f3dad2ef688f76dcbe8e9ea..90f6d1349c73ba3ca6e772e37caaf69ef0319144 100644
--- a/media/base/android/media_drm_bridge.h
+++ b/media/base/android/media_drm_bridge.h
@@ -19,10 +19,13 @@ namespace media {
// TODO(qinmin): implement all the functions in this class.
class MEDIA_EXPORT MediaDrmBridge : public MediaKeys {
public:
- // TODO(xhwang): Pass in |key_system|.
- MediaDrmBridge(int media_keys_id, const std::vector<uint8>& uuid);
virtual ~MediaDrmBridge();
+ // Returns a MediaDrmBridge instance if |uuid| is supported, or a NULL
+ // pointer otherwise.
+ static MediaDrmBridge* Create(int media_keys_id,
+ const std::vector<uint8>& uuid);
+
// Checks whether DRM is available.
static bool IsAvailable();
@@ -51,9 +54,14 @@ class MEDIA_EXPORT MediaDrmBridge : public MediaKeys {
int media_keys_id() const { return media_keys_id_; }
private:
+ MediaDrmBridge(int media_keys_id, const std::vector<uint8>& uuid);
+
// Id of the MediaKeys object.
int media_keys_id_;
+ // UUID of the key system.
+ std::vector<uint8> uuid_;
+
DISALLOW_COPY_AND_ASSIGN(MediaDrmBridge);
};
« no previous file with comments | « content/browser/android/media_player_manager_impl.cc ('k') | media/base/android/media_drm_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698