[Android] Upstream Modal Dialogs functionality

content/browser/android/content_view_client.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_client.h"
 
 #include <android/keycodes.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 114 matching lines @@
 
 void ContentViewClient::SetFindHelper(FindHelper* find_helper) {
   find_helper_ = find_helper;
 }
 
 void ContentViewClient::SetJavaScriptDialogCreator(
     JavaScriptDialogCreator* javascript_dialog_creator) {
   javascript_dialog_creator_ = javascript_dialog_creator;
 }
 
-bool ContentViewClient::OnJSModalDialog(JavaScriptMessageType type,
+bool ContentViewClient::OnJsModalDialog(JavaScriptMessageType type,
                                         bool is_before_unload_dialog,
                                         const GURL& url,
                                         const string16& message,
-                                        const string16& default_value) {
+                                        const string16& default_value,
+                                        jobject js_result) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jstring> jurl(ConvertUTF8ToJavaString(env, url.spec()));
   ScopedJavaLocalRef<jstring> jmessage(ConvertUTF16ToJavaString(env, message));
 
   // Special case for beforeunload dialogs, as that isn't encoded in the
   // |type| of the dialog.
   if (is_before_unload_dialog) {
     return Java_ContentViewClient_onJsBeforeUnload(env,
         weak_java_client_.get(env).obj(),
         jurl.obj(),
-        jmessage.obj());
+        jmessage.obj(),
+        js_result);
   }
 
   switch (type) {
     case JAVASCRIPT_MESSAGE_TYPE_ALERT:
       return Java_ContentViewClient_onJsAlert(env,
                                               weak_java_client_.get(env).obj(),
                                               jurl.obj(),
-                                              jmessage.obj());
+                                              jmessage.obj(),
+                                              js_result);
 
     case JAVASCRIPT_MESSAGE_TYPE_CONFIRM:
       return Java_ContentViewClient_onJsConfirm(env,
           weak_java_client_.get(env).obj(),
           jurl.obj(),
-          jmessage.obj());
+          jmessage.obj(),
+          js_result);
 
     case JAVASCRIPT_MESSAGE_TYPE_PROMPT: {
       ScopedJavaLocalRef<jstring> jdefault_value(
           ConvertUTF16ToJavaString(env, default_value));
       return Java_ContentViewClient_onJsPrompt(env,
                                                weak_java_client_.get(env).obj(),
                                                jurl.obj(),
                                                jmessage.obj(),
-                                               jdefault_value.obj());
+                                               jdefault_value.obj(),
+                                               js_result);
     }
 
     default:
       NOTREACHED();
       return false;
   }
 }
 
 // ----------------------------------------------------------------------------
 // WebContentsDelegate methods
@@ skipping 390 matching lines @@
 
 bool RegisterContentViewClient(JNIEnv* env) {
   if (!HasClass(env, kContentViewClientClassPath)) {
     DLOG(ERROR) << "Unable to find class ContentViewClient!";
     return false;
   }
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content