| Index: media/base/android/media_player_bridge.h
|
| diff --git a/media/base/android/media_player_bridge.h b/media/base/android/media_player_bridge.h
|
| index 4d08bc7248781f6a688790a7debafb7c0cecef58..7dd538577e9ceac0acccf20aa548d85809644389 100644
|
| --- a/media/base/android/media_player_bridge.h
|
| +++ b/media/base/android/media_player_bridge.h
|
| @@ -65,6 +65,8 @@ class MEDIA_EXPORT MediaPlayerBridge : public MediaPlayerAndroid {
|
| virtual bool CanSeekForward() OVERRIDE;
|
| virtual bool CanSeekBackward() OVERRIDE;
|
| virtual bool IsPlayerReady() OVERRIDE;
|
| + virtual GURL GetUrl() OVERRIDE;
|
| + virtual GURL GetFirstPartyForCookies() OVERRIDE;
|
|
|
| protected:
|
| void SetMediaPlayer(jobject j_media_player);
|
| @@ -83,10 +85,10 @@ class MEDIA_EXPORT MediaPlayerBridge : public MediaPlayerAndroid {
|
| virtual void Prepare();
|
| void OnMediaPrepared();
|
|
|
| - private:
|
| // Create the actual android media player.
|
| - void CreateMediaPlayer();
|
| + virtual void CreateMediaPlayer();
|
|
|
| + private:
|
| // Set the data source for the media player.
|
| void SetDataSource(const std::string& url);
|
|
|
|
|