| 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> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "media/base/media_log.h" | 9 #include "media/base/media_log.h" |
| 10 #include "media/mojo/services/mojo_media_client.h" | 10 #include "media/mojo/services/mojo_media_client.h" |
| 11 #include "media/mojo/services/service_factory_impl.h" | 11 #include "media/mojo/services/service_factory_impl.h" |
| 12 #include "services/shell/public/cpp/connection.h" | 12 #include "services/shell/public/cpp/connection.h" |
| 13 #include "services/shell/public/cpp/connector.h" | 13 #include "services/shell/public/cpp/connector.h" |
| 14 | 14 |
| 15 namespace media { | 15 namespace media { |
| 16 | 16 |
| 17 // TODO(xhwang): Hook up MediaLog when possible. | 17 // TODO(xhwang): Hook up MediaLog when possible. |
| 18 MojoMediaApplication::MojoMediaApplication( | 18 MojoMediaApplication::MojoMediaApplication( |
| 19 std::unique_ptr<MojoMediaClient> mojo_media_client, | 19 std::unique_ptr<MojoMediaClient> mojo_media_client, |
| 20 const base::Closure& quit_closure) | 20 const base::Closure& quit_closure) |
| 21 : mojo_media_client_(std::move(mojo_media_client)), | 21 : mojo_media_client_(std::move(mojo_media_client)), |
| 22 connector_(nullptr), | 22 connector_(nullptr), |
| 23 media_log_(new MediaLog()), | 23 media_log_(new MediaLog()), |
| 24 ref_factory_(quit_closure) { | 24 ref_factory_(quit_closure) { |
| 25 DCHECK(mojo_media_client_); | 25 DCHECK(mojo_media_client_); |
| 26 } | 26 } |
| 27 | 27 |
| 28 MojoMediaApplication::~MojoMediaApplication() {} | 28 MojoMediaApplication::~MojoMediaApplication() {} |
| 29 | 29 |
| 30 void MojoMediaApplication::Initialize(shell::Connector* connector, | 30 void MojoMediaApplication::OnStart(shell::Connector* connector, |
| 31 const shell::Identity& identity, | 31 const shell::Identity& identity, |
| 32 uint32_t /* id */) { | 32 uint32_t /* id */) { |
| 33 connector_ = connector; | 33 connector_ = connector; |
| 34 mojo_media_client_->Initialize(); | 34 mojo_media_client_->Initialize(); |
| 35 } | 35 } |
| 36 | 36 |
| 37 bool MojoMediaApplication::AcceptConnection(shell::Connection* connection) { | 37 bool MojoMediaApplication::OnConnect(shell::Connection* connection) { |
| 38 connection->AddInterface<mojom::ServiceFactory>(this); | 38 connection->AddInterface<mojom::ServiceFactory>(this); |
| 39 return true; | 39 return true; |
| 40 } | 40 } |
| 41 | 41 |
| 42 bool MojoMediaApplication::ShellConnectionLost() { | 42 bool MojoMediaApplication::OnStop() { |
| 43 mojo_media_client_->WillQuit(); | 43 mojo_media_client_->WillQuit(); |
| 44 return true; | 44 return true; |
| 45 } | 45 } |
| 46 | 46 |
| 47 void MojoMediaApplication::Create( | 47 void MojoMediaApplication::Create( |
| 48 shell::Connection* connection, | 48 shell::Connection* connection, |
| 49 mojo::InterfaceRequest<mojom::ServiceFactory> request) { | 49 mojo::InterfaceRequest<mojom::ServiceFactory> request) { |
| 50 // The created object is owned by the pipe. | 50 // The created object is owned by the pipe. |
| 51 new ServiceFactoryImpl(std::move(request), | 51 new ServiceFactoryImpl(std::move(request), |
| 52 connection->GetRemoteInterfaceProvider(), media_log_, | 52 connection->GetRemoteInterfaceProvider(), media_log_, |
| 53 ref_factory_.CreateRef(), mojo_media_client_.get()); | 53 ref_factory_.CreateRef(), mojo_media_client_.get()); |
| 54 } | 54 } |
| 55 | 55 |
| 56 } // namespace media | 56 } // namespace media |
| OLD | NEW |