| 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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 IPC_END_MESSAGE_MAP() | 60 IPC_END_MESSAGE_MAP() |
| 61 return handled; | 61 return handled; |
| 62 } | 62 } |
| 63 | 63 |
| 64 void RendererMediaPlayerManager::Initialize( | 64 void RendererMediaPlayerManager::Initialize( |
| 65 MediaPlayerHostMsg_Initialize_Type type, | 65 MediaPlayerHostMsg_Initialize_Type type, |
| 66 int player_id, | 66 int player_id, |
| 67 const GURL& url, | 67 const GURL& url, |
| 68 const GURL& first_party_for_cookies, | 68 const GURL& first_party_for_cookies, |
| 69 int demuxer_client_id, | 69 int demuxer_client_id, |
| 70 const GURL& frame_url) { | 70 const GURL& frame_url, |
| 71 | 71 bool has_single_security_origin, |
| 72 bool allow_credentials) { |
| 72 MediaPlayerHostMsg_Initialize_Params media_player_params; | 73 MediaPlayerHostMsg_Initialize_Params media_player_params; |
| 73 media_player_params.type = type; | 74 media_player_params.type = type; |
| 74 media_player_params.player_id = player_id; | 75 media_player_params.player_id = player_id; |
| 75 media_player_params.demuxer_client_id = demuxer_client_id; | 76 media_player_params.demuxer_client_id = demuxer_client_id; |
| 76 media_player_params.url = url; | 77 media_player_params.url = url; |
| 77 media_player_params.first_party_for_cookies = first_party_for_cookies; | 78 media_player_params.first_party_for_cookies = first_party_for_cookies; |
| 78 media_player_params.frame_url = frame_url; | 79 media_player_params.frame_url = frame_url; |
| 80 media_player_params.has_single_security_origin = has_single_security_origin; |
| 81 media_player_params.allow_credentials = allow_credentials; |
| 79 | 82 |
| 80 Send(new MediaPlayerHostMsg_Initialize(routing_id(), media_player_params)); | 83 Send(new MediaPlayerHostMsg_Initialize(routing_id(), media_player_params)); |
| 81 } | 84 } |
| 82 | 85 |
| 83 void RendererMediaPlayerManager::Start(int player_id) { | 86 void RendererMediaPlayerManager::Start(int player_id) { |
| 84 Send(new MediaPlayerHostMsg_Start(routing_id(), player_id)); | 87 Send(new MediaPlayerHostMsg_Start(routing_id(), player_id)); |
| 85 } | 88 } |
| 86 | 89 |
| 87 void RendererMediaPlayerManager::Pause( | 90 void RendererMediaPlayerManager::Pause( |
| 88 int player_id, | 91 int player_id, |
| (...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 337 | 340 |
| 338 bool | 341 bool |
| 339 RendererMediaPlayerManager::ShouldUseVideoOverlayForEmbeddedEncryptedVideo() { | 342 RendererMediaPlayerManager::ShouldUseVideoOverlayForEmbeddedEncryptedVideo() { |
| 340 const RendererPreferences& prefs = static_cast<RenderFrameImpl*>( | 343 const RendererPreferences& prefs = static_cast<RenderFrameImpl*>( |
| 341 render_frame())->render_view()->renderer_preferences(); | 344 render_frame())->render_view()->renderer_preferences(); |
| 342 return prefs.use_video_overlay_for_embedded_encrypted_video; | 345 return prefs.use_video_overlay_for_embedded_encrypted_video; |
| 343 } | 346 } |
| 344 #endif // defined(VIDEO_HOLE) | 347 #endif // defined(VIDEO_HOLE) |
| 345 | 348 |
| 346 } // namespace content | 349 } // namespace content |
| OLD | NEW |