Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2929)

Unified Diff: android_webview/native/aw_contents_client_bridge.cc

Issue 1530183004: Revert 3 CLs for shouldOverrideUrlLoading implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase (simple conflict in AwContentsClientShouldOverrideUrlLoadingTest). Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 02db65b0923854cd26db540bf2bff0fc4a53c7ed..4d2fd4dcb7d10282a76af0b20863f8625f5b70f3 100644
--- a/android_webview/native/aw_contents_client_bridge.cc
+++ b/android_webview/native/aw_contents_client_bridge.cc
@@ -341,6 +341,21 @@ void AwContentsClientBridge::RunBeforeUnloadDialog(
env, obj.obj(), jurl.obj(), jmessage.obj(), callback_id);
}
+bool AwContentsClientBridge::ShouldOverrideUrlLoading(const base::string16& url,
+ bool has_user_gesture,
+ bool is_redirect,
+ bool is_main_frame) {
+ JNIEnv* env = AttachCurrentThread();
+ ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
+ if (obj.is_null())
+ return false;
+ ScopedJavaLocalRef<jstring> jurl = ConvertUTF16ToJavaString(env, url);
+ devtools_instrumentation::ScopedEmbedderCallbackTask(
+ "shouldOverrideUrlLoading");
+ return Java_AwContentsClientBridge_shouldOverrideUrlLoading(
+ env, obj.obj(), jurl.obj(), has_user_gesture, is_redirect, is_main_frame);
+}
+
void AwContentsClientBridge::ConfirmJsResult(JNIEnv* env,
const JavaRef<jobject>&,
int id,
« no previous file with comments | « android_webview/native/aw_contents_client_bridge.h ('k') | android_webview/renderer/aw_content_renderer_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698