Upstream chromium side of modal dialogs for webview.

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 2154539bd03fd505bc6b431aed624954c2aa67fc..c77252fa987a22bfc67b94e50f588d369998ca5b 100644
--- a/content/browser/android/content_view_client.cc
+++ b/content/browser/android/content_view_client.cc
@@ -120,53 +120,6 @@ void ContentViewClient::OnInterstitialHidden() {
   Java_ContentViewClient_onInterstitialHidden(env, obj.obj());
 }
 
-bool ContentViewClient::OnJSModalDialog(JavaScriptMessageType type,
-                                        bool is_before_unload_dialog,
-                                        const GURL& url,
-                                        const string16& message,
-                                        const string16& default_value) {
-  JNIEnv* env = AttachCurrentThread();
-  ScopedJavaLocalRef<jobject> obj = weak_java_client_.get(env);
-  if (obj.is_null())
-    return false;
-  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, obj.obj(),
-        jurl.obj(),
-        jmessage.obj());
-  }
-
-  switch (type) {
-    case JAVASCRIPT_MESSAGE_TYPE_ALERT:
-      return Java_ContentViewClient_onJsAlert(env, obj.obj(),
-                                              jurl.obj(),
-                                              jmessage.obj());
-
-    case JAVASCRIPT_MESSAGE_TYPE_CONFIRM:
-      return Java_ContentViewClient_onJsConfirm(env, obj.obj(),
-                                                jurl.obj(),
-                                                jmessage.obj());
-
-    case JAVASCRIPT_MESSAGE_TYPE_PROMPT: {
-      ScopedJavaLocalRef<jstring> jdefault_value(
-          ConvertUTF16ToJavaString(env, default_value));
-      return Java_ContentViewClient_onJsPrompt(env, obj.obj(),
-                                               jurl.obj(),
-                                               jmessage.obj(),
-                                               jdefault_value.obj());
-    }
-
-    default:
-      NOTREACHED();
-      return false;
-  }
-}
-
 ContentViewClientError ContentViewClient::ToContentViewClientError(
     int net_error) {
     // Note: many net::Error constants don't have an obvious mapping.