android_webview/native/aw_contents_statics.cc - Issue 1288183004: 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: android_webview/native/aw_contents_statics.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

« no previous file with comments | « android_webview/native/android_protocol_handler.cc ('k') | android_webview/native/aw_settings.cc » ('j') | chrome/browser/signin/oauth2_token_service_delegate_android.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/native/aw_contents_statics.cc

diff --git a/android_webview/native/aw_contents_statics.cc b/android_webview/native/aw_contents_statics.cc

index f930e3d1686d30547fb373b9ab866e77091107b5..11e39b534c225545c2250e463b12b2e3df6f5fa4 100644

--- a/android_webview/native/aw_contents_statics.cc

+++ b/android_webview/native/aw_contents_statics.cc

@@ -77,9 +77,9 @@ void SetDataReductionProxyEnabled(JNIEnv* env, jclass, jboolean enabled) {

}

// static

-jstring GetUnreachableWebDataUrl(JNIEnv* env, jclass) {

+ScopedJavaLocalRef<jstring> GetUnreachableWebDataUrl(JNIEnv* env, jclass) {

return base::android::ConvertUTF8ToJavaString(

- env, content::kUnreachableWebDataURL).Release();

+ env, content::kUnreachableWebDataURL);

}

// static

@@ -93,8 +93,8 @@ void SetLegacyCacheRemovalDelayForTest(JNIEnv*, jclass, jlong delay_ms) {

}

// static

-jstring GetProductVersion(JNIEnv* env, jclass) {

- return base::android::ConvertUTF8ToJavaString(env, PRODUCT_VERSION).Release();

+ScopedJavaLocalRef<jstring> GetProductVersion(JNIEnv* env, jclass) {

+ return base::android::ConvertUTF8ToJavaString(env, PRODUCT_VERSION);

}

bool RegisterAwContentsStatics(JNIEnv* env) {