| Index: media/base/android/media_player_android.h
|
| diff --git a/media/base/android/media_player_android.h b/media/base/android/media_player_android.h
|
| index 16982d69c8cd8f73716f1c6ca76e9d2b12d526d6..950a5dc4b42505c9ba9bd141f4c5044e8ca37949 100644
|
| --- a/media/base/android/media_player_android.h
|
| +++ b/media/base/android/media_player_android.h
|
| @@ -108,6 +108,8 @@ class MEDIA_EXPORT MediaPlayerAndroid {
|
|
|
| GURL frame_url() { return frame_url_; }
|
|
|
| + int media_session_id() { return media_session_id_; }
|
| +
|
| // Attach/Detaches |listener_| for listening to all the media events. If
|
| // |j_media_player| is NULL, |listener_| only listens to the system media
|
| // events. Otherwise, it also listens to the events from |j_media_player|.
|
| @@ -119,7 +121,8 @@ class MEDIA_EXPORT MediaPlayerAndroid {
|
| int player_id,
|
| MediaPlayerManager* manager,
|
| const OnDecoderResourcesReleasedCB& on_decoder_resources_released_cb,
|
| - const GURL& frame_url);
|
| + const GURL& frame_url,
|
| + int media_session_id);
|
|
|
| // TODO(qinmin): Simplify the MediaPlayerListener class to only listen to
|
| // media interrupt events. And have a separate child class to listen to all
|
| @@ -170,6 +173,9 @@ class MEDIA_EXPORT MediaPlayerAndroid {
|
| // Url for the frame that contains this player.
|
| GURL frame_url_;
|
|
|
| + // Media session ID assigned to this player.
|
| + int media_session_id_;
|
| +
|
| // Listener object that listens to all the media player events.
|
| scoped_ptr<MediaPlayerListener> listener_;
|
|
|
|
|