Chromium Code Reviews| Index: content/renderer/render_view_impl.h |
| diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h |
| index f009b608d91a584c373b64876f2a90dff8772c59..e90e4886ce04f4f90be1afa80cb8ef7228f1c1ae 100644 |
| --- a/content/renderer/render_view_impl.h |
| +++ b/content/renderer/render_view_impl.h |
| @@ -103,6 +103,9 @@ class RenderViewObserver; |
| class RenderViewTest; |
| class RendererAccessibility; |
| class RendererPpapiHost; |
| +#if defined(OS_ANDROID) |
| +class WebMediaPlayerProxyImplAndroid; |
| +#endif |
| struct CustomContextMenuContext; |
| struct FileChooserParams; |
| @@ -137,6 +140,7 @@ class ResourceFetcher; |
| #if defined(OS_ANDROID) |
| namespace webkit_media { |
| +class MediaPlayerBridgeManagerImpl; |
| class WebMediaPlayerManagerAndroid; |
| } |
| #endif |
| @@ -1402,6 +1406,17 @@ class RenderViewImpl : public RenderWidget, |
| typedef std::vector< linked_ptr<content::ContentDetector> > |
| ContentDetectorList; |
| ContentDetectorList content_detectors_; |
| + |
| + // Proxy class for WebMediaPlayer to communicate with the real mediaplayer |
| + // objects in browser process. This object is lazily initialized. |
| + content::WebMediaPlayerProxyImplAndroid* media_player_proxy_; |
|
scherkus (not reviewing)
2012/09/07 13:17:35
who owns this object? are we leaking it?
qinmin
2012/09/07 22:48:27
This object is inherited from RenderViewObserver.
|
| + |
| + // The media player manager for managing all the media players on this view. |
| + scoped_ptr<webkit_media::WebMediaPlayerManagerAndroid> media_player_manager_; |
| + |
| + // Resource manager for all the android mediaplayer objects if they are |
| + // created in the renderer process. This object is lazily initialized. |
| + scoped_ptr<webkit_media::MediaPlayerBridgeManagerImpl> media_bridge_manager_; |
| #endif |
| // Misc ---------------------------------------------------------------------- |
| @@ -1460,11 +1475,6 @@ class RenderViewImpl : public RenderWidget, |
| // Wraps the |webwidget_| as a MouseLockDispatcher::LockTarget interface. |
| scoped_ptr<MouseLockDispatcher::LockTarget> webwidget_mouse_lock_target_; |
| -#if defined(OS_ANDROID) |
| - // The media player manager for managing all the media players on this view. |
| - scoped_ptr<webkit_media::WebMediaPlayerManagerAndroid> media_player_manager_; |
| -#endif |
| - |
| // Plugins ------------------------------------------------------------------- |
| // All the currently active plugin delegates for this RenderView; kept so |