content/browser/android/content_video_view.cc - Issue 1308363003: Revert of jni_generator: Make all object-returning natives return ScopedJavaLocalRef.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/android/content_video_view.cc

Issue 1308363003: Revert of jni_generator: Make all object-returning natives return ScopedJavaLocalRef. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 4 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

« no previous file with comments | « components/variations/android/variations_associated_data_android.cc ('k') | content/browser/android/content_view_core_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/android/content_video_view.cc

diff --git a/content/browser/android/content_video_view.cc b/content/browser/android/content_video_view.cc

index ef5369e80e4a01426d3a4147afe5e9783dd6e811..2a5ce048b55ae8bc045d361cf7687b3f780228d4 100644

--- a/content/browser/android/content_video_view.cc

+++ b/content/browser/android/content_video_view.cc

@@ -31,12 +31,11 @@

} // namespace

-static ScopedJavaLocalRef<jobject> GetSingletonJavaContentVideoView(JNIEnv* env,

- jclass) {

+static jobject GetSingletonJavaContentVideoView(JNIEnv*env, jclass) {

if (g_content_video_view)

- return g_content_video_view->GetJavaObject(env);

+ return g_content_video_view->GetJavaObject(env).Release();

else

- return ScopedJavaLocalRef<jobject>();

+ return NULL;

}

bool ContentVideoView::RegisterContentVideoView(JNIEnv* env) {