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

Side by Side Diff: content/browser/tracing/tracing_controller_impl.cc

Issue 2319783002: mash: Allow a subset of D-Bus clients to be created in DBusThreadManager (Closed)
Patch Set: WIP, add DBusThreadManagerAsh and DBusThreadManagerChrome Created 4 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 #include "content/browser/tracing/tracing_controller_impl.h" 4 #include "content/browser/tracing/tracing_controller_impl.h"
5 5
6 #include "base/bind.h" 6 #include "base/bind.h"
7 #include "base/cpu.h" 7 #include "base/cpu.h"
8 #include "base/files/file_util.h" 8 #include "base/files/file_util.h"
9 #include "base/guid.h" 9 #include "base/guid.h"
10 #include "base/json/string_escape.h" 10 #include "base/json/string_escape.h"
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 if (trace_config.IsSystraceEnabled()) { 272 if (trace_config.IsSystraceEnabled()) {
273 #if defined(ENABLE_POWER_TRACING) 273 #if defined(ENABLE_POWER_TRACING)
274 PowerTracingAgent::GetInstance()->StartAgentTracing( 274 PowerTracingAgent::GetInstance()->StartAgentTracing(
275 trace_config, 275 trace_config,
276 base::Bind(&TracingControllerImpl::OnStartAgentTracingAcked, 276 base::Bind(&TracingControllerImpl::OnStartAgentTracingAcked,
277 base::Unretained(this))); 277 base::Unretained(this)));
278 ++pending_start_tracing_ack_count_; 278 ++pending_start_tracing_ack_count_;
279 #endif 279 #endif
280 280
281 #if defined(OS_CHROMEOS) 281 #if defined(OS_CHROMEOS)
282 //JAMES uh oh
282 chromeos::DebugDaemonClient* debug_daemon = 283 chromeos::DebugDaemonClient* debug_daemon =
283 chromeos::DBusThreadManager::Get()->GetDebugDaemonClient(); 284 chromeos::DBusThreadManager::Get()->GetDebugDaemonClient();
284 if (debug_daemon) { 285 if (debug_daemon) {
285 debug_daemon->StartAgentTracing( 286 debug_daemon->StartAgentTracing(
286 trace_config, 287 trace_config,
287 base::Bind(&TracingControllerImpl::OnStartAgentTracingAcked, 288 base::Bind(&TracingControllerImpl::OnStartAgentTracingAcked,
288 base::Unretained(this))); 289 base::Unretained(this)));
289 ++pending_start_tracing_ack_count_; 290 ++pending_start_tracing_ack_count_;
290 } 291 }
291 #elif defined(OS_WIN) 292 #elif defined(OS_WIN)
(...skipping 824 matching lines...) Expand 10 before | Expand all | Expand 10 after
1116 // Schedule the next queued dump (if applicable). 1117 // Schedule the next queued dump (if applicable).
1117 if (!queued_memory_dump_requests_.empty()) { 1118 if (!queued_memory_dump_requests_.empty()) {
1118 BrowserThread::PostTask( 1119 BrowserThread::PostTask(
1119 BrowserThread::UI, FROM_HERE, 1120 BrowserThread::UI, FROM_HERE,
1120 base::Bind(&TracingControllerImpl::PerformNextQueuedGlobalMemoryDump, 1121 base::Bind(&TracingControllerImpl::PerformNextQueuedGlobalMemoryDump,
1121 base::Unretained(this))); 1122 base::Unretained(this)));
1122 } 1123 }
1123 } 1124 }
1124 1125
1125 } // namespace content 1126 } // namespace content
OLDNEW
« no previous file with comments | « chromeos/dbus/update_engine_client.cc ('k') | content/shell/browser/shell_browser_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698