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 "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "content/common/media/media_player_messages_android.h" | 8 #include "content/common/media/media_player_messages_android.h" |
9 #include "content/public/common/renderer_preferences.h" | 9 #include "content/public/common/renderer_preferences.h" |
10 #include "content/renderer/media/android/webmediaplayer_android.h" | 10 #include "content/renderer/media/android/webmediaplayer_android.h" |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 bool allow_credentials, | 71 bool allow_credentials, |
72 int delegate_id) { | 72 int delegate_id, |
| 73 int media_session_id) { |
73 MediaPlayerHostMsg_Initialize_Params media_player_params; | 74 MediaPlayerHostMsg_Initialize_Params media_player_params; |
74 media_player_params.type = type; | 75 media_player_params.type = type; |
75 media_player_params.player_id = player_id; | 76 media_player_params.player_id = player_id; |
76 media_player_params.demuxer_client_id = demuxer_client_id; | 77 media_player_params.demuxer_client_id = demuxer_client_id; |
77 media_player_params.url = url; | 78 media_player_params.url = url; |
78 media_player_params.first_party_for_cookies = first_party_for_cookies; | 79 media_player_params.first_party_for_cookies = first_party_for_cookies; |
79 media_player_params.frame_url = frame_url; | 80 media_player_params.frame_url = frame_url; |
80 media_player_params.allow_credentials = allow_credentials; | 81 media_player_params.allow_credentials = allow_credentials; |
81 media_player_params.delegate_id = delegate_id; | 82 media_player_params.delegate_id = delegate_id; |
| 83 media_player_params.media_session_id = media_session_id; |
82 | 84 |
83 Send(new MediaPlayerHostMsg_Initialize(routing_id(), media_player_params)); | 85 Send(new MediaPlayerHostMsg_Initialize(routing_id(), media_player_params)); |
84 } | 86 } |
85 | 87 |
86 void RendererMediaPlayerManager::Start(int player_id) { | 88 void RendererMediaPlayerManager::Start(int player_id) { |
87 Send(new MediaPlayerHostMsg_Start(routing_id(), player_id)); | 89 Send(new MediaPlayerHostMsg_Start(routing_id(), player_id)); |
88 } | 90 } |
89 | 91 |
90 void RendererMediaPlayerManager::Pause( | 92 void RendererMediaPlayerManager::Pause( |
91 int player_id, | 93 int player_id, |
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
307 | 309 |
308 bool | 310 bool |
309 RendererMediaPlayerManager::ShouldUseVideoOverlayForEmbeddedEncryptedVideo() { | 311 RendererMediaPlayerManager::ShouldUseVideoOverlayForEmbeddedEncryptedVideo() { |
310 const RendererPreferences& prefs = static_cast<RenderFrameImpl*>( | 312 const RendererPreferences& prefs = static_cast<RenderFrameImpl*>( |
311 render_frame())->render_view()->renderer_preferences(); | 313 render_frame())->render_view()->renderer_preferences(); |
312 return prefs.use_video_overlay_for_embedded_encrypted_video; | 314 return prefs.use_video_overlay_for_embedded_encrypted_video; |
313 } | 315 } |
314 #endif // defined(VIDEO_HOLE) | 316 #endif // defined(VIDEO_HOLE) |
315 | 317 |
316 } // namespace content | 318 } // namespace content |
OLD | NEW |