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

Unified Diff: content/browser/media/android/media_drm_credential_manager.h

Issue 24152015: [Android] JNI binding for MediaDrmCredentialManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move function declare location Created 7 years, 3 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: content/browser/media/android/media_drm_credential_manager.h
diff --git a/content/browser/media/android/media_drm_credential_manager.h b/content/browser/media/android/media_drm_credential_manager.h
index ae77c615aa24e6cf4306abf0b7d95ad63f52cdaa..236009a24074ce5a575b6f7c0d639b1e2681be70 100644
--- a/content/browser/media/android/media_drm_credential_manager.h
+++ b/content/browser/media/android/media_drm_credential_manager.h
@@ -5,28 +5,38 @@
#ifndef CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_DRM_CREDENTIAL_MANAGER_H_
#define CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_DRM_CREDENTIAL_MANAGER_H_
+#include <jni.h>
#include <string>
#include "base/callback.h"
-
-namespace media {
-class MediaDrmBridge;
-}
+#include "base/memory/singleton.h"
+#include "media/base/android/media_drm_bridge.h"
namespace content {
// This class manages the media DRM credentials on Android.
class MediaDrmCredentialManager {
public:
- MediaDrmCredentialManager();
- ~MediaDrmCredentialManager();
+ static MediaDrmCredentialManager* GetInstance();
typedef base::Callback<void(bool)> ResetCredentialsCB;
+ // Called to reset the DRM credentials. (for Java)
+ static void ResetCredentials(JNIEnv* env, jclass clazz, jobject callback);
+
// Called to reset the DRM credentials.
void ResetCredentials(const ResetCredentialsCB& callback);
+ static bool RegisterMediaDrmCredentialManager(JNIEnv* env);
+
private:
+ friend struct DefaultSingletonTraits<MediaDrmCredentialManager>;
+ friend class Singleton<MediaDrmCredentialManager>;
+
+ MediaDrmCredentialManager() {};
+ ~MediaDrmCredentialManager() {};
+
+
// Callback function passed to MediaDrmBridge. It is called when reset
// completed.
void OnResetCredentialsCompleted(const std::string& security_level,

Powered by Google App Engine
This is Rietveld 408576698