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

Side by Side Diff: base/debug/trace_event.cc

Issue 8914022: Revert 114494 - Remove BindStateHolder and have Bind() return a Callback<> object directly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years 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 | Annotate | Revision Log
« no previous file with comments | « base/debug/trace_event.h ('k') | base/debug/trace_event_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include "base/debug/trace_event.h" 5 #include "base/debug/trace_event.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/format_macros.h" 10 #include "base/format_macros.h"
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 const std::string& json_trace_output) { 289 const std::string& json_trace_output) {
290 json_output += json_trace_output; 290 json_output += json_trace_output;
291 } 291 }
292 292
293 TraceResultBuffer::TraceResultBuffer() : append_comma_(false) { 293 TraceResultBuffer::TraceResultBuffer() : append_comma_(false) {
294 } 294 }
295 295
296 TraceResultBuffer::~TraceResultBuffer() { 296 TraceResultBuffer::~TraceResultBuffer() {
297 } 297 }
298 298
299 void TraceResultBuffer::SetOutputCallback( 299 void TraceResultBuffer::SetOutputCallback(OutputCallback json_chunk_callback) {
300 const OutputCallback& json_chunk_callback) {
301 output_callback_ = json_chunk_callback; 300 output_callback_ = json_chunk_callback;
302 } 301 }
303 302
304 void TraceResultBuffer::Start() { 303 void TraceResultBuffer::Start() {
305 append_comma_ = false; 304 append_comma_ = false;
306 output_callback_.Run("["); 305 output_callback_.Run("[");
307 } 306 }
308 307
309 void TraceResultBuffer::AddFragment(const std::string& trace_fragment) { 308 void TraceResultBuffer::AddFragment(const std::string& trace_fragment) {
310 if (append_comma_) 309 if (append_comma_)
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
720 kNoArgName, kNoArgValue, kNoArgName, kNoArgValue, 719 kNoArgName, kNoArgValue, kNoArgName, kNoArgValue,
721 p_data_->threshold_begin_id, p_data_->threshold, 720 p_data_->threshold_begin_id, p_data_->threshold,
722 TRACE_EVENT_FLAG_NONE); 721 TRACE_EVENT_FLAG_NONE);
723 } 722 }
724 } 723 }
725 724
726 } // namespace internal 725 } // namespace internal
727 726
728 } // namespace debug 727 } // namespace debug
729 } // namespace base 728 } // namespace base
OLDNEW
« no previous file with comments | « base/debug/trace_event.h ('k') | base/debug/trace_event_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698