base/trace_event/trace_event_impl.h - Issue 837303004: Move base/debug/trace_event* to base/trace_event/ [part 1]

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

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

Issue 837303004: Move base/debug/trace_event* to base/trace_event/ [part 1] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase with current tip 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 unified diff | Download patch

OLD	NEW
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_DEBUG_TRACE_EVENT_IMPL_H_	6 #ifndef BASE_DEBUG_TRACE_EVENT_IMPL_H_

7 #define BASE_DEBUG_TRACE_EVENT_IMPL_H_	7 #define BASE_DEBUG_TRACE_EVENT_IMPL_H_

8	8

9 #include <stack>	9 #include <stack>

10 #include <string>	10 #include <string>

(...skipping 793 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
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 debug	810 } // namespace debug

811 } // namespace base	811 } // namespace base

812	812

813 #endif // BASE_DEBUG_TRACE_EVENT_IMPL_H_	813 #endif // BASE_DEBUG_TRACE_EVENT_IMPL_H_

	814
	ssid 2015/01/22 16:55:17 rebase error, will remove rebase error, will remove
OLD	NEW

« no previous file with comments | « base/trace_event/trace_event_argument_unittest.cc ('k') | base/trace_event/trace_event_impl.cc » ('j') | no next file with comments »