| 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 <utility> |
| 8 |
| 7 #include "base/logging.h" | 9 #include "base/logging.h" |
| 8 #include "media/base/media_log.h" | 10 #include "media/base/media_log.h" |
| 9 #include "media/mojo/services/mojo_media_client.h" | 11 #include "media/mojo/services/mojo_media_client.h" |
| 10 #include "media/mojo/services/service_factory_impl.h" | 12 #include "media/mojo/services/service_factory_impl.h" |
| 11 #include "mojo/application/public/cpp/application_connection.h" | 13 #include "mojo/application/public/cpp/application_connection.h" |
| 12 #include "mojo/application/public/cpp/application_impl.h" | 14 #include "mojo/application/public/cpp/application_impl.h" |
| 13 | 15 |
| 14 namespace media { | 16 namespace media { |
| 15 | 17 |
| 16 // static | 18 // static |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 bool MojoMediaApplication::ConfigureIncomingConnection( | 52 bool MojoMediaApplication::ConfigureIncomingConnection( |
| 51 mojo::ApplicationConnection* connection) { | 53 mojo::ApplicationConnection* connection) { |
| 52 connection->AddService<interfaces::ServiceFactory>(this); | 54 connection->AddService<interfaces::ServiceFactory>(this); |
| 53 return true; | 55 return true; |
| 54 } | 56 } |
| 55 | 57 |
| 56 void MojoMediaApplication::Create( | 58 void MojoMediaApplication::Create( |
| 57 mojo::ApplicationConnection* connection, | 59 mojo::ApplicationConnection* connection, |
| 58 mojo::InterfaceRequest<interfaces::ServiceFactory> request) { | 60 mojo::InterfaceRequest<interfaces::ServiceFactory> request) { |
| 59 // The created object is owned by the pipe. | 61 // The created object is owned by the pipe. |
| 60 new ServiceFactoryImpl(request.Pass(), connection->GetServiceProvider(), | 62 new ServiceFactoryImpl(std::move(request), connection->GetServiceProvider(), |
| 61 media_log_, | 63 media_log_, |
| 62 app_impl_->app_lifetime_helper()->CreateAppRefCount(), | 64 app_impl_->app_lifetime_helper()->CreateAppRefCount(), |
| 63 mojo_media_client_.get()); | 65 mojo_media_client_.get()); |
| 64 } | 66 } |
| 65 | 67 |
| 66 } // namespace media | 68 } // namespace media |
| OLD | NEW |