[Android] Upstream Modal Dialogs functionality

chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.cc

Index: chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.cc
diff --git a/chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.cc b/chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.cc
index 069e16ed133dc6dd37a50b3f5053f91a71e5dabf..477337f6cc1c3a0ffe1f06bc21a89afaf15fcfba 100644
--- a/chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.cc
+++ b/chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.cc
@@ -25,6 +25,16 @@
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
+#if defined(OS_ANDROID)
+#include "base/android/jni_android.h"
+#include "base/android/scoped_java_ref.h"
+#include "chrome/browser/android/js_result_handler.h"
+#include "content/public/browser/android/content_view_core.h"
+
+using base::android::ScopedJavaLocalRef;
+using content::ContentViewCore;
+#endif
+
 using content::JavaScriptDialogCreator;
 using content::WebContents;
 
@@ -73,6 +83,8 @@ class ChromeJavaScriptDialogCreator : public JavaScriptDialogCreator,
 
   void CancelPendingDialogs(WebContents* web_contents);
 
+  void EnqueueDialog(JavaScriptAppModalDialog* dialog);
+
   // Wrapper around a DialogClosedCallback so that we can intercept it before
   // passing it onto the original callback.
   void OnDialogClosed(DialogClosedCallback callback,
@@ -151,10 +163,7 @@ void ChromeJavaScriptDialogCreator::RunJavaScriptDialog(
   bool is_alert = message_type == content::JAVASCRIPT_MESSAGE_TYPE_ALERT;
   string16 dialog_title = GetTitle(origin_url, accept_lang, is_alert);
 
-  if (extension_host_)
-    extension_host_->WillRunJavaScriptDialog();
-
-  AppModalDialogQueue::GetInstance()->AddDialog(new JavaScriptAppModalDialog(
+  JavaScriptAppModalDialog* dialog = new JavaScriptAppModalDialog(
       web_contents,
       extra_data,
       dialog_title,
@@ -165,7 +174,9 @@ void ChromeJavaScriptDialogCreator::RunJavaScriptDialog(
       false,  // is_before_unload_dialog
       false,  // is_reload
       base::Bind(&ChromeJavaScriptDialogCreator::OnDialogClosed,
-                 base::Unretained(this), callback)));
+                 base::Unretained(this), callback));
+
+  EnqueueDialog(dialog);
 }
 
 void ChromeJavaScriptDialogCreator::RunBeforeUnloadDialog(
@@ -183,10 +194,7 @@ void ChromeJavaScriptDialogCreator::RunBeforeUnloadDialog(
 
   string16 full_message = message_text + ASCIIToUTF16("\n\n") + footer;
 
-  if (extension_host_)
-    extension_host_->WillRunJavaScriptDialog();
-
-  AppModalDialogQueue::GetInstance()->AddDialog(new JavaScriptAppModalDialog(
+  JavaScriptAppModalDialog* dialog = new JavaScriptAppModalDialog(
       web_contents,
       extra_data,
       title,
@@ -197,7 +205,35 @@ void ChromeJavaScriptDialogCreator::RunBeforeUnloadDialog(
       true,        // is_before_unload_dialog
       is_reload,
       base::Bind(&ChromeJavaScriptDialogCreator::OnDialogClosed,
-                 base::Unretained(this), callback)));
+                 base::Unretained(this), callback));
+  EnqueueDialog(dialog);
+}
+
+void ChromeJavaScriptDialogCreator::EnqueueDialog(
+    JavaScriptAppModalDialog* dialog) {
+#if defined(OS_ANDROID)
+  content::ContentViewCore* content_view_core =
+      ContentViewCore::FromWebContents(dialog->web_contents());
+  JNIEnv* env = base::android::AttachCurrentThread();
+  ScopedJavaLocalRef<jobject> js_results_handler = createJsResultHandler(
+      env,
+      dialog);
+  bool should_use_native = content_view_core->
+      ShouldUseNativeJsModalDialog(dialog->javascript_message_type(),
+                                   dialog->is_before_unload_dialog(),
+                                   dialog->message_text(),
+                                   dialog->default_prompt_text(),
+                                   js_results_handler.obj());
+  if (!should_use_native
+      || clientHasCalledConfirmOrCancel(env, js_results_handler.obj()))
+    return;
+  setJsResultHandledByNative(env, js_results_handler.obj());
+#else
+  if (extension_host_)
+    extension_host_->WillRunJavaScriptDialog();
+#endif
+
+  AppModalDialogQueue::GetInstance()->AddDialog(dialog);
 }
 
 void ChromeJavaScriptDialogCreator::ResetJavaScriptState(