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