content/browser/android/tracing_controller_android.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/tracing_controller_android.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

Index: content/browser/android/tracing_controller_android.cc

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

index ac814d1f9c31df36fa36cfde6fdb16a7a1fc4c16..917d1a33d26806d7ce73b0b09fff8a9e866d2531 100644

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

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

@@ -102,11 +102,12 @@

LOG(WARNING) << "{\"traceCategoriesList\": " << received_category_list << "}";

}

-static ScopedJavaLocalRef<jstring> GetDefaultCategories(JNIEnv* env,

- jobject obj) {

+static jstring GetDefaultCategories(JNIEnv* env, jobject obj) {

base::trace_event::TraceConfig trace_config;

return base::android::ConvertUTF8ToJavaString(

- env, trace_config.ToCategoryFilterString());

+ env,

+ trace_config.ToCategoryFilterString())

+ .Release();

}

bool RegisterTracingControllerAndroid(JNIEnv* env) {

« no previous file with comments | « content/browser/android/content_view_statics.cc ('k') | content/browser/web_contents/web_contents_android.cc » ('j') | no next file with comments »