| Index: media/base/android/media_player_listener.h
|
| diff --git a/media/base/android/media_player_listener.h b/media/base/android/media_player_listener.h
|
| index 6d15c63d1fe7687dd26a8be88d4444747b144856..844475bff4ab14cae49434c007806ef1c0783f1d 100644
|
| --- a/media/base/android/media_player_listener.h
|
| +++ b/media/base/android/media_player_listener.h
|
| @@ -30,33 +30,37 @@ class MediaPlayerListener {
|
| MediaPlayerListener(
|
| const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
|
| base::WeakPtr<MediaPlayerAndroid> media_player);
|
| - virtual ~MediaPlayerListener();
|
| + virtual ~MediaPlayerListener();
|
|
|
| // Called by the Java MediaPlayerListener and mirrored to corresponding
|
| // callbacks.
|
| - void OnMediaError(JNIEnv* /* env */,
|
| - const base::android::JavaParamRef<jobject>& /* obj */,
|
| - jint error_type);
|
| - void OnVideoSizeChanged(JNIEnv* /* env */,
|
| + void OnMediaError(JNIEnv* /* env */,
|
| + const base::android::JavaParamRef<jobject>& /* obj */,
|
| + jint error_type);
|
| + void OnVideoSizeChanged(JNIEnv* /* env */,
|
| + const base::android::JavaParamRef<jobject>& /* obj */,
|
| + jint width,
|
| + jint height);
|
| + void OnBufferingUpdate(JNIEnv* /* env */,
|
| const base::android::JavaParamRef<jobject>& /* obj */,
|
| - jint width,
|
| - jint height);
|
| - void OnBufferingUpdate(JNIEnv* /* env */,
|
| - const base::android::JavaParamRef<jobject>& /* obj */,
|
| - jint percent);
|
| - void OnPlaybackComplete(JNIEnv* /* env */,
|
| - const base::android::JavaParamRef<jobject>& /* obj */);
|
| - void OnSeekComplete(JNIEnv* /* env */,
|
| - const base::android::JavaParamRef<jobject>& /* obj */);
|
| - void OnMediaPrepared(JNIEnv* /* env */,
|
| + jint percent);
|
| + void OnPlaybackComplete(
|
| + JNIEnv* /* env */,
|
| + const base::android::JavaParamRef<jobject>& /* obj */);
|
| + void OnSeekComplete(JNIEnv* /* env */,
|
| const base::android::JavaParamRef<jobject>& /* obj */);
|
| - void OnMediaInterrupted(JNIEnv* /* env */,
|
| - const base::android::JavaParamRef<jobject>& /* obj */);
|
| + void OnMediaPrepared(JNIEnv* /* env */,
|
| + const base::android::JavaParamRef<jobject>& /* obj */);
|
| + void OnMediaInterrupted(
|
| + JNIEnv* /* env */,
|
| + const base::android::JavaParamRef<jobject>& /* obj */);
|
|
|
| // Create a Java MediaPlayerListener object and listens to all the media
|
| // related events from system and |media_player|. If |media_player| is NULL,
|
| // this class only listens to system events.
|
| - void CreateMediaPlayerListener(jobject context, jobject media_player);
|
| + void CreateMediaPlayerListener(
|
| + const base::android::JavaRef<jobject>& context,
|
| + const base::android::JavaRef<jobject>& media_player);
|
| void ReleaseMediaPlayerListenerResources();
|
|
|
| // Register MediaPlayerListener in the system library loader.
|
|
|