| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "base/android/trace_event_binding.h" | 5 #include "base/android/trace_event_binding.h" |
| 6 | 6 |
| 7 #include <jni.h> | 7 #include <jni.h> |
| 8 | 8 |
| 9 #include <set> | 9 #include <set> |
| 10 | 10 |
| 11 #include "base/debug/trace_event.h" | |
| 12 #include "base/debug/trace_event_impl.h" | |
| 13 #include "base/lazy_instance.h" | 11 #include "base/lazy_instance.h" |
| 12 #include "base/trace_event/trace_event.h" |
| 13 #include "base/trace_event/trace_event_impl.h" |
| 14 #include "jni/TraceEvent_jni.h" | 14 #include "jni/TraceEvent_jni.h" |
| 15 | 15 |
| 16 namespace base { | 16 namespace base { |
| 17 namespace android { | 17 namespace android { |
| 18 | 18 |
| 19 namespace { | 19 namespace { |
| 20 | 20 |
| 21 const char kJavaCategory[] = "Java"; | 21 const char kJavaCategory[] = "Java"; |
| 22 const char kToplevelCategory[] = "toplevel"; | 22 const char kToplevelCategory[] = "toplevel"; |
| 23 const char kLooperDispatchMessage[] = "Looper.dispatchMessage"; | 23 const char kLooperDispatchMessage[] = "Looper.dispatchMessage"; |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 TraceEventDataConverter converter(env, jname, nullptr); | 138 TraceEventDataConverter converter(env, jname, nullptr); |
| 139 TRACE_EVENT_COPY_ASYNC_END0(kJavaCategory, converter.name(), jid); | 139 TRACE_EVENT_COPY_ASYNC_END0(kJavaCategory, converter.name(), jid); |
| 140 } | 140 } |
| 141 | 141 |
| 142 bool RegisterTraceEvent(JNIEnv* env) { | 142 bool RegisterTraceEvent(JNIEnv* env) { |
| 143 return RegisterNativesImpl(env); | 143 return RegisterNativesImpl(env); |
| 144 } | 144 } |
| 145 | 145 |
| 146 } // namespace android | 146 } // namespace android |
| 147 } // namespace base | 147 } // namespace base |
| OLD | NEW |