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
+PlatformWindowAndroid* PlatformWindowAndroid::From(
+    PlatformWindow* platform_window) {
+  return static_cast<PlatformWindowAndroid*>(platform_window);
+}
+
 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::AttachToActivity(jobject activity) {
+  JNIEnv* env = base::android::AttachCurrentThread();

[sadrul, 2015/12/01 21:29:34]

Should this DCHECK(!IsAttachedToActivity())? Or is it possible to change the
activity this is attached to?

[mfomitchev, 2015/12/01 21:50:50]

I'll add the DCHECK for now. If we need to change the attached activity, we can
always change this later.

+  base::android::ScopedJavaLocalRef<jobject> jpwa =
+      Java_PlatformWindowAndroid_createForActivity(
+          env,
+          activity,
+          reinterpret_cast<jlong>(this),
+          reinterpret_cast<jlong>(&platform_ime_controller_));
+  java_platform_window_android_ = JavaObjectWeakGlobalRef(env, jpwa.obj());
+}
+
+bool PlatformWindowAndroid::IsAttachedToActivity() {
+  return !java_platform_window_android_.is_empty();
+}
+
 void PlatformWindowAndroid::Destroy(JNIEnv* env, jobject obj) {
   delegate_->OnClosed();
 }
 
 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
@@ skipping 64 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());
+  DCHECK(IsAttachedToActivity());
 }

[sadrul, 2015/12/01 21:29:34]

Should this set visibility on the android SurfaceView?

[mfomitchev, 2015/12/01 21:50:51]

Considering we are not doing anything in Hide(), I don't think we need to be
doing anything here? I expect that the SurfaceView state will be updated on the
Android site through standard Android mechanisms when the window is minimized,
obscured, etc. We might want to hook up Android visibility state to native
Show/Hide, but I think that would be a separate CL. This CL just keeps things
the way they were in that regard.

 
 void PlatformWindowAndroid::Hide() {
   // Nothing to do. View is always visible.
 }
 
 void PlatformWindowAndroid::Close() {
   delegate_->OnCloseRequest();
 }
 
 void PlatformWindowAndroid::SetBounds(const gfx::Rect& bounds) {
@@ skipping 42 matching lines @@
 
 void PlatformWindowAndroid::ConfineCursorToBounds(const gfx::Rect& bounds) {
   NOTIMPLEMENTED();
 }
 
 PlatformImeController* PlatformWindowAndroid::GetPlatformImeController() {
   return &platform_ime_controller_;
 }
 
 }  // namespace ui