[Android] Upstream Modal Dialogs functionality

content/browser/android/content_view_client.cc

Index: content/browser/android/content_view_client.cc
diff --git a/content/browser/android/content_view_client.cc b/content/browser/android/content_view_client.cc
index d4e08fbc7260e000593302051a639d2086ec194b..e3bd50e2c0d83b33b0b15b6b521410b190808b97 100644
--- a/content/browser/android/content_view_client.cc
+++ b/content/browser/android/content_view_client.cc
@@ -132,11 +132,12 @@ void ContentViewClient::SetJavaScriptDialogCreator(
   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));
@@ -147,7 +148,8 @@ bool ContentViewClient::OnJSModalDialog(JavaScriptMessageType type,
     return Java_ContentViewClient_onJsBeforeUnload(env,
         weak_java_client_.get(env).obj(),
         jurl.obj(),
-        jmessage.obj());
+        jmessage.obj(),
+        js_result);
   }
 
   switch (type) {
@@ -155,13 +157,15 @@ bool ContentViewClient::OnJSModalDialog(JavaScriptMessageType type,
       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(
@@ -170,7 +174,8 @@ bool ContentViewClient::OnJSModalDialog(JavaScriptMessageType type,
                                                weak_java_client_.get(env).obj(),
                                                jurl.obj(),
                                                jmessage.obj(),
-                                               jdefault_value.obj());
+                                               jdefault_value.obj(),
+                                               js_result);
     }
 
     default: