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

Unified Diff: base/trace_event/trace_event_argument.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/trace_event_android.cc ('k') | base/trace_event/trace_event_argument.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/trace_event/trace_event_argument.h
diff --git a/base/debug/trace_event_argument.h b/base/trace_event/trace_event_argument.h
similarity index 87%
copy from base/debug/trace_event_argument.h
copy to base/trace_event/trace_event_argument.h
index 98f1bcf2fc90ca2c9ff97a382f014bd32acad4a5..08a5b50057f81735af1edc2c06fa6880553e0d5b 100644
--- a/base/debug/trace_event_argument.h
+++ b/base/trace_event/trace_event_argument.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef BASE_DEBUG_TRACE_EVENT_ARGUMENT_H_
-#define BASE_DEBUG_TRACE_EVENT_ARGUMENT_H_
+#ifndef BASE_TRACE_EVENT_TRACE_EVENT_ARGUMENT_H_
+#define BASE_TRACE_EVENT_TRACE_EVENT_ARGUMENT_H_
#include <string>
#include <vector>
-#include "base/debug/trace_event.h"
#include "base/memory/scoped_ptr.h"
+#include "base/trace_event/trace_event.h"
namespace base {
class DictionaryValue;
@@ -56,4 +56,4 @@ class BASE_EXPORT TracedValue : public ConvertableToTraceFormat {
} // namespace debug
} // namespace base
-#endif // BASE_DEBUG_TRACE_EVENT_ARGUMENT_H_
+#endif // BASE_TRACE_EVENT_TRACE_EVENT_ARGUMENT_H_
« no previous file with comments | « base/trace_event/trace_event_android.cc ('k') | base/trace_event/trace_event_argument.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698