| Index: sky/viewer/viewer.cc
|
| diff --git a/sky/viewer/viewer.cc b/sky/viewer/viewer.cc
|
| index 9a325151b322a48818347a2d7e9331b675129421..9db52a1e53e7eb2de28638caa85d56675f97c77c 100644
|
| --- a/sky/viewer/viewer.cc
|
| +++ b/sky/viewer/viewer.cc
|
| @@ -25,8 +25,7 @@
|
| namespace sky {
|
|
|
| class Viewer : public mojo::ApplicationDelegate,
|
| - public mojo::InterfaceFactory<mojo::ContentHandler>,
|
| - public mojo::InterfaceFactory<mojo::Tracing> {
|
| + public mojo::InterfaceFactory<mojo::ContentHandler> {
|
| public:
|
| Viewer() {}
|
|
|
| @@ -38,12 +37,13 @@ class Viewer : public mojo::ApplicationDelegate,
|
| platform_impl_.reset(new PlatformImpl(app));
|
| blink::initialize(platform_impl_.get());
|
| base::i18n::InitializeICU();
|
| +
|
| + mojo::TracingImpl::Create(app);
|
| }
|
|
|
| virtual bool ConfigureIncomingConnection(
|
| mojo::ApplicationConnection* connection) override {
|
| connection->AddService<mojo::ContentHandler>(this);
|
| - connection->AddService<mojo::Tracing>(this);
|
| return true;
|
| }
|
|
|
| @@ -53,12 +53,6 @@ class Viewer : public mojo::ApplicationDelegate,
|
| mojo::BindToRequest(new ContentHandlerImpl(), &request);
|
| }
|
|
|
| - // Overridden from InterfaceFactory<Tracing>
|
| - virtual void Create(mojo::ApplicationConnection* connection,
|
| - mojo::InterfaceRequest<mojo::Tracing> request) override {
|
| - new mojo::TracingImpl(request.Pass(), FILE_PATH_LITERAL("sky_viewer"));
|
| - }
|
| -
|
| scoped_ptr<PlatformImpl> platform_impl_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(Viewer);
|
|
|