content/common/android/common_jni_registrar.cc - Issue 131553003: Move Android TraceEvent interface to base

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/common/android/common_jni_registrar.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:

Index: content/common/android/common_jni_registrar.cc

diff --git a/content/common/android/common_jni_registrar.cc b/content/common/android/common_jni_registrar.cc

index 90aec04eec41069274eabbfbddfab4deabb71abc..751b66c4a52c38e916d438ec45624147f40b23ab 100644

--- a/content/common/android/common_jni_registrar.cc

+++ b/content/common/android/common_jni_registrar.cc

@@ -8,14 +8,12 @@

#include "base/android/jni_registrar.h"

#include "content/common/android/device_telephony_info.h"

#include "content/common/android/hash_set.h"

-#include "content/common/android/trace_event_binding.h"

namespace {

base::android::RegistrationMethod kContentRegisteredMethods[] = {

{ "DeviceTelephonyInfo",

content::DeviceTelephonyInfo::RegisterDeviceTelephonyInfo },

{ "HashSet", content::RegisterHashSet },

- { "TraceEvent", RegisterTraceEvent },

};

} // namespace