| Index: content/browser/android/content_view_core_impl.cc
|
| diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
|
| index 0ae2b94817c176e406c693a291eb75f037e3e208..32987155278fe9cfb9d312592b71f17d4eec1dac 100644
|
| --- a/content/browser/android/content_view_core_impl.cc
|
| +++ b/content/browser/android/content_view_core_impl.cc
|
| @@ -16,6 +16,7 @@
|
| #include "cc/layer.h"
|
| #include "content/browser/android/interstitial_page_delegate_android.h"
|
| #include "content/browser/android/load_url_params.h"
|
| +#include "content/browser/android/media_player_manager_android.h"
|
| #include "content/browser/android/touch_point.h"
|
| #include "content/browser/renderer_host/java/java_bound_object.h"
|
| #include "content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h"
|
| @@ -1198,6 +1199,26 @@ void ContentViewCoreImpl::ShowImeIfNeeded(JNIEnv* env, jobject obj) {
|
| host->Send(new ViewMsg_ShowImeIfNeeded(host->GetRoutingID()));
|
| }
|
|
|
| +void ContentViewCoreImpl::ExternalVideoSurfaceCreated(JNIEnv* env,
|
| + jobject obj,
|
| + jobject jsurface) {
|
| + RenderViewHostImpl* rvhi = static_cast<RenderViewHostImpl*>(
|
| + web_contents_->GetRenderViewHost());
|
| + DCHECK(rvhi);
|
| + if (rvhi->media_player_manager())
|
| + rvhi->media_player_manager()->SetExternalVideoSurface(jsurface);
|
| +}
|
| +
|
| +void ContentViewCoreImpl::ExternalVideoSurfaceDestroyed(JNIEnv* env,
|
| + jobject obj,
|
| + jobject jsurface) {
|
| + RenderViewHostImpl* rvhi = static_cast<RenderViewHostImpl*>(
|
| + web_contents_->GetRenderViewHost());
|
| + DCHECK(rvhi);
|
| + if (rvhi->media_player_manager())
|
| + rvhi->media_player_manager()->SetExternalVideoSurface(NULL);
|
| +}
|
| +
|
| void ContentViewCoreImpl::ScrollFocusedEditableNodeIntoView(JNIEnv* env,
|
| jobject obj) {
|
| RenderViewHost* host = web_contents_->GetRenderViewHost();
|
|
|