OLD | NEW |
---|---|
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_factory.h" | 5 #include "media/mojo/services/mojo_media_application_factory.h" |
6 | 6 |
7 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
8 #include "media/mojo/services/mojo_media_application.h" | 8 #include "media/mojo/services/mojo_media_application.h" |
9 | 9 |
10 #if defined(OS_ANDROID) | 10 #if defined(OS_ANDROID) |
11 #include "media/mojo/services/android_mojo_media_client.h" // nogncheck | 11 #include "media/mojo/services/android_mojo_media_client.h" // nogncheck |
12 using DefaultClient = media::AndroidMojoMediaClient; | 12 using DefaultClient = media::AndroidMojoMediaClient; |
13 #else | 13 #else |
14 #include "media/mojo/services/default_mojo_media_client.h" // nogncheck | 14 #include "media/mojo/services/default_mojo_media_client.h" // nogncheck |
15 using DefaultClient = media::DefaultMojoMediaClient; | 15 using DefaultClient = media::DefaultMojoMediaClient; |
16 #endif | 16 #endif |
17 | 17 |
18 namespace media { | 18 namespace media { |
19 | 19 |
20 // static | 20 // static |
21 std::unique_ptr<shell::Service> CreateMojoMediaApplication( | 21 std::unique_ptr<shell::Service> CreateMojoMediaApplication( |
22 scoped_refptr<base::SingleThreadTaskRunner> media_service_task_runner, | |
23 MediaService* media_service, | |
xhwang
2016/09/30 22:39:11
This will make media/mojo depend on media/gpu whic
sandersd (OOO until July 31)
2016/09/30 22:40:50
Good point. In this case we can pass it as a raw p
| |
22 const base::Closure& quit_closure) { | 24 const base::Closure& quit_closure) { |
23 return std::unique_ptr<shell::Service>(new MojoMediaApplication( | 25 return std::unique_ptr<shell::Service>(new MojoMediaApplication( |
24 base::MakeUnique<DefaultClient>(), quit_closure)); | 26 base::MakeUnique<DefaultClient>(), quit_closure)); |
25 } | 27 } |
26 | 28 |
27 } // namespace media | 29 } // namespace media |
OLD | NEW |