| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "content/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 190 #if defined(ENABLE_PEPPER_CDMS) | 190 #if defined(ENABLE_PEPPER_CDMS) |
| 191 #include "content/renderer/media/crypto/pepper_cdm_wrapper_impl.h" | 191 #include "content/renderer/media/crypto/pepper_cdm_wrapper_impl.h" |
| 192 #elif defined(ENABLE_BROWSER_CDMS) | 192 #elif defined(ENABLE_BROWSER_CDMS) |
| 193 #include "content/renderer/media/crypto/renderer_cdm_manager.h" | 193 #include "content/renderer/media/crypto/renderer_cdm_manager.h" |
| 194 #endif | 194 #endif |
| 195 | 195 |
| 196 #if defined(ENABLE_MOJO_MEDIA) | 196 #if defined(ENABLE_MOJO_MEDIA) |
| 197 #include "media/mojo/services/mojo_cdm_factory.h" | 197 #include "media/mojo/services/mojo_cdm_factory.h" |
| 198 #include "mojo/application/public/cpp/connect.h" | 198 #include "mojo/application/public/cpp/connect.h" |
| 199 #include "mojo/application/public/interfaces/shell.mojom.h" | 199 #include "mojo/application/public/interfaces/shell.mojom.h" |
| 200 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" | 200 #include "mojo/public/cpp/bindings/interface_request.h" |
| 201 #endif | 201 #endif |
| 202 | 202 |
| 203 #if defined(ENABLE_MOJO_MEDIA) && !defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID) | 203 #if defined(ENABLE_MOJO_MEDIA) && !defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID) |
| 204 #include "media/mojo/services/mojo_renderer_factory.h" | 204 #include "media/mojo/services/mojo_renderer_factory.h" |
| 205 #else | 205 #else |
| 206 #include "media/renderers/default_renderer_factory.h" | 206 #include "media/renderers/default_renderer_factory.h" |
| 207 #endif | 207 #endif |
| 208 | 208 |
| 209 #if defined(ENABLE_WEBVR) | 209 #if defined(ENABLE_WEBVR) |
| 210 #include "content/renderer/vr/vr_dispatcher.h" | 210 #include "content/renderer/vr/vr_dispatcher.h" |
| (...skipping 5132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5343 } | 5343 } |
| 5344 | 5344 |
| 5345 media::RendererWebMediaPlayerDelegate* | 5345 media::RendererWebMediaPlayerDelegate* |
| 5346 RenderFrameImpl::GetWebMediaPlayerDelegate() { | 5346 RenderFrameImpl::GetWebMediaPlayerDelegate() { |
| 5347 if (!media_player_delegate_) | 5347 if (!media_player_delegate_) |
| 5348 media_player_delegate_ = new media::RendererWebMediaPlayerDelegate(this); | 5348 media_player_delegate_ = new media::RendererWebMediaPlayerDelegate(this); |
| 5349 return media_player_delegate_; | 5349 return media_player_delegate_; |
| 5350 } | 5350 } |
| 5351 | 5351 |
| 5352 } // namespace content | 5352 } // namespace content |
| OLD | NEW |