Adding a way to associate Android Activities with PlatformWindowAndroid

ui/platform_window/android/platform_window_android.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/platform_window/android/platform_window_android.h"
 
 #include <android/input.h>
 #include <android/native_window_jni.h>
 
 #include "base/android/jni_android.h"
@@ skipping 33 matching lines @@
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // PlatformWindowAndroid, public:
 
 // static
 bool PlatformWindowAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
+// static
+void PlatformWindowAndroid::createForActivity(
+    JNIEnv* env,
+    jobject activity,
+    jlong nativePlatformWindowAndroid,
+    jlong nativeImeController) {
+  Java_PlatformWindowAndroid_createForActivity(
+      env,
+      activity,
+      nativePlatformWindowAndroid,
+      nativeImeController);
+}
+
 PlatformWindowAndroid::PlatformWindowAndroid(PlatformWindowDelegate* delegate)
     : delegate_(delegate),
       window_(NULL),
       id_generator_(0),
       weak_factory_(this) {
 }
 
 PlatformWindowAndroid::~PlatformWindowAndroid() {
   if (window_)
     ReleaseWindow();
   if (!java_platform_window_android_.is_empty()) {
     JNIEnv* env = base::android::AttachCurrentThread();
     Java_PlatformWindowAndroid_detach(
         env, java_platform_window_android_.get(env).obj());
   }
 }
 
 void PlatformWindowAndroid::Destroy(JNIEnv* env, jobject obj) {
   delegate_->OnClosed();
 }
 
+void PlatformWindowAndroid::JavaPlatformWindowCreated(
+    JNIEnv* env, jobject obj) {
+  java_platform_window_android_ = JavaObjectWeakGlobalRef(env, obj);
+}
+
 void PlatformWindowAndroid::SurfaceCreated(JNIEnv* env,
                                            jobject obj,
                                            jobject jsurface,
                                            float device_pixel_ratio) {
   base::android::ScopedJavaLocalRef<jobject> protector(env, jsurface);
   // Note: This ensures that any local references used by
   // ANativeWindow_fromSurface are released immediately. This is needed as a
   // workaround for https://code.google.com/p/android/issues/detail?id=68174
   {
     base::android::ScopedJavaLocalFrame scoped_local_reference_frame(env);
@@ skipping 60 matching lines @@
 
 void PlatformWindowAndroid::ReleaseWindow() {
   ANativeWindow_release(window_);
   window_ = NULL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PlatformWindowAndroid, PlatformWindow implementation:
 
 void PlatformWindowAndroid::Show() {
-  if (!java_platform_window_android_.is_empty())
-    return;
-  JNIEnv* env = base::android::AttachCurrentThread();
-  java_platform_window_android_ = JavaObjectWeakGlobalRef(
-      env, Java_PlatformWindowAndroid_createForActivity(
-               env, base::android::GetApplicationContext(),
-               reinterpret_cast<jlong>(this),
-               reinterpret_cast<jlong>(&platform_ime_controller_)).obj());
+  CHECK(!java_platform_window_android_.is_empty());
 }
 
 void PlatformWindowAndroid::Hide() {
   // Nothing to do. View is always visible.
 }
 
 void PlatformWindowAndroid::Close() {
   delegate_->OnCloseRequest();
 }
 
@@ skipping 43 matching lines @@
 
 void PlatformWindowAndroid::ConfineCursorToBounds(const gfx::Rect& bounds) {
   NOTIMPLEMENTED();
 }
 
 PlatformImeController* PlatformWindowAndroid::GetPlatformImeController() {
   return &platform_ime_controller_;
 }
 
 }  // namespace ui