| 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/media/android/renderer_media_player_manager.h" | 5 #include "content/renderer/media/android/renderer_media_player_manager.h" |
| 6 | 6 |
| 7 #include "content/common/media/media_player_messages_android.h" | 7 #include "content/common/media/media_player_messages_android.h" |
| 8 #include "content/public/common/renderer_preferences.h" | 8 #include "content/public/common/renderer_preferences.h" |
| 9 #include "content/renderer/media/android/renderer_media_player_manager.h" | 9 #include "content/renderer/media/android/renderer_media_player_manager.h" |
| 10 #include "content/renderer/media/android/webmediaplayer_android.h" | 10 #include "content/renderer/media/android/webmediaplayer_android.h" |
| (...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 254 Send(new MediaPlayerHostMsg_EnterFullscreen(routing_id(), player_id)); | 254 Send(new MediaPlayerHostMsg_EnterFullscreen(routing_id(), player_id)); |
| 255 } | 255 } |
| 256 | 256 |
| 257 void RendererMediaPlayerManager::ExitFullscreen(int player_id) { | 257 void RendererMediaPlayerManager::ExitFullscreen(int player_id) { |
| 258 pending_fullscreen_frame_ = NULL; | 258 pending_fullscreen_frame_ = NULL; |
| 259 fullscreen_frame_ = NULL; | 259 fullscreen_frame_ = NULL; |
| 260 Send(new MediaPlayerHostMsg_ExitFullscreen(routing_id(), player_id)); | 260 Send(new MediaPlayerHostMsg_ExitFullscreen(routing_id(), player_id)); |
| 261 } | 261 } |
| 262 | 262 |
| 263 void RendererMediaPlayerManager::SetCdm(int player_id, int cdm_id) { | 263 void RendererMediaPlayerManager::SetCdm(int player_id, int cdm_id) { |
| 264 if (cdm_id == RendererCdmManager::kInvalidCdmId) { | 264 if (cdm_id == media::MediaKeys::kInvalidCdmId) { |
| 265 NOTREACHED(); | 265 NOTREACHED(); |
| 266 return; | 266 return; |
| 267 } | 267 } |
| 268 Send(new MediaPlayerHostMsg_SetCdm(routing_id(), player_id, cdm_id)); | 268 Send(new MediaPlayerHostMsg_SetCdm(routing_id(), player_id, cdm_id)); |
| 269 } | 269 } |
| 270 | 270 |
| 271 int RendererMediaPlayerManager::RegisterMediaPlayer( | 271 int RendererMediaPlayerManager::RegisterMediaPlayer( |
| 272 WebMediaPlayerAndroid* player) { | 272 WebMediaPlayerAndroid* player) { |
| 273 media_players_[next_media_player_id_] = player; | 273 media_players_[next_media_player_id_] = player; |
| 274 return next_media_player_id_++; | 274 return next_media_player_id_++; |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 358 | 358 |
| 359 bool | 359 bool |
| 360 RendererMediaPlayerManager::ShouldUseVideoOverlayForEmbeddedEncryptedVideo() { | 360 RendererMediaPlayerManager::ShouldUseVideoOverlayForEmbeddedEncryptedVideo() { |
| 361 const RendererPreferences& prefs = static_cast<RenderFrameImpl*>( | 361 const RendererPreferences& prefs = static_cast<RenderFrameImpl*>( |
| 362 render_frame())->render_view()->renderer_preferences(); | 362 render_frame())->render_view()->renderer_preferences(); |
| 363 return prefs.use_video_overlay_for_embedded_encrypted_video; | 363 return prefs.use_video_overlay_for_embedded_encrypted_video; |
| 364 } | 364 } |
| 365 #endif // defined(VIDEO_HOLE) | 365 #endif // defined(VIDEO_HOLE) |
| 366 | 366 |
| 367 } // namespace content | 367 } // namespace content |
| OLD | NEW |