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 17 matching lines...) Expand all Loading... |
28 // |manager| is passed to this class so that it can find the right | 28 // |manager| is passed to this class so that it can find the right |
29 // WebMediaPlayerAndroid using player IDs. | 29 // WebMediaPlayerAndroid using player IDs. |
30 WebMediaPlayerProxyImplAndroid( | 30 WebMediaPlayerProxyImplAndroid( |
31 RenderView* render_view, | 31 RenderView* render_view, |
32 webkit_media::WebMediaPlayerManagerAndroid* manager); | 32 webkit_media::WebMediaPlayerManagerAndroid* manager); |
33 virtual ~WebMediaPlayerProxyImplAndroid(); | 33 virtual ~WebMediaPlayerProxyImplAndroid(); |
34 | 34 |
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 GURL& url, | 38 virtual void Initialize(int player_id, |
39 bool is_media_source, | 39 const GURL& url, |
| 40 media::MediaPlayerBridge::MediaSource media_source, |
40 const GURL& first_party_for_cookies) OVERRIDE; | 41 const GURL& first_party_for_cookies) OVERRIDE; |
41 virtual void Start(int player_id) OVERRIDE; | 42 virtual void Start(int player_id) OVERRIDE; |
42 virtual void Pause(int player_id) OVERRIDE; | 43 virtual void Pause(int player_id) OVERRIDE; |
43 virtual void Seek(int player_id, base::TimeDelta time) OVERRIDE; | 44 virtual void Seek(int player_id, base::TimeDelta time) OVERRIDE; |
44 virtual void ReleaseResources(int player_id) OVERRIDE; | 45 virtual void ReleaseResources(int player_id) OVERRIDE; |
45 virtual void DestroyPlayer(int player_id) OVERRIDE; | 46 virtual void DestroyPlayer(int player_id) OVERRIDE; |
46 virtual void EnterFullscreen(int player_id) OVERRIDE; | 47 virtual void EnterFullscreen(int player_id) OVERRIDE; |
47 virtual void ExitFullscreen(int player_id) OVERRIDE; | 48 virtual void ExitFullscreen(int player_id) OVERRIDE; |
48 #if defined(GOOGLE_TV) | 49 #if defined(GOOGLE_TV) |
49 virtual void RequestExternalSurface(int player_id) OVERRIDE; | 50 virtual void RequestExternalSurface(int player_id) OVERRIDE; |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
81 #endif | 82 #endif |
82 | 83 |
83 webkit_media::WebMediaPlayerManagerAndroid* manager_; | 84 webkit_media::WebMediaPlayerManagerAndroid* manager_; |
84 | 85 |
85 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerProxyImplAndroid); | 86 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerProxyImplAndroid); |
86 }; | 87 }; |
87 | 88 |
88 } // namespace content | 89 } // namespace content |
89 | 90 |
90 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_PROXY_IMPL_ANDROID_H_ | 91 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_PROXY_IMPL_ANDROID_H_ |
OLD | NEW |