Upstream chromium side of modal dialogs for webview.

android_webview/native/aw_contents.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 "android_webview/native/aw_contents.h"
 
 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h"
 #include "android_webview/native/aw_browser_dependency_factory.h"
 #include "android_webview/native/aw_contents_container.h"
 #include "android_webview/native/aw_web_contents_delegate.h"
 #include "android_webview/native/aw_contents_io_thread_client.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/supports_user_data.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/AwContents_jni.h"
 
 using base::android::AttachCurrentThread;
+using base::android::ConvertUTF16ToJavaString;
 using base::android::ConvertUTF8ToJavaString;
-using base::android::ConvertUTF16ToJavaString;
 using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
 using content::BrowserThread;
 using content::ContentViewCore;
 using content::WebContents;
 
 namespace android_webview {
 
 namespace {
 
@@ skipping 27 matching lines @@
     : java_ref_(env, obj),
       web_contents_delegate_(
           new AwWebContentsDelegate(env, web_contents_delegate)) {
   android_webview::AwBrowserDependencyFactory* dependency_factory =
       android_webview::AwBrowserDependencyFactory::GetInstance();
   content::WebContents* web_contents =
       dependency_factory->CreateWebContents(private_browsing);
   contents_container_.reset(dependency_factory->CreateContentsContainer(
       web_contents));
   web_contents->SetDelegate(web_contents_delegate_.get());
-  web_contents_delegate_->SetJavaScriptDialogCreator(
-      dependency_factory->GetJavaScriptDialogCreator());
   web_contents->SetUserData(kAwContentsUserDataKey,
                             new AwContentsUserData(this));
   render_view_host_ext_.reset(new AwRenderViewHostExt(web_contents));
 }
 
 AwContents::~AwContents() {
   content::WebContents* web_contents = contents_container_->GetWebContents();
   DCHECK(AwContents::FromWebContents(web_contents) == this);
   web_contents->RemoveUserData(kAwContentsUserDataKey);
 }
@@ skipping 17 matching lines @@
 }
 }  // namespace
 
 void AwContents::DocumentHasImages(JNIEnv* env, jobject obj, jobject message) {
   render_view_host_ext_->DocumentHasImages(
       base::Bind(&DocumentHasImagesCallback,
                  base::Owned(new ScopedJavaGlobalRef<jobject>(
                     ScopedJavaLocalRef<jobject>(env, message)))));
 }
 
+void AwContents::RunJavaScriptDialog(
+    content::JavaScriptMessageType message_type,
+    const GURL& origin_url,
+    const string16& message_text,
+    const string16& default_prompt_text,
+    const base::android::ScopedJavaLocalRef<jobject>& js_result) {
+  JNIEnv* env = base::android::AttachCurrentThread();
+
+  ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
+  if (obj.is_null())
+    return;
+
+  ScopedJavaLocalRef<jstring> jurl(ConvertUTF8ToJavaString(
+      env, origin_url.spec()));
+  ScopedJavaLocalRef<jstring> jmessage(ConvertUTF16ToJavaString(
+      env, message_text));
+  switch (message_type) {
+    case content::JAVASCRIPT_MESSAGE_TYPE_ALERT:
+      Java_AwContents_handleJsAlert(
+          env, obj.obj(), jurl.obj(), jmessage.obj(), js_result.obj());
+      break;
+    case content::JAVASCRIPT_MESSAGE_TYPE_CONFIRM:
+      Java_AwContents_handleJsConfirm(
+          env, obj.obj(), jurl.obj(), jmessage.obj(), js_result.obj());
+      break;
+    case content::JAVASCRIPT_MESSAGE_TYPE_PROMPT: {
+      ScopedJavaLocalRef<jstring> jdefault_value(
+          ConvertUTF16ToJavaString(env, default_prompt_text));
+      Java_AwContents_handleJsPrompt(
+          env, obj.obj(), jurl.obj(), jmessage.obj(),
+          jdefault_value.obj(), js_result.obj());
+      break;
+    }
+    default:
+      NOTREACHED();
+  }
+}
+
+void AwContents::RunBeforeUnloadDialog(
+    const GURL& origin_url,
+    const string16& message_text,
+    const base::android::ScopedJavaLocalRef<jobject>& js_result) {
+  JNIEnv* env = base::android::AttachCurrentThread();
+
+  ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
+  if (obj.is_null())
+    return;
+
+  ScopedJavaLocalRef<jstring> jurl(ConvertUTF8ToJavaString(
+      env, origin_url.spec()));
+  ScopedJavaLocalRef<jstring> jmessage(ConvertUTF16ToJavaString(
+      env, message_text));
+  Java_AwContents_handleJsBeforeUnload(
+          env, obj.obj(), jurl.obj(), jmessage.obj(), js_result.obj());
+}
+
 void AwContents::onReceivedHttpAuthRequest(
     const base::android::JavaRef<jobject>& handler,
     const std::string& host,
     const std::string& realm) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jstring> jhost = ConvertUTF8ToJavaString(env, host);
   ScopedJavaLocalRef<jstring> jrealm = ConvertUTF8ToJavaString(env, realm);
   Java_AwContents_onReceivedHttpAuthRequest(env, java_ref_.get(env).obj(),
                                             handler.obj(), jhost.obj(),
                                             jrealm.obj());
@@ skipping 14 matching lines @@
                                    private_browsing);
   return reinterpret_cast<jint>(tab);
 }
 
 bool RegisterAwContents(JNIEnv* env) {
   return RegisterNativesImpl(env) >= 0;
 }
 
 
 }  // namespace android_webview