Upstreaming SelectFileDialog for Android

ui/gfx/android/window_android.cc

+// Copyright (c) 2012 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 "window_android.h"
+
+#include "base/android/jni_android.h"
+#include "base/android/jni_helper.h"
+#include "base/android/scoped_java_ref.h"
+#include "jni/NativeWindow_jni.h"
+
+namespace ui {
+
+using base::android::AttachCurrentThread;
+using base::android::ScopedJavaLocalRef;
+
+struct WindowAndroid::JavaObject {
+  jweak obj_;
+  ScopedJavaLocalRef<jobject> WindowAndroid(JNIEnv* env) {

[sky, 2012/09/13 16:24:04]

Generally structs shouldn't have methods.

[aurimas (slooooooooow), 2012/09/14 00:06:59]

Done.

+    return GetRealObject(env, obj_);
+  }
+};
+
+WindowAndroid::WindowAndroid(JNIEnv* env, jobject obj) {
+  java_object_ = new JavaObject;
+  java_object_->obj_ = env->NewWeakGlobalRef(obj);
+}
+
+WindowAndroid::~WindowAndroid() {
+  if (java_object_->obj_) {
+    JNIEnv* env = AttachCurrentThread();
+    env->DeleteWeakGlobalRef(java_object_->obj_);
+    java_object_->obj_ = 0;

[sky, 2012/09/13 16:24:04]

NULL

[aurimas (slooooooooow), 2012/09/14 00:06:59]

Done.

+  }
+  delete java_object_;
+}
+
+void WindowAndroid::Destroy(JNIEnv* env, jobject obj) {
+  delete this;

[sky, 2012/09/13 16:24:04]

If this is the only way to delte 'this' then make the destructor private.

[aurimas (slooooooooow), 2012/09/14 00:06:59]

Done.

+}
+
+ScopedJavaLocalRef<jobject> WindowAndroid::GetJavaObject() {
+  JNIEnv* env = AttachCurrentThread();
+  return GetRealObject(env, java_object_->obj_);
+}
+
+bool WindowAndroid::RegisterWindowAndroid(JNIEnv* env) {
+  return RegisterNativesImpl(env);
+}
+
+
+// ----------------------------------------------------------------------------
+// Native JNI methods
+// ----------------------------------------------------------------------------
+
+jint Init(JNIEnv* env, jobject obj) {
+  WindowAndroid* window = new WindowAndroid(env, obj);
+  return reinterpret_cast<jint>(window);
+}
+
+}  // namespace ui