content/browser/trace_controller.h - Issue 6933035: Revert 84284 - Merge gpu_trace_event back into base/debug/trace_event.Initial land attempt at htt...

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 6933035: Revert 84284 - Merge gpu_trace_event back into base/debug/trace_event.Initial land attempt at htt... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

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

Index: content/browser/trace_controller.h

===================================================================

--- content/browser/trace_controller.h (revision 84291)

+++ content/browser/trace_controller.h (working copy)

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

#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"

@@ -111,9 +110,7 @@

void AddFilter(TraceMessageFilter* filter);

void RemoveFilter(TraceMessageFilter* filter);

void OnEndTracingAck();

- void OnTraceDataCollected(

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

- json_events_str_ptr);

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

void OnTraceBufferFull();

void OnTraceBufferPercentFullReply(float percent_full);

« no previous file with comments | « content/browser/renderer_host/render_widget_host.cc ('k') | content/browser/trace_controller.cc » ('j') | no next file with comments »