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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/trace_message_filter.cc

Issue 6862002: Merge gpu_trace_event back into base/debug/trace_event (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge to 84062 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
« content/browser/trace_controller.cc ('K') | « content/browser/trace_controller.cc ('k') | content/common/child_trace_message_filter.h » ('j') | content/common/child_trace_message_filter.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/trace_message_filter.cc
diff --git a/content/browser/trace_message_filter.cc b/content/browser/trace_message_filter.cc
index e23fc2697806fe2e2b5b306fe2915d642774634e..c06d69cfb75f9ec6e1eede2281ca6cd20a2eb105 100644
--- a/content/browser/trace_message_filter.cc
+++ b/content/browser/trace_message_filter.cc
@@ -82,7 +82,8 @@ void TraceMessageFilter::OnEndTracingAck() {
}
void TraceMessageFilter::OnTraceDataCollected(const std::string& data) {
- TraceController::GetInstance()->OnTraceDataCollected(data);
+ TraceController::GetInstance()->OnTraceDataCollected(
+ make_scoped_refptr(new base::debug::TraceLog::RefCountedString(data)));
Sigurður Ásgeirsson 2011/05/04 18:58:09 nit: indent
scheib 2011/05/05 00:06:37 Done.
}
void TraceMessageFilter::OnTraceBufferFull() {
« content/browser/trace_controller.cc ('K') | « content/browser/trace_controller.cc ('k') | content/common/child_trace_message_filter.h » ('j') | content/common/child_trace_message_filter.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698