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

Unified Diff: blimp/client/core/android/blimp_client_context_impl_android.cc

Issue 2191743002: Setup the delegate in Chrome, so we may put chrome java functions we need in blimp to the delegate … (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resovle merge conflicts. Created 4 years, 5 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: 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 42677e39541e6568fb5b2358e28ae839bc984e69..fe32babedfebf570de8cc89514218b281fb25981 100644
--- a/blimp/client/core/android/blimp_client_context_impl_android.cc
+++ b/blimp/client/core/android/blimp_client_context_impl_android.cc
@@ -7,6 +7,7 @@
#include "base/android/jni_android.h"
#include "base/android/scoped_java_ref.h"
#include "blimp/client/core/contents/blimp_contents_impl.h"
+#include "blimp/client/public/blimp_client_context_delegate.h"
#include "jni/BlimpClientContextImpl_jni.h"
namespace blimp {
@@ -55,5 +56,15 @@ BlimpClientContextImplAndroid::CreateBlimpContents(JNIEnv* env, jobject jobj) {
return blimp_contents_impl->GetJavaBlimpContentsImpl();
}
+base::android::ScopedJavaLocalRef<jobject>
+ BlimpClientContextImplAndroid::GetClientContextDelegate(
+ JNIEnv* env, jobject jobj) {
+ BlimpClientContextDelegate* delegate =
+ blimp_client_context_impl_->GetDelegate();
+
+ return delegate ? delegate->GetJavaObject() :
+ base::android::ScopedJavaLocalRef<jobject>();
+}
+
} // namespace client
} // namespace blimp

Powered by Google App Engine
This is Rietveld 408576698