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

Unified Diff: android_webview/native/aw_resource.cc

Issue 962793005: Adds MediaClientAndroid to support embedder/MediaDrmBridge interaction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rename createSession to createSessionFromNative to avoid bug in FindBugs Created 5 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
Index: android_webview/native/aw_resource.cc
diff --git a/android_webview/native/aw_resource.cc b/android_webview/native/aw_resource.cc
index 498a201405495e3a68cb257750e9cdf009e31442..75f75b5b4522685e033ef77a24d4d02d196af7ca 100644
--- a/android_webview/native/aw_resource.cc
+++ b/android_webview/native/aw_resource.cc
@@ -4,6 +4,7 @@
#include "android_webview/native/aw_resource.h"
+#include "base/android/jni_array.h"
#include "base/android/jni_string.h"
#include "base/android/scoped_java_ref.h"
#include "jni/AwResource_jni.h"
@@ -30,6 +31,16 @@ std::string GetNoDomainPageContent() {
return base::android::ConvertJavaStringToUTF8(content);
}
+std::vector<std::string> GetConfigKeySystemUuidMapping() {
+ JNIEnv* env = base::android::AttachCurrentThread();
+ std::vector<std::string> key_system_uuid_mappings;
+ ScopedJavaLocalRef<jobjectArray> mappings =
+ Java_AwResource_getConfigKeySystemUuidMapping(env);
+ base::android::AppendJavaStringArrayToStringVector(env, mappings.obj(),
+ &key_system_uuid_mappings);
+ return key_system_uuid_mappings;
+}
+
bool RegisterAwResource(JNIEnv* env) {
return RegisterNativesImpl(env);
}

Powered by Google App Engine
This is Rietveld 408576698