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

Unified Diff: components/web_contents_delegate_android/web_contents_delegate_android.cc

Issue 831523005: Remove most native WebContents references from Java (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 5 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: components/web_contents_delegate_android/web_contents_delegate_android.cc
diff --git a/components/web_contents_delegate_android/web_contents_delegate_android.cc b/components/web_contents_delegate_android/web_contents_delegate_android.cc
index 5c1b676736b4e35cd56722eccaf9e32381a6a504..63b83a5082d6fd7f3ea3287b282d92d996172e09 100644
--- a/components/web_contents_delegate_android/web_contents_delegate_android.cc
+++ b/components/web_contents_delegate_android/web_contents_delegate_android.cc
@@ -261,12 +261,22 @@ void WebContentsDelegateAndroid::WebContentsCreated(
ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);
if (obj.is_null())
return;
- Java_WebContentsDelegateAndroid_webContentsCreated(env, obj.obj(),
- reinterpret_cast<intptr_t>(source_contents),
+
+ ScopedJavaLocalRef<jobject> jsource_contents;
+ if (source_contents)
+ jsource_contents = source_contents->GetJavaWebContents();
+ ScopedJavaLocalRef<jobject> jnew_contents;
+ if (new_contents)
+ jnew_contents = new_contents->GetJavaWebContents();
+
+ Java_WebContentsDelegateAndroid_webContentsCreated(
+ env,
+ obj.obj(),
+ jsource_contents.obj(),
opener_render_frame_id,
base::android::ConvertUTF16ToJavaString(env, frame_name).Release(),
base::android::ConvertUTF8ToJavaString(env, target_url.spec()).Release(),
- reinterpret_cast<intptr_t>(new_contents));
+ jnew_contents.obj());
}
void WebContentsDelegateAndroid::CloseContents(WebContents* source) {

Powered by Google App Engine
This is Rietveld 408576698