| Index: media/base/android/media_source_player.h
|
| diff --git a/media/base/android/media_source_player.h b/media/base/android/media_source_player.h
|
| index 51796529a3aac9126ead624c6f64760a9e15610e..8e370543198c000e4d543855d5f26e0538c94dd0 100644
|
| --- a/media/base/android/media_source_player.h
|
| +++ b/media/base/android/media_source_player.h
|
| @@ -149,17 +149,12 @@ class MEDIA_EXPORT MediaSourcePlayer : public MediaPlayerAndroid {
|
| virtual bool CanSeekBackward() OVERRIDE;
|
| virtual bool IsPlayerReady() OVERRIDE;
|
| virtual void OnSeekRequestAck(unsigned seek_request_id) OVERRIDE;
|
| -
|
| - // Called when the demuxer is ready.
|
| virtual void DemuxerReady(
|
| const MediaPlayerHostMsg_DemuxerReady_Params& params) OVERRIDE;
|
| -
|
| - // Called when the requested data is received from the demuxer.
|
| virtual void ReadFromDemuxerAck(
|
| const MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params) OVERRIDE;
|
| -
|
| - // Called when the demuxer has changed the duration.
|
| virtual void DurationChanged(const base::TimeDelta& duration) OVERRIDE;
|
| + virtual void SetDrmBridge(MediaDrmBridge* drm_bridge) OVERRIDE;
|
|
|
| private:
|
| // Update the timestamps for A/V sync scheduling.
|
| @@ -258,6 +253,8 @@ class MEDIA_EXPORT MediaSourcePlayer : public MediaPlayerAndroid {
|
| // Weak pointer passed to media decoder jobs for callbacks.
|
| base::WeakPtrFactory<MediaSourcePlayer> weak_this_;
|
|
|
| + MediaDrmBridge* drm_bridge_;
|
| +
|
| friend class MediaSourcePlayerTest;
|
| DISALLOW_COPY_AND_ASSIGN(MediaSourcePlayer);
|
| };
|
|
|