| 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 3f07a9319a866b8b88a562a528159b0f8e7eef88..da8682b5b3084f5ea177da25322bde491ee023f2 100644
|
| --- a/media/base/android/media_player_android.h
|
| +++ b/media/base/android/media_player_android.h
|
| @@ -98,6 +98,8 @@ class MEDIA_EXPORT MediaPlayerAndroid {
|
|
|
| int player_id() { return player_id_; }
|
|
|
| + int session_id() { return session_id_; }
|
| +
|
| GURL frame_url() { return frame_url_; }
|
|
|
| // Attach/Detaches |listener_| for listening to all the media events. If
|
| @@ -111,7 +113,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 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
|
| @@ -155,6 +158,9 @@ class MEDIA_EXPORT MediaPlayerAndroid {
|
| // NOTE: Weak pointers must be invalidated before all other member variables.
|
| base::WeakPtrFactory<MediaPlayerAndroid> weak_factory_;
|
|
|
| + // Media session ID assigned to this player
|
| + int session_id_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(MediaPlayerAndroid);
|
| };
|
|
|
|
|