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

Side by Side Diff: content/browser/android/tracing_controller_android.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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/android/tracing_controller_android.h" 5 #include "content/browser/android/tracing_controller_android.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_string.h" 8 #include "base/android/jni_string.h"
9 #include "base/json/json_writer.h" 9 #include "base/json/json_writer.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 ++it) { 95 ++it) {
96 category_list.AppendString(*it); 96 category_list.AppendString(*it);
97 } 97 }
98 std::string received_category_list; 98 std::string received_category_list;
99 base::JSONWriter::Write(category_list, &received_category_list); 99 base::JSONWriter::Write(category_list, &received_category_list);
100 100
101 // This log is required by adb_profile_chrome.py. 101 // This log is required by adb_profile_chrome.py.
102 LOG(WARNING) << "{\"traceCategoriesList\": " << received_category_list << "}"; 102 LOG(WARNING) << "{\"traceCategoriesList\": " << received_category_list << "}";
103 } 103 }
104 104
105 static jstring GetDefaultCategories(JNIEnv* env, jobject obj) { 105 static ScopedJavaLocalRef<jstring> GetDefaultCategories(JNIEnv* env,
106 jobject obj) {
106 base::trace_event::TraceConfig trace_config; 107 base::trace_event::TraceConfig trace_config;
107 return base::android::ConvertUTF8ToJavaString( 108 return base::android::ConvertUTF8ToJavaString(
108 env, 109 env, trace_config.ToCategoryFilterString());
109 trace_config.ToCategoryFilterString())
110 .Release();
111 } 110 }
112 111
113 bool RegisterTracingControllerAndroid(JNIEnv* env) { 112 bool RegisterTracingControllerAndroid(JNIEnv* env) {
114 return RegisterNativesImpl(env); 113 return RegisterNativesImpl(env);
115 } 114 }
116 115
117 } // namespace content 116 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698