diff options
| author | yzshen <yzshen@chromium.org> | 2016-02-24 23:29:27 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-25 07:30:23 +0000 |
| commit | d414dc34a7f87a2000e09c58b9ddbb5bd6b61463 (patch) | |
| tree | a9ec402cbfbef1da3acde6071d992e2ade92ca8b /mojo/services/tracing/tracing_app.h | |
| parent | d910911b407efde31709e3a766a5ee776db4c626 (diff) | |
| download | chromium_src-d414dc34a7f87a2000e09c58b9ddbb5bd6b61463.zip chromium_src-d414dc34a7f87a2000e09c58b9ddbb5bd6b61463.tar.gz chromium_src-d414dc34a7f87a2000e09c58b9ddbb5bd6b61463.tar.bz2 | |
Rename WeakBindingSet/WeakInterfacePtrSet to BindingSet/InterfacePtrSet.
This CL also renames the element type (WeakBinding/WeakInterfacePtr) to Element and hide them in the corresonding *Set class.
BUG=None
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation
Committed: https://crrev.com/632d319842096e6998d174e2f251865979ce2b72
Cr-Commit-Position: refs/heads/master@{#377384}
Review URL: https://codereview.chromium.org/1735583002
Cr-Commit-Position: refs/heads/master@{#377528}
Diffstat (limited to 'mojo/services/tracing/tracing_app.h')
| -rw-r--r-- | mojo/services/tracing/tracing_app.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mojo/services/tracing/tracing_app.h b/mojo/services/tracing/tracing_app.h index edb189e..f409887 100644 --- a/mojo/services/tracing/tracing_app.h +++ b/mojo/services/tracing/tracing_app.h @@ -10,9 +10,9 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" +#include "mojo/public/cpp/bindings/binding_set.h" +#include "mojo/public/cpp/bindings/interface_ptr_set.h" #include "mojo/public/cpp/bindings/strong_binding.h" -#include "mojo/public/cpp/bindings/weak_binding_set.h" -#include "mojo/public/cpp/bindings/weak_interface_ptr_set.h" #include "mojo/services/tracing/public/interfaces/tracing.mojom.h" #include "mojo/services/tracing/trace_data_sink.h" #include "mojo/services/tracing/trace_recorder_impl.h" @@ -64,9 +64,9 @@ class TracingApp scoped_ptr<TraceDataSink> sink_; ScopedVector<TraceRecorderImpl> recorder_impls_; - mojo::WeakInterfacePtrSet<TraceProvider> provider_ptrs_; + mojo::InterfacePtrSet<TraceProvider> provider_ptrs_; mojo::Binding<TraceCollector> collector_binding_; - mojo::WeakBindingSet<StartupPerformanceDataCollector> + mojo::BindingSet<StartupPerformanceDataCollector> startup_performance_data_collector_bindings_; StartupPerformanceTimes startup_performance_times_; bool tracing_active_; |