content/browser/trace_controller.h - Issue 6862002: Merge gpu_trace_event back into base/debug/trace_event

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/browser/trace_controller.h

Issue 6862002: Merge gpu_trace_event back into base/debug/trace_event (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: shared dll build, phishing test shutdown crashes, tsan warnings; merge 84612 Created 9 years, 7 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/browser/trace_controller.h

diff --git a/content/browser/trace_controller.h b/content/browser/trace_controller.h

index 4308e82353d0e536a92aa9e59b5be865f5b0dfee..33e14c6ef4ec3fea0ed9a4cc6333ed8ff3de2647 100644

--- a/content/browser/trace_controller.h

+++ b/content/browser/trace_controller.h

@@ -8,6 +8,7 @@

#include <set>

#include <string>

+#include "base/debug/trace_event.h"

#include "base/memory/ref_counted.h"

#include "base/memory/singleton.h"

#include "base/task.h"

@@ -110,7 +111,9 @@ class TraceController {

void AddFilter(TraceMessageFilter* filter);

void RemoveFilter(TraceMessageFilter* filter);

void OnEndTracingAck();

- void OnTraceDataCollected(const std::string& data);

+ void OnTraceDataCollected(

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

+ json_events_str_ptr);

void OnTraceBufferFull();

void OnTraceBufferPercentFullReply(float percent_full);