| 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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 } | 64 } |
| 65 | 65 |
| 66 void RendererMediaPlayerManager::Initialize( | 66 void RendererMediaPlayerManager::Initialize( |
| 67 MediaPlayerHostMsg_Initialize_Type type, | 67 MediaPlayerHostMsg_Initialize_Type type, |
| 68 int player_id, | 68 int player_id, |
| 69 const GURL& url, | 69 const GURL& url, |
| 70 const GURL& first_party_for_cookies, | 70 const GURL& first_party_for_cookies, |
| 71 int demuxer_client_id, | 71 int demuxer_client_id, |
| 72 const GURL& frame_url, | 72 const GURL& frame_url, |
| 73 bool allow_credentials, | 73 bool allow_credentials, |
| 74 int delegate_id, | 74 int delegate_id) { |
| 75 int media_session_id) { | |
| 76 MediaPlayerHostMsg_Initialize_Params media_player_params; | 75 MediaPlayerHostMsg_Initialize_Params media_player_params; |
| 77 media_player_params.type = type; | 76 media_player_params.type = type; |
| 78 media_player_params.player_id = player_id; | 77 media_player_params.player_id = player_id; |
| 79 media_player_params.demuxer_client_id = demuxer_client_id; | 78 media_player_params.demuxer_client_id = demuxer_client_id; |
| 80 media_player_params.url = url; | 79 media_player_params.url = url; |
| 81 media_player_params.first_party_for_cookies = first_party_for_cookies; | 80 media_player_params.first_party_for_cookies = first_party_for_cookies; |
| 82 media_player_params.frame_url = frame_url; | 81 media_player_params.frame_url = frame_url; |
| 83 media_player_params.allow_credentials = allow_credentials; | 82 media_player_params.allow_credentials = allow_credentials; |
| 84 media_player_params.delegate_id = delegate_id; | 83 media_player_params.delegate_id = delegate_id; |
| 85 media_player_params.media_session_id = media_session_id; | |
| 86 | 84 |
| 87 Send(new MediaPlayerHostMsg_Initialize(routing_id(), media_player_params)); | 85 Send(new MediaPlayerHostMsg_Initialize(routing_id(), media_player_params)); |
| 88 } | 86 } |
| 89 | 87 |
| 90 void RendererMediaPlayerManager::Start(int player_id) { | 88 void RendererMediaPlayerManager::Start(int player_id) { |
| 91 Send(new MediaPlayerHostMsg_Start(routing_id(), player_id)); | 89 Send(new MediaPlayerHostMsg_Start(routing_id(), player_id)); |
| 92 } | 90 } |
| 93 | 91 |
| 94 void RendererMediaPlayerManager::Pause( | 92 void RendererMediaPlayerManager::Pause( |
| 95 int player_id, | 93 int player_id, |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 279 if (iter != media_players_.end()) | 277 if (iter != media_players_.end()) |
| 280 return iter->second; | 278 return iter->second; |
| 281 return NULL; | 279 return NULL; |
| 282 } | 280 } |
| 283 | 281 |
| 284 void RendererMediaPlayerManager::OnDestruct() { | 282 void RendererMediaPlayerManager::OnDestruct() { |
| 285 delete this; | 283 delete this; |
| 286 } | 284 } |
| 287 | 285 |
| 288 } // namespace content | 286 } // namespace content |
| OLD | NEW |