diff options
| author | erg <erg@chromium.org> | 2015-11-18 14:46:57 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-18 22:47:32 +0000 |
| commit | 8d23e41bbc4bdeebffe51784d483afb95f4be714 (patch) | |
| tree | 79654466331b4d22b57285c76e3271651951049e /components/resource_provider | |
| parent | b4a8cf7a82ae168ea915d44f5997a7e756eca6c6 (diff) | |
| download | chromium_src-8d23e41bbc4bdeebffe51784d483afb95f4be714.zip chromium_src-8d23e41bbc4bdeebffe51784d483afb95f4be714.tar.gz chromium_src-8d23e41bbc4bdeebffe51784d483afb95f4be714.tar.bz2 | |
mojo_runner: Get --trace-start working with generic mojo_runner.
Android didn't like our magic to automatically include a connection to mojo:tracing in ApplicationImpl. This does things the explicit way: including a mojo:TracingImpl in each and every mojo application package.
BUG=534895
Review URL: https://codereview.chromium.org/1459453003
Cr-Commit-Position: refs/heads/master@{#360434}
Diffstat (limited to 'components/resource_provider')
| -rw-r--r-- | components/resource_provider/BUILD.gn | 1 | ||||
| -rw-r--r-- | components/resource_provider/DEPS | 1 | ||||
| -rw-r--r-- | components/resource_provider/resource_provider_app.cc | 1 | ||||
| -rw-r--r-- | components/resource_provider/resource_provider_app.h | 3 |
4 files changed, 6 insertions, 0 deletions
diff --git a/components/resource_provider/BUILD.gn b/components/resource_provider/BUILD.gn index 5e4bc84..c686117 100644 --- a/components/resource_provider/BUILD.gn +++ b/components/resource_provider/BUILD.gn @@ -92,6 +92,7 @@ source_set("lib") { "//components/resource_provider/public/interfaces", "//mojo/application/public/cpp", "//mojo/common:common_base", + "//mojo/services/tracing/public/cpp", "//url", ] } diff --git a/components/resource_provider/DEPS b/components/resource_provider/DEPS index 4146852..5780d73 100644 --- a/components/resource_provider/DEPS +++ b/components/resource_provider/DEPS @@ -4,4 +4,5 @@ include_rules = [ "+mojo/converters", "+mojo/platform_handle", "+mojo/public", + "+mojo/services/tracing/public/cpp", ] diff --git a/components/resource_provider/resource_provider_app.cc b/components/resource_provider/resource_provider_app.cc index c7cd6fa..60d230f 100644 --- a/components/resource_provider/resource_provider_app.cc +++ b/components/resource_provider/resource_provider_app.cc @@ -20,6 +20,7 @@ ResourceProviderApp::~ResourceProviderApp() { } void ResourceProviderApp::Initialize(mojo::ApplicationImpl* app) { + tracing_.Initialize(app); } bool ResourceProviderApp::ConfigureIncomingConnection( diff --git a/components/resource_provider/resource_provider_app.h b/components/resource_provider/resource_provider_app.h index b4c13de..6b0a238 100644 --- a/components/resource_provider/resource_provider_app.h +++ b/components/resource_provider/resource_provider_app.h @@ -12,6 +12,7 @@ #include "mojo/application/public/cpp/interface_factory.h" #include "mojo/common/weak_binding_set.h" #include "mojo/public/cpp/bindings/binding.h" +#include "mojo/services/tracing/public/cpp/tracing_impl.h" namespace mojo { class ApplicationImpl; @@ -35,6 +36,8 @@ class ResourceProviderApp : public mojo::ApplicationDelegate, void Create(mojo::ApplicationConnection* connection, mojo::InterfaceRequest<ResourceProvider> request) override; + mojo::TracingImpl tracing_; + mojo::WeakBindingSet<ResourceProvider> bindings_; // The name of the app that the resource provider code lives in. When using |