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

Unified Diff: base/android/trace_event_binding.cc

Issue 131553003: Move Android TraceEvent interface to base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Put back content version of TraceEvent*.java as wrappers to ease cross repository commit Created 6 years, 11 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: base/android/trace_event_binding.cc
diff --git a/content/common/android/trace_event_binding.cc b/base/android/trace_event_binding.cc
similarity index 96%
rename from content/common/android/trace_event_binding.cc
rename to base/android/trace_event_binding.cc
index 0a78b064bfcb2beeae19ae9100092d50a93a1194..7f5939635e294fd4945c2ef38df511cae55eea4b 100644
--- a/content/common/android/trace_event_binding.cc
+++ b/base/android/trace_event_binding.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "content/common/android/trace_event_binding.h"
+#include "base/android/trace_event_binding.h"
#include <jni.h>
@@ -12,6 +12,9 @@
#include "base/lazy_instance.h"
#include "jni/TraceEvent_jni.h"
+namespace base {
+namespace android {
+
namespace {
const char kJavaCategory[] = "Java";
@@ -133,3 +136,6 @@ static void FinishAsync(JNIEnv* env, jclass clazz,
bool RegisterTraceEvent(JNIEnv* env) {
return RegisterNativesImpl(env);
}
+
+} // namespace android
+} // namespace base
« no previous file with comments | « base/android/trace_event_binding.h ('k') | base/base.gyp » ('j') | base/base.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698