OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "mojo/services/tracing/public/cpp/tracing_impl.h" | 5 #include "mojo/services/tracing/public/cpp/tracing_impl.h" |
6 | 6 |
| 7 #include <utility> |
| 8 |
7 #include "base/lazy_instance.h" | 9 #include "base/lazy_instance.h" |
8 #include "base/synchronization/lock.h" | 10 #include "base/synchronization/lock.h" |
9 #include "base/threading/platform_thread.h" | 11 #include "base/threading/platform_thread.h" |
10 #include "base/trace_event/trace_event_impl.h" | 12 #include "base/trace_event/trace_event_impl.h" |
11 #include "mojo/application/public/cpp/application_impl.h" | 13 #include "mojo/application/public/cpp/application_impl.h" |
12 | 14 |
13 #ifdef NDEBUG | 15 #ifdef NDEBUG |
14 #include "base/command_line.h" | 16 #include "base/command_line.h" |
15 #include "mojo/services/tracing/public/cpp/switches.h" | 17 #include "mojo/services/tracing/public/cpp/switches.h" |
16 #endif | 18 #endif |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 tracing::kEarlyTracing)) { | 61 tracing::kEarlyTracing)) { |
60 provider_impl_.ForceEnableTracing(); | 62 provider_impl_.ForceEnableTracing(); |
61 } | 63 } |
62 #else | 64 #else |
63 provider_impl_.ForceEnableTracing(); | 65 provider_impl_.ForceEnableTracing(); |
64 #endif | 66 #endif |
65 } | 67 } |
66 | 68 |
67 void TracingImpl::Create(ApplicationConnection* connection, | 69 void TracingImpl::Create(ApplicationConnection* connection, |
68 InterfaceRequest<tracing::TraceProvider> request) { | 70 InterfaceRequest<tracing::TraceProvider> request) { |
69 provider_impl_.Bind(request.Pass()); | 71 provider_impl_.Bind(std::move(request)); |
70 } | 72 } |
71 | 73 |
72 } // namespace mojo | 74 } // namespace mojo |
OLD | NEW |