| 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" | |
| 6 | |
| 7 #include <jni.h> | 5 #include <jni.h> |
| 8 | 6 |
| 9 #include <set> | 7 #include <set> |
| 10 | 8 |
| 11 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
| 12 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
| 13 #include "jni/TraceEvent_jni.h" | 11 #include "jni/TraceEvent_jni.h" |
| 14 | 12 |
| 15 namespace base { | 13 namespace base { |
| 16 namespace android { | 14 namespace android { |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 jid, | 124 jid, |
| 127 converter.arg_name(), | 125 converter.arg_name(), |
| 128 converter.arg()); | 126 converter.arg()); |
| 129 } else { | 127 } else { |
| 130 TRACE_EVENT_COPY_ASYNC_END0(kJavaCategory, | 128 TRACE_EVENT_COPY_ASYNC_END0(kJavaCategory, |
| 131 converter.name(), | 129 converter.name(), |
| 132 jid); | 130 jid); |
| 133 } | 131 } |
| 134 } | 132 } |
| 135 | 133 |
| 136 bool RegisterTraceEvent(JNIEnv* env) { | |
| 137 return RegisterNativesImpl(env); | |
| 138 } | |
| 139 | |
| 140 } // namespace android | 134 } // namespace android |
| 141 } // namespace base | 135 } // namespace base |
| OLD | NEW |