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_client.h" | 5 #include "media/mojo/services/mojo_media_client.h" |
6 | 6 |
| 7 #include "base/macros.h" |
7 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
8 #include "media/audio/audio_manager_base.h" | 9 #include "media/audio/audio_manager_base.h" |
9 #include "media/audio/audio_output_stream_sink.h" | 10 #include "media/audio/audio_output_stream_sink.h" |
10 #include "media/audio/fake_audio_log_factory.h" | 11 #include "media/audio/fake_audio_log_factory.h" |
11 #include "media/base/audio_hardware_config.h" | 12 #include "media/base/audio_hardware_config.h" |
12 #include "media/base/media.h" | 13 #include "media/base/media.h" |
13 #include "media/base/null_video_sink.h" | 14 #include "media/base/null_video_sink.h" |
14 #include "media/cdm/default_cdm_factory.h" | 15 #include "media/cdm/default_cdm_factory.h" |
15 #include "media/renderers/default_renderer_factory.h" | 16 #include "media/renderers/default_renderer_factory.h" |
16 #include "media/renderers/gpu_video_accelerator_factories.h" | 17 #include "media/renderers/gpu_video_accelerator_factories.h" |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 DISALLOW_COPY_AND_ASSIGN(DefaultMojoMediaClient); | 71 DISALLOW_COPY_AND_ASSIGN(DefaultMojoMediaClient); |
71 }; | 72 }; |
72 | 73 |
73 } // namespace (anonymous) | 74 } // namespace (anonymous) |
74 | 75 |
75 scoped_ptr<MojoMediaClient> MojoMediaClient::Create() { | 76 scoped_ptr<MojoMediaClient> MojoMediaClient::Create() { |
76 return make_scoped_ptr(new DefaultMojoMediaClient()); | 77 return make_scoped_ptr(new DefaultMojoMediaClient()); |
77 } | 78 } |
78 | 79 |
79 } // namespace media | 80 } // namespace media |
OLD | NEW |