| 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 fd68410df9453e58ea6d0c1f533a8d0627acbdf5..c95d2efa79001e3f6007ed548a513cc3cb0bbbe6 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,17 +17,19 @@
|
| 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 {
|
| public:
|
| virtual ~WebMediaPlayerProxyAndroid();
|
|
|
| - // Initialize a MediaPlayerAndroid object in browser process
|
| - virtual void Initialize(int player_id, const GURL& url,
|
| - bool is_media_source,
|
| - const GURL& first_party_for_cookies) = 0;
|
| + // Initialize a MediaPlayerBridge object in browser process
|
| + virtual void Initialize(
|
| + int player_id,
|
| + const GURL& url,
|
| + media::MediaPlayerAndroid::MediaSourceType media_source_type,
|
| + const GURL& first_party_for_cookies) = 0;
|
|
|
| // Start the player.
|
| virtual void Start(int player_id) = 0;
|
|
|