| 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_renderer_service.h" | 5 #include "media/mojo/services/mojo_renderer_service.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/memory/ptr_util.h" |
| 10 #include "base/optional.h" | 11 #include "base/optional.h" |
| 11 #include "media/base/audio_renderer_sink.h" | 12 #include "media/base/audio_renderer_sink.h" |
| 12 #include "media/base/content_decryption_module.h" | 13 #include "media/base/content_decryption_module.h" |
| 13 #include "media/base/media_url_demuxer.h" | 14 #include "media/base/media_url_demuxer.h" |
| 14 #include "media/base/renderer.h" | 15 #include "media/base/renderer.h" |
| 15 #include "media/base/video_renderer_sink.h" | 16 #include "media/base/video_renderer_sink.h" |
| 16 #include "media/mojo/services/demuxer_stream_provider_shim.h" | 17 #include "media/mojo/services/demuxer_stream_provider_shim.h" |
| 17 #include "media/mojo/services/mojo_cdm_service_context.h" | 18 #include "media/mojo/services/mojo_cdm_service_context.h" |
| 18 | 19 |
| 19 namespace media { | 20 namespace media { |
| (...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 287 DCHECK(!bad_message_cb_.is_null()); | 288 DCHECK(!bad_message_cb_.is_null()); |
| 288 bad_message_cb_.Run(); | 289 bad_message_cb_.Run(); |
| 289 | 290 |
| 290 return; | 291 return; |
| 291 } | 292 } |
| 292 | 293 |
| 293 callback.Run(initiate_surface_request_cb_.Run()); | 294 callback.Run(initiate_surface_request_cb_.Run()); |
| 294 } | 295 } |
| 295 | 296 |
| 296 } // namespace media | 297 } // namespace media |
| OLD | NEW |