Index: blimp/client/core/android/blimp_client_context_impl_android.cc |
diff --git a/blimp/client/core/android/blimp_client_context_impl_android.cc b/blimp/client/core/android/blimp_client_context_impl_android.cc |
index fe3cb3ee8ec8eb70abc33d4c438bdda3b84010ec..8d68d00b2406846893e52434feebe559bfe23c29 100644 |
--- a/blimp/client/core/android/blimp_client_context_impl_android.cc |
+++ b/blimp/client/core/android/blimp_client_context_impl_android.cc |
@@ -4,10 +4,14 @@ |
#include "blimp/client/core/android/blimp_client_context_impl_android.h" |
+#include <string> |
+#include <unordered_map> |
+ |
#include "base/android/jni_android.h" |
#include "base/android/jni_string.h" |
#include "base/android/scoped_java_ref.h" |
#include "blimp/client/core/contents/blimp_contents_impl.h" |
+#include "blimp/client/core/feedback/android/blimp_feedback_data_android.h" |
#include "blimp/client/core/settings/android/blimp_settings_android.h" |
#include "blimp/client/public/blimp_client_context.h" |
#include "blimp/client/public/compositor/compositor_dependencies.h" |
@@ -82,6 +86,15 @@ BlimpClientContextImplAndroid::CreateBlimpContentsJava( |
return blimp_contents_impl->GetJavaObject(); |
} |
+base::android::ScopedJavaLocalRef<jobject> |
+BlimpClientContextImplAndroid::CreateBlimpFeedbackDataJava( |
+ JNIEnv* env, |
+ const base::android::JavaRef<jobject>& jobj) { |
+ std::unordered_map<std::string, std::string> feedback_data = |
+ CreateFeedbackData(); |
+ return CreateBlimpFeedbackDataJavaObject(feedback_data); |
+} |
+ |
GURL BlimpClientContextImplAndroid::GetAssignerURL() { |
JNIEnv* env = base::android::AttachCurrentThread(); |
base::android::ScopedJavaLocalRef<jstring> jurl = |