content/renderer/media/webmediaplayer_proxy_impl_android.h - Issue 10979047: Upstream fullscreen video implementation for android

Side by Side Diff: content/renderer/media/webmediaplayer_proxy_impl_android.h

Issue 10979047: Upstream fullscreen video implementation for android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: remove some unused variables and make fullscreen video to work with content shell Created 8 years, 2 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 unified diff | Download patch | Annotate | Revision Log

« content/browser/android/surface_texture_peer_browser_impl.cc ('K') | « content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java ('k') | content/renderer/media/webmediaplayer_proxy_impl_android.cc » ('j') | content/renderer/media/webmediaplayer_proxy_impl_android.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_PROXY_IMPL_ANDROID_H_	5 #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_PROXY_IMPL_ANDROID_H_

6 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_PROXY_IMPL_ANDROID_H_	6 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_PROXY_IMPL_ANDROID_H_

7	7

8 #include <map>	8 #include <map>

9	9

10 #include "content/public/renderer/render_view_observer.h"	10 #include "content/public/renderer/render_view_observer.h"

(...skipping 24 matching lines...) Expand all Loading...
35 virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;	35 virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;

36	36

37 // Methods inherited from WebMediaPlayerProxyAndroid.	37 // Methods inherited from WebMediaPlayerProxyAndroid.

38 virtual void Initialize(int player_id, const std::string& url,	38 virtual void Initialize(int player_id, const std::string& url,

39 const std::string& first_party_for_cookies) OVERRIDE;	39 const std::string& first_party_for_cookies) OVERRIDE;

40 virtual void Start(int player_id) OVERRIDE;	40 virtual void Start(int player_id) OVERRIDE;

41 virtual void Pause(int player_id) OVERRIDE;	41 virtual void Pause(int player_id) OVERRIDE;

42 virtual void Seek(int player_id, base::TimeDelta time) OVERRIDE;	42 virtual void Seek(int player_id, base::TimeDelta time) OVERRIDE;

43 virtual void ReleaseResources(int player_id) OVERRIDE;	43 virtual void ReleaseResources(int player_id) OVERRIDE;

44 virtual void DestroyPlayer(int player_id) OVERRIDE;	44 virtual void DestroyPlayer(int player_id) OVERRIDE;

	45 virtual void EnterFullscreen(int player_id) OVERRIDE;

	46 virtual void ExitFullscreen(int player_id) OVERRIDE;

45	47

46 private:	48 private:

47 webkit_media::WebMediaPlayerImplAndroid* GetWebMediaPlayer(int player_id);	49 webkit_media::WebMediaPlayerImplAndroid* GetWebMediaPlayer(int player_id);

48	50

49 // Message handlers.	51 // Message handlers.

50 void OnMediaPrepared(int player_id, base::TimeDelta duration);	52 void OnMediaPrepared(int player_id, base::TimeDelta duration);

51 void OnMediaPlaybackCompleted(int player_id);	53 void OnMediaPlaybackCompleted(int player_id);

52 void OnMediaBufferingUpdate(int player_id, int percent);	54 void OnMediaBufferingUpdate(int player_id, int percent);

53 void OnMediaSeekCompleted(int player_id, base::TimeDelta current_time);	55 void OnMediaSeekCompleted(int player_id, base::TimeDelta current_time);

54 void OnMediaError(int player_id, int error);	56 void OnMediaError(int player_id, int error);

55 void OnVideoSizeChanged(int player_id, int width, int height);	57 void OnVideoSizeChanged(int player_id, int width, int height);

56 void OnTimeUpdate(int player_id, base::TimeDelta current_time);	58 void OnTimeUpdate(int player_id, base::TimeDelta current_time);

57 void OnMediaPlayerReleased(int player_id);	59 void OnMediaPlayerReleased(int player_id);

	60 void OnDidExitFullscreen(int player_id);

	61 void OnDidEnterFullscreen(int player_id);

	62 void OnPlayerPlay(int player_id);

	63 void OnPlayerPause(int player_id);

58	64

59 webkit_media::WebMediaPlayerManagerAndroid* manager_;	65 webkit_media::WebMediaPlayerManagerAndroid* manager_;

60	66

61 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerProxyImplAndroid);	67 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerProxyImplAndroid);

62 };	68 };

63	69

64 } // namespace content	70 } // namespace content

65	71

66 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_PROXY_IMPL_ANDROID_H_	72 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_PROXY_IMPL_ANDROID_H_

OLD	NEW