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

Unified Diff: mojo/common/tracing_impl.cc

Issue 1841863002: Update monet. (Closed) Base URL: https://github.com/domokit/monet.git@master
Patch Set: Created 4 years, 9 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
« no previous file with comments | « mojo/common/tracing_impl.h ('k') | mojo/common/url_type_converters.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/common/tracing_impl.cc
diff --git a/mojo/common/tracing_impl.cc b/mojo/common/tracing_impl.cc
index ec5dfa3e3202f50f6e81b295da5e2246e91b801b..a93e3d8b0d60203a37fa665a568ddf7cf3a8ef6e 100644
--- a/mojo/common/tracing_impl.cc
+++ b/mojo/common/tracing_impl.cc
@@ -5,26 +5,31 @@
#include "mojo/common/tracing_impl.h"
#include "base/trace_event/trace_event_impl.h"
-#include "mojo/common/trace_controller_impl.h"
#include "mojo/public/cpp/application/application_connection.h"
#include "mojo/public/cpp/application/application_impl.h"
namespace mojo {
-TracingImpl::TracingImpl() {
-}
+TracingImpl::TracingImpl() {}
-TracingImpl::~TracingImpl() {
-}
+TracingImpl::~TracingImpl() {}
void TracingImpl::Initialize(ApplicationImpl* app) {
ApplicationConnection* connection = app->ConnectToApplication("mojo:tracing");
connection->AddService(this);
+
+#ifdef NDEBUG
+ if (app->HasArg("--early-tracing")) {
+ provider_impl_.ForceEnableTracing();
+ }
+#else
+ provider_impl_.ForceEnableTracing();
+#endif
}
void TracingImpl::Create(ApplicationConnection* connection,
- InterfaceRequest<tracing::TraceController> request) {
- new TraceControllerImpl(request.Pass());
+ InterfaceRequest<tracing::TraceProvider> request) {
+ provider_impl_.Bind(request.Pass());
}
} // namespace mojo
« no previous file with comments | « mojo/common/tracing_impl.h ('k') | mojo/common/url_type_converters.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698