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

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

Issue 2805803002: [Clank] Implement MediaDrmStorageBridge with MediaDrmStorage (Closed)
Patch Set: Rebase Created 3 years, 8 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 | « media/base/android/media_drm_storage.cc ('k') | media/base/android/media_drm_storage_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_storage_bridge.h
diff --git a/media/base/android/media_drm_storage_bridge.h b/media/base/android/media_drm_storage_bridge.h
index 08072f7542434cdb950e88903a607ef462d7bdd5..955e570126c98a95db1b0532ea19b51e7f38e618 100644
--- a/media/base/android/media_drm_storage_bridge.h
+++ b/media/base/android/media_drm_storage_bridge.h
@@ -7,10 +7,15 @@
#include <jni.h>
#include <memory>
+#include <string>
#include "base/android/scoped_java_ref.h"
+#include "base/callback.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
+#include "media/base/android/android_util.h"
+#include "media/base/android/media_drm_storage.h"
+#include "url/origin.h"
namespace base {
class SingleThreadTaskRunner;
@@ -24,7 +29,8 @@ class MediaDrmStorageBridge {
public:
static bool RegisterMediaDrmStorageBridge(JNIEnv* env);
- MediaDrmStorageBridge();
+ MediaDrmStorageBridge(const url::Origin& origin,
+ const CreateStorageCB& create_storage_cb);
~MediaDrmStorageBridge();
// The following OnXXX functions are called by Java. The functions will post
@@ -61,9 +67,21 @@ class MediaDrmStorageBridge {
const base::android::JavaParamRef<jobject>& j_callback);
private:
+ void RunAndroidBoolCallback(JavaObjectPtr j_callback, bool success);
+ void OnSessionDataLoaded(
+ JavaObjectPtr j_callback,
+ const std::string& session_id,
+ std::unique_ptr<MediaDrmStorage::SessionData> session_data);
+
+ MediaDrmStorage* GetStorageImpl();
+
+ CreateStorageCB create_storage_cb_;
+ std::unique_ptr<MediaDrmStorage> impl_;
+
+ const url::Origin origin_;
+
scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
- // NOTE: Weak pointers must be invalidated before all other member variables.
base::WeakPtrFactory<MediaDrmStorageBridge> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(MediaDrmStorageBridge);
« no previous file with comments | « media/base/android/media_drm_storage.cc ('k') | media/base/android/media_drm_storage_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698