| 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 "media/mojo/services/mojo_media_application.h" | 5 #include "media/mojo/services/mojo_media_application.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "media/mojo/services/mojo_cdm_service.h" | 8 #include "media/mojo/services/mojo_cdm_service.h" |
| 9 #include "media/mojo/services/mojo_renderer_service.h" | 9 #include "media/mojo/services/mojo_renderer_service.h" |
| 10 #include "mojo/application/public/cpp/application_connection.h" | 10 #include "mojo/application/public/cpp/application_connection.h" |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 mojo::ApplicationConnection* connection) { | 42 mojo::ApplicationConnection* connection) { |
| 43 connection->AddService<mojo::ContentDecryptionModule>(this); | 43 connection->AddService<mojo::ContentDecryptionModule>(this); |
| 44 connection->AddService<mojo::MediaRenderer>(this); | 44 connection->AddService<mojo::MediaRenderer>(this); |
| 45 return true; | 45 return true; |
| 46 } | 46 } |
| 47 | 47 |
| 48 void MojoMediaApplication::Create( | 48 void MojoMediaApplication::Create( |
| 49 mojo::ApplicationConnection* connection, | 49 mojo::ApplicationConnection* connection, |
| 50 mojo::InterfaceRequest<mojo::ContentDecryptionModule> request) { | 50 mojo::InterfaceRequest<mojo::ContentDecryptionModule> request) { |
| 51 // The created object is owned by the pipe. | 51 // The created object is owned by the pipe. |
| 52 new MojoCdmService(&cdm_service_context_, request.Pass()); | 52 new MojoCdmService(&cdm_service_context_, connection->GetServiceProvider(), |
| 53 request.Pass()); |
| 53 } | 54 } |
| 54 | 55 |
| 55 void MojoMediaApplication::Create( | 56 void MojoMediaApplication::Create( |
| 56 mojo::ApplicationConnection* connection, | 57 mojo::ApplicationConnection* connection, |
| 57 mojo::InterfaceRequest<mojo::MediaRenderer> request) { | 58 mojo::InterfaceRequest<mojo::MediaRenderer> request) { |
| 58 // The created object is owned by the pipe. | 59 // The created object is owned by the pipe. |
| 59 new MojoRendererService(&cdm_service_context_, request.Pass()); | 60 new MojoRendererService(&cdm_service_context_, request.Pass()); |
| 60 } | 61 } |
| 61 | 62 |
| 62 } // namespace media | 63 } // namespace media |
| OLD | NEW |