Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1016)

Unified Diff: content/renderer/media/android/webmediaplayer_android.cc

Issue 1308983005: NOT FOR LANDING Implement WebMediaSession (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add forward declaration Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 d6553d173a6252ec8dcf22f8966bd68933046e58..d4bfda9dda3e042e8594db81f367ffff0abab67c 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"
@@ -227,6 +228,11 @@ WebMediaPlayerAndroid::WebMediaPlayerAndroid(
player_id_ = player_manager_->RegisterMediaPlayer(this);
+ session_id_ = 0;
+ if (params.session())
+ session_id_ =
+ static_cast<WebMediaSessionAndroid*>(params.session())->session_id();
+
#if defined(VIDEO_HOLE)
const RendererPreferences& prefs =
static_cast<RenderFrameImpl*>(render_frame())
@@ -1124,7 +1130,7 @@ 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);
+ frame_->document().url(), allow_stored_credentials, session_id_);
is_player_initialized_ = true;
if (is_fullscreen_)
« no previous file with comments | « content/renderer/media/android/webmediaplayer_android.h ('k') | content/renderer/media/android/webmediasession_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698