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

Side by Side Diff: content/common/android/trace_event_binding.cc

Issue 10532155: Upstream some more content/ DEPS-related cleanup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove JNIHelper/BitmapHolder Created 8 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/common/android/trace_event_binding.h ('k') | content/content_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/trace_event_binding.h" 5 #include "content/common/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" 11 #include "base/debug/trace_event.h"
12 #include "base/lazy_instance.h" 12 #include "base/lazy_instance.h"
13 #include "jni/trace_event_jni.h" 13 #include "jni/trace_event_jni.h"
14 14
15 namespace { 15 namespace {
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 TRACE_EVENT_COPY_END1(kJavaCategory, converter.name(), 84 TRACE_EVENT_COPY_END1(kJavaCategory, converter.name(),
85 converter.arg_name(), converter.arg()); 85 converter.arg_name(), converter.arg());
86 } else { 86 } else {
87 TRACE_EVENT_COPY_END0(kJavaCategory, converter.name()); 87 TRACE_EVENT_COPY_END0(kJavaCategory, converter.name());
88 } 88 }
89 } 89 }
90 90
91 bool RegisterTraceEvent(JNIEnv* env) { 91 bool RegisterTraceEvent(JNIEnv* env) {
92 return RegisterNativesImpl(env); 92 return RegisterNativesImpl(env);
93 } 93 }
OLDNEW
« no previous file with comments | « content/common/android/trace_event_binding.h ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698