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 "base/logging.h" | 5 #include "base/logging.h" |
6 #include "media/mojo/services/mojo_renderer_service.h" | 6 #include "media/mojo/services/mojo_renderer_service.h" |
7 #include "mojo/application/application_runner_chromium.h" | 7 #include "mojo/application/application_runner_chromium.h" |
8 #include "mojo/application/public/cpp/application_connection.h" | 8 #include "mojo/application/public/cpp/application_connection.h" |
9 #include "mojo/application/public/cpp/application_delegate.h" | 9 #include "mojo/application/public/cpp/application_delegate.h" |
10 #include "mojo/application/public/cpp/application_impl.h" | 10 #include "mojo/application/public/cpp/application_impl.h" |
(...skipping 17 matching lines...) Expand all Loading... |
28 | 28 |
29 bool ConfigureIncomingConnection( | 29 bool ConfigureIncomingConnection( |
30 mojo::ApplicationConnection* connection) override { | 30 mojo::ApplicationConnection* connection) override { |
31 connection->AddService(this); | 31 connection->AddService(this); |
32 return true; | 32 return true; |
33 } | 33 } |
34 | 34 |
35 // mojo::InterfaceFactory<mojo::MediaRenderer> implementation. | 35 // mojo::InterfaceFactory<mojo::MediaRenderer> implementation. |
36 void Create(mojo::ApplicationConnection* connection, | 36 void Create(mojo::ApplicationConnection* connection, |
37 mojo::InterfaceRequest<mojo::MediaRenderer> request) override { | 37 mojo::InterfaceRequest<mojo::MediaRenderer> request) override { |
38 mojo::BindToRequest(new MojoRendererService(), &request); | 38 // The created object is owned by the pipe. |
| 39 new MojoRendererService(request.Pass()); |
39 } | 40 } |
40 }; | 41 }; |
41 | 42 |
42 } // namespace media | 43 } // namespace media |
43 | 44 |
44 MojoResult MojoMain(MojoHandle mojo_handle) { | 45 MojoResult MojoMain(MojoHandle mojo_handle) { |
45 mojo::ApplicationRunnerChromium runner(new media::MojoMediaApplication()); | 46 mojo::ApplicationRunnerChromium runner(new media::MojoMediaApplication()); |
46 return runner.Run(mojo_handle); | 47 return runner.Run(mojo_handle); |
47 } | 48 } |
OLD | NEW |