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

Unified Diff: base/trace_event/trace_event.h

Issue 885443002: Roll Chrome into Mojo. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Rebase to ToT mojo Created 5 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
« no previous file with comments | « base/trace_event/OWNERS ('k') | base/trace_event/trace_event_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/trace_event/trace_event.h
diff --git a/base/debug/trace_event.h b/base/trace_event/trace_event.h
similarity index 99%
copy from base/debug/trace_event.h
copy to base/trace_event/trace_event.h
index 975403641e0208cd0695f323eb63d9d6c4de8c7e..7f73071de27b06c41c0083ce244e0798d81a2171 100644
--- a/base/debug/trace_event.h
+++ b/base/trace_event/trace_event.h
@@ -186,16 +186,16 @@
// trace points would carry a significant performance cost of acquiring a lock
// and resolving the category.
-#ifndef BASE_DEBUG_TRACE_EVENT_H_
-#define BASE_DEBUG_TRACE_EVENT_H_
+#ifndef BASE_TRACE_EVENT_TRACE_EVENT_H_
+#define BASE_TRACE_EVENT_TRACE_EVENT_H_
#include <string>
#include "base/atomicops.h"
-#include "base/debug/trace_event_impl.h"
-#include "base/debug/trace_event_memory.h"
-#include "base/debug/trace_event_system_stats_monitor.h"
#include "base/time/time.h"
+#include "base/trace_event/trace_event_impl.h"
+#include "base/trace_event/trace_event_memory.h"
+#include "base/trace_event/trace_event_system_stats_monitor.h"
#include "build/build_config.h"
// By default, const char* argument values are assumed to have long-lived scope
@@ -1586,4 +1586,4 @@ template<typename IDType> class TraceScopedTrackableObject {
} // namespace debug
} // namespace base
-#endif /* BASE_DEBUG_TRACE_EVENT_H_ */
+#endif /* BASE_TRACE_EVENT_TRACE_EVENT_H_ */
« no previous file with comments | « base/trace_event/OWNERS ('k') | base/trace_event/trace_event_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698