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

Side by Side Diff: base/trace_event/trace_event_impl.h

Issue 935333002: Update from https://crrev.com/316786 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « base/trace_event/trace_event_argument.h ('k') | base/trace_event/trace_event_impl.cc » ('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 5
6 #ifndef BASE_TRACE_EVENT_TRACE_EVENT_IMPL_H_ 6 #ifndef BASE_TRACE_EVENT_TRACE_EVENT_IMPL_H_
7 #define BASE_TRACE_EVENT_TRACE_EVENT_IMPL_H_ 7 #define BASE_TRACE_EVENT_TRACE_EVENT_IMPL_H_
8 8
9 #include <stack> 9 #include <stack>
10 #include <string> 10 #include <string>
(...skipping 792 matching lines...) Expand 10 before | Expand all | Expand 10 after
803 OutputCallback flush_output_callback_; 803 OutputCallback flush_output_callback_;
804 scoped_refptr<MessageLoopProxy> flush_message_loop_proxy_; 804 scoped_refptr<MessageLoopProxy> flush_message_loop_proxy_;
805 subtle::AtomicWord generation_; 805 subtle::AtomicWord generation_;
806 806
807 DISALLOW_COPY_AND_ASSIGN(TraceLog); 807 DISALLOW_COPY_AND_ASSIGN(TraceLog);
808 }; 808 };
809 809
810 } // namespace trace_event 810 } // namespace trace_event
811 } // namespace base 811 } // namespace base
812 812
813 // TODO(ssid): remove these aliases after the tracing clients are moved to the
814 // new trace_event namespace. See crbug.com/451032. ETA: March 2015.
815 namespace base {
816 namespace debug {
817 using base::trace_event::CategoryFilter;
818 using base::trace_event::ConvertableToTraceFormat;
819 using base::trace_event::RECORD_UNTIL_FULL;
820 using base::trace_event::RECORD_CONTINUOUSLY;
821 using base::trace_event::RECORD_AS_MUCH_AS_POSSIBLE;
822 using base::trace_event::TraceEventHandle;
823 using base::trace_event::TraceLog;
824 using base::trace_event::TraceLogStatus;
825 using base::trace_event::TraceOptions;
826 using base::trace_event::TraceResultBuffer;
827 } // namespace debug
828 } // namespace base
829
830 #endif // BASE_TRACE_EVENT_TRACE_EVENT_IMPL_H_ 813 #endif // BASE_TRACE_EVENT_TRACE_EVENT_IMPL_H_
OLDNEW
« no previous file with comments | « base/trace_event/trace_event_argument.h ('k') | base/trace_event/trace_event_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698