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

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

Issue 1288183004: jni_generator: Make all object-returning natives return ScopedJavaLocalRef. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add some newlines for readability 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
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 2a5ce048b55ae8bc045d361cf7687b3f780228d4..ef5369e80e4a01426d3a4147afe5e9783dd6e811 100644
--- a/content/browser/android/content_video_view.cc
+++ b/content/browser/android/content_video_view.cc
@@ -31,11 +31,12 @@ ContentVideoView* g_content_video_view = NULL;
} // namespace
-static jobject GetSingletonJavaContentVideoView(JNIEnv*env, jclass) {
+static ScopedJavaLocalRef<jobject> GetSingletonJavaContentVideoView(JNIEnv* env,
+ jclass) {
if (g_content_video_view)
- return g_content_video_view->GetJavaObject(env).Release();
+ return g_content_video_view->GetJavaObject(env);
else
- return NULL;
+ return ScopedJavaLocalRef<jobject>();
}
bool ContentVideoView::RegisterContentVideoView(JNIEnv* env) {

Powered by Google App Engine
This is Rietveld 408576698