| 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 6ef38658c90cadd997b72c316c9773e458f8475d..2a48894f98f5c09deaa9404ed5816209c4c969de 100644
 | 
| --- a/blimp/client/core/android/blimp_client_context_impl_android.cc
 | 
| +++ b/blimp/client/core/android/blimp_client_context_impl_android.cc
 | 
| @@ -12,6 +12,7 @@
 | 
|  #include "blimp/client/public/blimp_client_context.h"
 | 
|  #include "blimp/client/public/compositor/compositor_dependencies.h"
 | 
|  #include "jni/BlimpClientContextImpl_jni.h"
 | 
| +#include "ui/android/window_android.h"
 | 
|  
 | 
|  namespace blimp {
 | 
|  namespace client {
 | 
| @@ -66,10 +67,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();
 | 
| +      CreateBlimpContents(window_android);
 | 
| +
 | 
|    // This intentionally releases the ownership and gives it to Java.
 | 
|    BlimpContentsImpl* blimp_contents_impl =
 | 
|        static_cast<BlimpContentsImpl*>(blimp_contents.release());
 | 
| 
 |