content/common/child_trace_message_filter.h - Issue 8369021: Revert: Internalize JSON chunk merging to trace_event.h API.

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

Unified Diff: content/common/child_trace_message_filter.h

Issue 8369021: Revert: Internalize JSON chunk merging to trace_event.h API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 2 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:

Index: content/common/child_trace_message_filter.h

diff --git a/content/common/child_trace_message_filter.h b/content/common/child_trace_message_filter.h

index 242e29932d4e44017b5e54139be4a42ab6d1c7fe..b145027e68007e9dea6dc0780e64e64d26d67b9f 100644

--- a/content/common/child_trace_message_filter.h

+++ b/content/common/child_trace_message_filter.h

@@ -32,7 +32,7 @@ class ChildTraceMessageFilter : public IPC::ChannelProxy::MessageFilter {

// Callback from trace subsystem.

void OnTraceDataCollected(

const scoped_refptr<base::debug::TraceLog::RefCountedString>&

- events_str_ptr);

+ json_events_str_ptr);

void OnTraceBufferFull();

IPC::Channel* channel_;