Upstreaming SelectFileDialog for Android

content/browser/android/content_view_core_impl.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 "content/browser/android/content_view_core_impl.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 16 matching lines @@
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/page_transition_types.h"
 #include "jni/ContentViewCore_jni.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/android/WebInputEventFactory.h"
 #include "ui/gfx/android/java_bitmap.h"
+#include "ui/gfx/android/window_android.h"
 #include "webkit/glue/user_agent.h"
 #include "webkit/glue/webmenuitem.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF16;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::GetClass;
 using base::android::HasField;
@@ skipping 24 matching lines @@
 ContentViewCore* ContentViewCore::GetNativeContentViewCore(JNIEnv* env,
                                                            jobject obj) {
   return reinterpret_cast<ContentViewCore*>(
       env->GetIntField(obj, g_native_content_view));
 }
 
 
 ContentViewCoreImpl::ContentViewCoreImpl(JNIEnv* env, jobject obj,
                                          bool hardware_accelerated,
                                          bool take_ownership_of_web_contents,
-                                         WebContents* web_contents)
+                                         WebContents* web_contents,
+                                         WindowAndroid* window_android)
     : java_ref_(env, obj),
       web_contents_(static_cast<WebContentsImpl*>(web_contents)),
       owns_web_contents_(take_ownership_of_web_contents),
       tab_crashed_(false) {
   DCHECK(web_contents) <<
       "A ContentViewCoreImpl should be created with a valid WebContents.";
 
+  window_android_ = window_android;

[David Trainor- moved to gerrit, 2012/09/10 20:51:05]

Put this up with java_ref_, just make sure you do it in the same order as the
member variables are listed in the header file.

[aurimas (slooooooooow), 2012/09/10 23:48:47]

Done.

+
   // TODO(leandrogracia): make use of the hardware_accelerated argument.
 
   InitJNI(env, obj);
 
   notification_registrar_.Add(this,
                               NOTIFICATION_EXECUTE_JAVASCRIPT_RESULT,
                               NotificationService::AllSources());
 
   // Currently, the only use case we have for overriding a user agent involves
   // spoofing a desktop Linux user agent for "Request desktop site".
@@ skipping 414 matching lines @@
 // --------------------------------------------------------------------------
 // Methods called from native code
 // --------------------------------------------------------------------------
 
 void ContentViewCoreImpl::LoadUrl(
     NavigationController::LoadURLParams& params) {
   web_contents()->GetController().LoadURLWithParams(params);
   PostLoadUrl(params.url);
 }
 
+WindowAndroid* ContentViewCoreImpl::GetWindowAndroid() {
+  return window_android_;
+}
+
 void ContentViewCoreImpl::PostLoadUrl(const GURL& url) {
   tab_crashed_ = false;
   // TODO(tedchoc): Update the content view client of the page load request.
 }
 
 // ----------------------------------------------------------------------------
 // Native JNI methods
 // ----------------------------------------------------------------------------
 
 // This is called for each ContentViewCore.
 jint Init(JNIEnv* env, jobject obj,
           jboolean hardware_accelerated,
           jboolean take_ownership_of_web_contents,
-          jint native_web_contents) {
+          jint native_web_contents,
+          jint native_window) {
   ContentViewCoreImpl* view = new ContentViewCoreImpl(
       env, obj, hardware_accelerated, take_ownership_of_web_contents,
-      reinterpret_cast<WebContents*>(native_web_contents));
+      reinterpret_cast<WebContents*>(native_web_contents),
+      reinterpret_cast<WindowAndroid*>(native_window));
   return reinterpret_cast<jint>(view);
 }
 
 jint EvaluateJavaScript(JNIEnv* env, jobject obj, jstring script) {
   ContentViewCoreImpl* view = static_cast<ContentViewCoreImpl*>
       (ContentViewCore::GetNativeContentViewCore(env, obj));
 
   return view->EvaluateJavaScript(env, obj, script);
 }
 
@@ skipping 155 matching lines @@
   if (!HasField(env, clazz, "mNativeContentViewCore", "I")) {
     DLOG(ERROR) << "Unable to find ContentView.mNativeContentViewCore!";
     return false;
   }
   g_native_content_view = GetFieldID(env, clazz, "mNativeContentViewCore", "I");
 
   return RegisterNativesImpl(env) >= 0;
 }
 
 }  // namespace content