Chromium Code Reviews| Index: content/renderer/render_view_impl.cc |
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc |
| index bea25aa22d9138c05f0bafac7c0123fe1fdb3237..e93cd9061d4acef6f75e6e6eeaa917ded05d2a83 100644 |
| --- a/content/renderer/render_view_impl.cc |
| +++ b/content/renderer/render_view_impl.cc |
| @@ -199,7 +199,6 @@ |
| #include "content/renderer/android/content_detector.h" |
| #include "content/renderer/android/email_detector.h" |
| #include "content/renderer/android/phone_number_detector.h" |
| -#include "content/renderer/media/android/renderer_media_player_manager.h" |
| #include "net/android/network_library.h" |
| #include "skia/ext/platform_canvas.h" |
| #include "third_party/WebKit/public/platform/WebFloatPoint.h" |
| @@ -661,7 +660,6 @@ RenderViewImpl::RenderViewImpl(RenderViewImplParams* params) |
| mouse_lock_dispatcher_(NULL), |
| #if defined(OS_ANDROID) |
| expected_content_intent_id_(0), |
| - media_player_manager_(NULL), |
| #endif |
| #if defined(OS_WIN) |
| focused_plugin_id_(-1), |
| @@ -788,10 +786,6 @@ void RenderViewImpl::Initialize(RenderViewImplParams* params) { |
| new TextInputClientObserver(this); |
| #endif // defined(OS_MACOSX) |
| -#if defined(OS_ANDROID) |
| - media_player_manager_ = new RendererMediaPlayerManager(this); |
| -#endif |
| - |
| // The next group of objects all implement RenderViewObserver, so are deleted |
| // along with the RenderView automatically. |
| devtools_agent_ = new DevToolsAgent(this); |
| @@ -1141,7 +1135,6 @@ bool RenderViewImpl::OnMessageReceived(const IPC::Message& message) { |
| IPC_MESSAGE_HANDLER(ViewMsg_SelectPopupMenuItems, OnSelectPopupMenuItems) |
| IPC_MESSAGE_HANDLER(ViewMsg_UpdateTopControlsState, |
| OnUpdateTopControlsState) |
| - IPC_MESSAGE_HANDLER(ViewMsg_PauseVideo, OnPauseVideo) |
| IPC_MESSAGE_HANDLER(ViewMsg_ExtractSmartClipData, OnExtractSmartClipData) |
| #elif defined(OS_MACOSX) |
| IPC_MESSAGE_HANDLER(ViewMsg_PluginImeCompositionCompleted, |
| @@ -1320,16 +1313,6 @@ void RenderViewImpl::OnSetInLiveResize(bool in_live_resize) { |
| } |
| #endif |
| -#if defined(OS_ANDROID) |
| -void RenderViewImpl::OnPauseVideo() { |
| - // Inform RendererMediaPlayerManager to release all video player resources. |
| - // If something is in progress the resource will not be freed, it will |
| - // only be freed once the tab is destroyed or if the user navigates away |
| - // via WebMediaPlayerAndroid::Destroy. |
|
dcheng
2014/05/23 21:19:41
Is it worth moving this comment to the new IPC han
xhwang
2014/05/23 23:34:35
Done.
|
| - media_player_manager_->ReleaseVideoResources(); |
| -} |
| -#endif |
| - |
| /////////////////////////////////////////////////////////////////////////////// |
| // Sends the current history state to the browser so it will be saved before we |