| OLD | NEW |
| 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/debug/trace_event.h" | |
| 10 #include "base/json/json_writer.h" | 9 #include "base/json/json_writer.h" |
| 11 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "base/trace_event/trace_event.h" |
| 12 #include "content/public/browser/tracing_controller.h" | 12 #include "content/public/browser/tracing_controller.h" |
| 13 #include "jni/TracingControllerAndroid_jni.h" | 13 #include "jni/TracingControllerAndroid_jni.h" |
| 14 | 14 |
| 15 namespace content { | 15 namespace content { |
| 16 | 16 |
| 17 static jlong Init(JNIEnv* env, jobject obj) { | 17 static jlong Init(JNIEnv* env, jobject obj) { |
| 18 TracingControllerAndroid* profiler = new TracingControllerAndroid(env, obj); | 18 TracingControllerAndroid* profiler = new TracingControllerAndroid(env, obj); |
| 19 return reinterpret_cast<intptr_t>(profiler); | 19 return reinterpret_cast<intptr_t>(profiler); |
| 20 } | 20 } |
| 21 | 21 |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 static jstring GetDefaultCategories(JNIEnv* env, jobject obj) { | 107 static jstring GetDefaultCategories(JNIEnv* env, jobject obj) { |
| 108 return base::android::ConvertUTF8ToJavaString(env, | 108 return base::android::ConvertUTF8ToJavaString(env, |
| 109 base::debug::CategoryFilter::kDefaultCategoryFilterString).Release(); | 109 base::debug::CategoryFilter::kDefaultCategoryFilterString).Release(); |
| 110 } | 110 } |
| 111 | 111 |
| 112 bool RegisterTracingControllerAndroid(JNIEnv* env) { | 112 bool RegisterTracingControllerAndroid(JNIEnv* env) { |
| 113 return RegisterNativesImpl(env); | 113 return RegisterNativesImpl(env); |
| 114 } | 114 } |
| 115 | 115 |
| 116 } // namespace content | 116 } // namespace content |
| OLD | NEW |