diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-20 19:28:39 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-20 19:28:39 +0000 |
| commit | 19fd5fa71955470f698bef815fabe2c1ac27f828 (patch) | |
| tree | df851a0604da9880f501835ae63e688b0901f4a8 /android_webview/native/android_webview_jni_registrar.cc | |
| parent | 18fb7a77d7bf1445bf6e68fa16a30e3ccc273847 (diff) | |
| download | chromium_src-19fd5fa71955470f698bef815fabe2c1ac27f828.zip chromium_src-19fd5fa71955470f698bef815fabe2c1ac27f828.tar.gz chromium_src-19fd5fa71955470f698bef815fabe2c1ac27f828.tar.bz2 | |
Upstream chromium side of modal dialogs for webview.
There's still some default handling needed if the embedder doesn't override the handler.
Includes clean-up of previous hooks in content that aren't needed anymore.
BUG=138483
Review URL: https://chromiumcodereview.appspot.com/10907166
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157815 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/native/android_webview_jni_registrar.cc')
| -rw-r--r-- | android_webview/native/android_webview_jni_registrar.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/android_webview/native/android_webview_jni_registrar.cc b/android_webview/native/android_webview_jni_registrar.cc index 6b62267..ba497db 100644 --- a/android_webview/native/android_webview_jni_registrar.cc +++ b/android_webview/native/android_webview_jni_registrar.cc @@ -9,6 +9,7 @@ #include "android_webview/native/aw_contents_io_thread_client.h" #include "android_webview/native/aw_http_auth_handler.h" #include "android_webview/native/cookie_manager.h" +#include "android_webview/native/js_result_handler.h" #include "base/android/jni_android.h" #include "base/android/jni_registrar.h" #include "chrome/browser/component/web_contents_delegate_android/component_jni_registrar.h" @@ -21,6 +22,7 @@ static base::android::RegistrationMethod kWebViewRegisteredMethods[] = { { "AwContentsIoThreadClient", RegisterAwContentsIoThreadClient}, { "AwHttpAuthHandler", RegisterAwHttpAuthHandler }, { "CookieManager", RegisterCookieManager }, + { "JsResultHandler", RegisterJsResultHandler }, }; bool RegisterJni(JNIEnv* env) { |