| 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 9ddadf353368521f1da43f857be0ab0a3f434b45..02925dda133dc3b9ffa1ac49a2902d2368ffb59a 100644
|
| --- a/content/browser/android/content_view_core_impl.cc
|
| +++ b/content/browser/android/content_view_core_impl.cc
|
| @@ -14,8 +14,10 @@
|
| #include "base/utf_string_conversions.h"
|
| #include "base/values.h"
|
| #include "cc/layer.h"
|
| +#include "content/browser/android/external_video_surface_view_holder.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"
|
| @@ -1182,6 +1184,17 @@ void ContentViewCoreImpl::ShowImeIfNeeded(JNIEnv* env, jobject obj) {
|
| host->Send(new ViewMsg_ShowImeIfNeeded(host->GetRoutingID()));
|
| }
|
|
|
| +void ContentViewCoreImpl::SetExternalVideoSurfaceViewHolder(
|
| + JNIEnv* env, jobject obj, jint native_holder) {
|
| + ExternalVideoSurfaceViewHolder* holder =
|
| + reinterpret_cast<ExternalVideoSurfaceViewHolder*>(native_holder);
|
| +
|
| + RenderViewHostImpl* rvhi = static_cast<RenderViewHostImpl*>(
|
| + web_contents_->GetRenderViewHost());
|
| + if (rvhi && rvhi->media_player_manager())
|
| + rvhi->media_player_manager()->SetExternalVideoSurfaceViewHolder(holder);
|
| +}
|
| +
|
| void ContentViewCoreImpl::ScrollFocusedEditableNodeIntoView(JNIEnv* env,
|
| jobject obj) {
|
| RenderViewHost* host = web_contents_->GetRenderViewHost();
|
|
|