[Android] Upstream Modal Dialogs functionality

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 52 matching lines @@
 };
 
 // ----------------------------------------------------------------------------
 // Implementation of static ContentViewCore public interfaces
 
 ContentViewCore* ContentViewCore::Create(JNIEnv* env, jobject obj,
                                          WebContents* web_contents) {
   return new ContentViewCoreImpl(env, obj, web_contents);
 }
 
+// static
+ContentViewCore* ContentViewCore::FromWebContents(WebContents* web_contents) {
+  return web_contents->GetContentNativeView();
+}
+
+// static
 ContentViewCore* ContentViewCore::GetNativeContentViewCore(JNIEnv* env,
                                                            jobject obj) {
   return reinterpret_cast<ContentViewCore*>(
       env->GetIntField(obj, g_native_content_view));
 }
 
 // ----------------------------------------------------------------------------
 
 ContentViewCoreImpl::ContentViewCoreImpl(JNIEnv* env, jobject obj,
                                          WebContents* web_contents)
@@ skipping 57 matching lines @@
 }
 
 RenderWidgetHostViewAndroid*
     ContentViewCoreImpl::GetRenderWidgetHostViewAndroid() {
   RenderWidgetHostView* rwhv = NULL;
   if (web_contents_)
     rwhv = web_contents_->GetRenderWidgetHostView();
   return static_cast<RenderWidgetHostViewAndroid*>(rwhv);
 }
 
+bool ContentViewCoreImpl::ShouldUseNativeJsModalDialog(
+    JavaScriptMessageType type,
+    bool is_before_unload_dialog,
+    const string16& message,
+    const string16& default_text,
+    jobject js_result) {
+  if (!content_view_client_.get())
+    return true;
+  return !content_view_client_->OnJsModalDialog(type,

[joth, 2012/08/15 06:11:25]

this is another example of adding an awkward API on content that's only purpose
is to call right back out to the client again.

added some comments on crbug.com/138483 about it.

+                                                is_before_unload_dialog,
+                                                web_contents_->GetURL(),
+                                                message,
+                                                default_text,
+                                                js_result);
+}
 // ----------------------------------------------------------------------------
 // Methods called from Java via JNI
 // ----------------------------------------------------------------------------
 
 void ContentViewCoreImpl::SelectPopupMenuItems(JNIEnv* env, jobject obj,
                                                jintArray indices) {
   RenderViewHostImpl* rvhi = static_cast<RenderViewHostImpl*>(
       web_contents_->GetRenderViewHost());
   DCHECK(rvhi);
   if (indices == NULL) {
@@ skipping 397 matching lines @@
 void ContentViewCoreImpl::DidSetNeedTouchEvents(bool need_touch_events) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> j_obj = java_ref_.get(env);
   if (j_obj.is_null())
     return;
   Java_ContentViewCore_didSetNeedTouchEvents(env,
                                              j_obj.obj(),
                                              need_touch_events);
 }
 
+ScopedJavaLocalRef<jobject> ContentViewCoreImpl::GetJavaObject() {
+  JNIEnv* env = AttachCurrentThread();
+  return java_ref_.get(env);
+}
+
 bool ContentViewCoreImpl::HasFocus() {
   NOTIMPLEMENTED() << "not upstreamed yet";
   return false;
 }
 
 void ContentViewCoreImpl::OnSelectionChanged(const std::string& text) {
   NOTIMPLEMENTED() << "not upstreamed yet";
 }
 
 void ContentViewCoreImpl::OnSelectionBoundsChanged(
@@ skipping 46 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