Index: content/renderer/media/android/webmediaplayer_android.cc |
diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc |
index b7580e596b0fd9b9e6fb4d6ba047c6297500335b..49856cb09e2ecf2c1504812525807b73a8b55ab2 100644 |
--- a/content/renderer/media/android/webmediaplayer_android.cc |
+++ b/content/renderer/media/android/webmediaplayer_android.cc |
@@ -26,6 +26,7 @@ |
#include "content/public/renderer/render_frame.h" |
#include "content/renderer/media/android/renderer_demuxer_android.h" |
#include "content/renderer/media/android/renderer_media_player_manager.h" |
+#include "content/renderer/media/android/webmediasession_android.h" |
#include "content/renderer/media/cdm/render_cdm_factory.h" |
#include "content/renderer/media/cdm/renderer_cdm_manager.h" |
#include "content/renderer/render_frame_impl.h" |
@@ -242,6 +243,12 @@ WebMediaPlayerAndroid::WebMediaPlayerAndroid( |
player_id_ = player_manager_->RegisterMediaPlayer(this); |
+ media_session_id_ = 0; |
mlamouri (slow - plz ping)
2016/02/22 16:58:20
ditto
davve
2016/02/23 08:12:10
Done.
|
+ if (params.media_session()) |
mlamouri (slow - plz ping)
2016/02/22 16:58:20
style: use { } when there is line wrapping.
davve
2016/02/23 08:12:10
Goes away when moved into the initializer list.
|
+ media_session_id_ = |
+ static_cast<const WebMediaSessionAndroid*>( |
+ params.media_session())->media_session_id(); |
+ |
#if defined(VIDEO_HOLE) |
const RendererPreferences& prefs = RenderFrameImpl::FromRoutingID(frame_id) |
->render_view() |
@@ -1146,7 +1153,8 @@ void WebMediaPlayerAndroid::InitializePlayer( |
allow_stored_credentials_ = allow_stored_credentials; |
player_manager_->Initialize( |
player_type_, player_id_, url, first_party_for_cookies, demuxer_client_id, |
- frame_->document().url(), allow_stored_credentials, delegate_id_); |
+ frame_->document().url(), allow_stored_credentials, delegate_id_, |
+ media_session_id_); |
is_player_initialized_ = true; |
if (is_fullscreen_) |