Enables fullscreen subtitle and media control from Blink

content/browser/android/content_video_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/android/content_video_view.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/media/android/browser_media_player_manager.h"
@@ skipping 79 matching lines @@
 }
 
 void ContentVideoView::OnPlaybackComplete() {
   JNIEnv *env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> content_video_view = GetJavaObject(env);
   if (!content_video_view.is_null())
     Java_ContentVideoView_onPlaybackComplete(env, content_video_view.obj());
 }
 
 void ContentVideoView::OnExitFullscreen() {
-  DestroyContentVideoView(false);
+  JNIEnv *env = AttachCurrentThread();
+  ScopedJavaLocalRef<jobject> content_video_view = GetJavaObject(env);
+  if (!content_video_view.is_null()) {
+    Java_ContentVideoView_onExitFullscreen(env, content_video_view.obj());
+    j_content_video_view_.reset();
+  }
 }
 
 void ContentVideoView::UpdateMediaMetadata() {
   JNIEnv *env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> content_video_view = GetJavaObject(env);
   if (!content_video_view.is_null())
     UpdateMediaMetadata(env, content_video_view.obj());
 }
 
 int ContentVideoView::GetVideoWidth(JNIEnv*, jobject obj) const {
@@ skipping 27 matching lines @@
 
 void ContentVideoView::Play(JNIEnv*, jobject obj) {
   manager_->FullscreenPlayerPlay();
 }
 
 void ContentVideoView::Pause(JNIEnv*, jobject obj) {
   manager_->FullscreenPlayerPause();
 }
 
 void ContentVideoView::ExitFullscreen(
-    JNIEnv* env, jobject, jboolean release_media_player) {
+    JNIEnv*, jobject, jboolean release_media_player) {
   if (fullscreen_state_ == SUSPENDED)
     return;
   j_content_video_view_.reset();
   manager_->ExitFullscreen(release_media_player);
 }
 
 void ContentVideoView::SuspendFullscreen() {
   if (fullscreen_state_ != ENTERED)
     return;
   fullscreen_state_ = SUSPENDED;
@@ skipping 32 matching lines @@
         player->CanSeekForward(), player->CanSeekBackward());
 }
 
 ScopedJavaLocalRef<jobject> ContentVideoView::GetJavaObject(JNIEnv* env) {
   return j_content_video_view_.get(env);
 }
 
 JavaObjectWeakGlobalRef ContentVideoView::CreateJavaObject() {
   ContentViewCoreImpl* content_view_core = manager_->GetContentViewCore();
   JNIEnv *env = AttachCurrentThread();
+  bool legacyMode = !CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableOverlayFullscreenVideoSubtitle);
   return JavaObjectWeakGlobalRef(
       env,
       Java_ContentVideoView_createContentVideoView(
           env,
           content_view_core->GetContext().obj(),
           reinterpret_cast<intptr_t>(this),
-          content_view_core->GetContentVideoViewClient().obj()).obj());
+          content_view_core->GetContentVideoViewClient().obj(),
+          legacyMode).obj());
 }
 
 void ContentVideoView::DestroyContentVideoView(bool native_view_destroyed) {
   JNIEnv *env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> content_video_view = GetJavaObject(env);
   if (!content_video_view.is_null()) {
     Java_ContentVideoView_destroyContentVideoView(env,
         content_video_view.obj(), native_view_destroyed);
     j_content_video_view_.reset();
   }
 }
 }  // namespace content