Index: android_webview/native/aw_contents_client_bridge.cc |
diff --git a/android_webview/native/aw_contents_client_bridge.cc b/android_webview/native/aw_contents_client_bridge.cc |
index 5431be749a6302a14e7762d752257d4e648ba6c7..f5bccdffd86bc6a5b25f4c1c3d1df2e9796dc373 100644 |
--- a/android_webview/native/aw_contents_client_bridge.cc |
+++ b/android_webview/native/aw_contents_client_bridge.cc |
@@ -262,8 +262,10 @@ void AwContentsClientBridge::RunJavaScriptDialog( |
JNIEnv* env = AttachCurrentThread(); |
ScopedJavaLocalRef<jobject> obj = java_ref_.get(env); |
- if (obj.is_null()) |
+ if (obj.is_null()) { |
+ callback.Run(false, base::string16()); |
return; |
+ } |
int callback_id = pending_js_dialog_callbacks_.Add( |
new content::JavaScriptDialogManager::DialogClosedCallback(callback)); |
@@ -310,8 +312,10 @@ void AwContentsClientBridge::RunBeforeUnloadDialog( |
JNIEnv* env = AttachCurrentThread(); |
ScopedJavaLocalRef<jobject> obj = java_ref_.get(env); |
- if (obj.is_null()) |
+ if (obj.is_null()) { |
+ callback.Run(false, base::string16()); |
return; |
+ } |
int callback_id = pending_js_dialog_callbacks_.Add( |
new content::JavaScriptDialogManager::DialogClosedCallback(callback)); |