media/base/android/media_player_bridge.h - Issue 15876006: Allow some Android media player implementation to be overridden by embedders.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/base/android/media_player_bridge.h

Issue 15876006: Allow some Android media player implementation to be overridden by embedders. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixed indent Created 7 years, 7 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: 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();

bulach 2013/05/29 18:31:23 nit: OVERRIDE

whywhat 2013/05/29 18:50:12 Ack

+ private:

// Set the data source for the media player.

void SetDataSource(const std::string& url);

« media/base/android/media_player_android.h ('K') | « media/base/android/media_player_android.cc ('k') | media/base/android/media_player_bridge.cc » ('j') | no next file with comments »