[Android] Upstream Modal Dialogs functionality

content/browser/android/content_view_client.h

 // 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.
 
 #ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CLIENT_H_
 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CLIENT_H_
 
 #include "base/android/jni_helper.h"
 #include "base/compiler_specific.h"
 #include "content/public/browser/native_web_keyboard_event.h"
@@ skipping 73 matching lines @@
                        const GURL& url);
   void OnDidCommitMainFrame(const GURL& url,
                             const GURL& base_url);
   void OnInterstitialShown();
   void OnInterstitialHidden();
 
   void SetFindHelper(FindHelper* find_helper);
   void SetJavaScriptDialogCreator(
       JavaScriptDialogCreator* javascript_dialog_creator);
 
-  bool OnJSModalDialog(JavaScriptMessageType type,
+  bool 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);
 
   // Returns the actual load progress, a value between 0 (nothing loaded) and
   // 1 (page fully loaded).
   virtual double GetLoadProgress() const;
 
   // Overridden from WebContentsDelegate:
   virtual WebContents* OpenURLFromTab(
       WebContents* source,
       const OpenURLParams& params) OVERRIDE;
   virtual bool ShouldIgnoreNavigation(
@@ skipping 73 matching lines @@
   // Indicates the load state of the page. 0.0 means nothing loaded, 1 means
   // fully loaded.
   double load_progress_;
 };
 
 bool RegisterContentViewClient(JNIEnv* env);
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CLIENT_H_