Chromium Code Reviews| 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 e4602db46b36d2a73c1806cc0610d4e74407b7f9..7bf90aa67bcfdce3ee1cafd229e85e6441dc399b 100644 |
| --- a/blimp/client/core/android/blimp_client_context_impl_android.cc |
| +++ b/blimp/client/core/android/blimp_client_context_impl_android.cc |
| @@ -10,6 +10,7 @@ |
| #include "blimp/client/core/contents/blimp_contents_impl.h" |
| #include "blimp/client/public/blimp_client_context.h" |
| #include "jni/BlimpClientContextImpl_jni.h" |
| +#include "ui/android/window_android.h" |
| namespace blimp { |
| namespace client { |
| @@ -61,10 +62,15 @@ BlimpClientContextImplAndroid::GetJavaObject() { |
| } |
| base::android::ScopedJavaLocalRef<jobject> |
| -BlimpClientContextImplAndroid::CreateBlimpContentsJava(JNIEnv* env, |
| - jobject jobj) { |
| +BlimpClientContextImplAndroid::CreateBlimpContentsJava( |
| + JNIEnv* env, |
| + jobject jobj, |
| + jlong window_android_ptr) { |
| + ui::WindowAndroid* window_android = |
| + reinterpret_cast<ui::WindowAndroid*>(window_android_ptr); |
| std::unique_ptr<BlimpContents> blimp_contents = |
| - BlimpClientContextImpl::CreateBlimpContents(); |
| + BlimpClientContextImpl::CreateBlimpContents(window_android); |
|
David Trainor- moved to gerrit
2016/08/30 21:14:06
Remove BlimpClientContextImpl::
nyquist
2016/08/30 21:50:42
Done.
|
| + |
| // This intentionally releases the ownership and gives it to Java. |
| BlimpContentsImpl* blimp_contents_impl = |
| static_cast<BlimpContentsImpl*>(blimp_contents.release()); |