| Index: webkit/media/android/webmediaplayer_proxy_android.h
|
| diff --git a/webkit/media/android/webmediaplayer_proxy_android.h b/webkit/media/android/webmediaplayer_proxy_android.h
|
| index bc29479622e6102205d3b07222ee4aa04eff43c6..8904ac1f4c40b296cd0c608c8f1f3b9a03a88749 100644
|
| --- a/webkit/media/android/webmediaplayer_proxy_android.h
|
| +++ b/webkit/media/android/webmediaplayer_proxy_android.h
|
| @@ -9,6 +9,7 @@
|
|
|
| #include "base/time.h"
|
| #include "googleurl/src/gurl.h"
|
| +#include "media/base/android/media_player_bridge.h"
|
| #if defined(GOOGLE_TV)
|
| #include "media/base/android/demuxer_stream_player_params.h"
|
| #endif
|
| @@ -16,7 +17,7 @@
|
| namespace webkit_media {
|
|
|
| // An interface to facilitate the IPC between the browser side
|
| -// android::MediaPlayer and the WebMediaPlayerImplAndroid in the renderer
|
| +// android::MediaPlayer and the WebMediaPlayerAndroid in the renderer
|
| // process.
|
| // Implementation is provided by content::WebMediaPlayerProxyImplAndroid.
|
| class WebMediaPlayerProxyAndroid {
|
| @@ -24,8 +25,9 @@ class WebMediaPlayerProxyAndroid {
|
| virtual ~WebMediaPlayerProxyAndroid();
|
|
|
| // Initialize a MediaPlayerBridge object in browser process
|
| - virtual void Initialize(int player_id, const GURL& url,
|
| - bool is_media_source,
|
| + virtual void Initialize(int player_id,
|
| + const GURL& url,
|
| + media::MediaPlayerBridge::MediaSource media_source,
|
| const GURL& first_party_for_cookies) = 0;
|
|
|
| // Start the player.
|
|
|