| Index: content/shell/android/java/src/org/chromium/content_shell/Shell.java
|
| diff --git a/content/shell/android/java/src/org/chromium/content_shell/Shell.java b/content/shell/android/java/src/org/chromium/content_shell/Shell.java
|
| index 6c5e21a268133ce6c9e2f2dc5cb778a3340366eb..79edb4858f2b464daa694c971b9145248c946340 100644
|
| --- a/content/shell/android/java/src/org/chromium/content_shell/Shell.java
|
| +++ b/content/shell/android/java/src/org/chromium/content_shell/Shell.java
|
| @@ -22,6 +22,7 @@ import android.widget.TextView.OnEditorActionListener;
|
|
|
| import org.chromium.base.CalledByNative;
|
| import org.chromium.base.JNINamespace;
|
| +import org.chromium.content.browser.ContentVideoView;
|
| import org.chromium.content.browser.ContentView;
|
| import org.chromium.content.browser.ContentViewClient;
|
| import org.chromium.content.browser.ContentViewCore;
|
| @@ -259,6 +260,11 @@ public class Shell extends LinearLayout {
|
| mIsFullscreen = enterFullscreen;
|
| LinearLayout toolBar = (LinearLayout) findViewById(R.id.toolbar);
|
| toolBar.setVisibility(enterFullscreen ? GONE : VISIBLE);
|
| +
|
| + if (!mIsFullscreen) {
|
| + ContentVideoView videoView = ContentVideoView.getContentVideoView();
|
| + if (videoView != null) videoView.exitFullscreen(false);
|
| + }
|
| }
|
|
|
| @CalledByNative
|
|
|