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/media_service.h" | 5 #include "media/mojo/services/media_service.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
10 #include "media/base/media_log.h" | 10 #include "media/base/media_log.h" |
11 #include "media/mojo/services/interface_factory_impl.h" | 11 #include "media/mojo/services/interface_factory_impl.h" |
12 #include "media/mojo/services/mojo_media_client.h" | 12 #include "media/mojo/services/mojo_media_client.h" |
13 #include "mojo/public/cpp/bindings/strong_binding.h" | 13 #include "mojo/public/cpp/bindings/strong_binding.h" |
14 #include "services/service_manager/public/cpp/connection.h" | |
15 #include "services/service_manager/public/cpp/connector.h" | 14 #include "services/service_manager/public/cpp/connector.h" |
16 | 15 |
17 namespace media { | 16 namespace media { |
18 | 17 |
19 // TODO(xhwang): Hook up MediaLog when possible. | 18 // TODO(xhwang): Hook up MediaLog when possible. |
20 MediaService::MediaService(std::unique_ptr<MojoMediaClient> mojo_media_client) | 19 MediaService::MediaService(std::unique_ptr<MojoMediaClient> mojo_media_client) |
21 : mojo_media_client_(std::move(mojo_media_client)), | 20 : mojo_media_client_(std::move(mojo_media_client)), |
22 media_log_(new MediaLog()) { | 21 media_log_(new MediaLog()) { |
23 DCHECK(mojo_media_client_); | 22 DCHECK(mojo_media_client_); |
24 registry_.AddInterface<mojom::MediaService>(this); | 23 registry_.AddInterface<mojom::MediaService>(this); |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 return; | 58 return; |
60 | 59 |
61 mojo::MakeStrongBinding( | 60 mojo::MakeStrongBinding( |
62 base::MakeUnique<InterfaceFactoryImpl>( | 61 base::MakeUnique<InterfaceFactoryImpl>( |
63 std::move(host_interfaces), media_log_, ref_factory_->CreateRef(), | 62 std::move(host_interfaces), media_log_, ref_factory_->CreateRef(), |
64 mojo_media_client_.get()), | 63 mojo_media_client_.get()), |
65 std::move(request)); | 64 std::move(request)); |
66 } | 65 } |
67 | 66 |
68 } // namespace media | 67 } // namespace media |
OLD | NEW |