| Index: android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java
|
| diff --git a/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java b/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java
|
| index 1746eb0fd520549faf3118a9b0bd330924caf1be..27b77bb1640be4eb8335e286ce31f5a7bfc5fa48 100644
|
| --- a/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java
|
| +++ b/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java
|
| @@ -31,12 +31,14 @@ class AwWebContentsDelegateAdapter extends AwWebContentsDelegate {
|
| private static final String TAG = "AwWebContentsDelegateAdapter";
|
|
|
| final AwContentsClient mContentsClient;
|
| + final AwContentViewClient mContentViewClient;
|
| View mContainerView;
|
| final Context mContext;
|
|
|
| public AwWebContentsDelegateAdapter(AwContentsClient contentsClient,
|
| - View containerView, Context context) {
|
| + AwContentViewClient contentViewClient, View containerView, Context context) {
|
| mContentsClient = contentsClient;
|
| + mContentViewClient = contentViewClient;
|
| setContainerView(containerView);
|
| mContext = context;
|
| }
|
| @@ -213,11 +215,20 @@ class AwWebContentsDelegateAdapter extends AwWebContentsDelegate {
|
| }
|
|
|
| @Override
|
| - public void toggleFullscreenModeForTab(boolean enterFullscreen) {
|
| - if (!enterFullscreen) {
|
| - ContentVideoView videoView = ContentVideoView.getContentVideoView();
|
| - if (videoView != null) videoView.exitFullscreen(false);
|
| + public void toggleFullscreenModeForTab(boolean enterFullscreen, boolean isVideo) {
|
| + if (enterFullscreen) {
|
| + if (!isVideo) {
|
| + mContentViewClient.enterFullscreen();
|
| + }
|
| + } else {
|
| + if (isVideo) {
|
| + ContentVideoView videoView = ContentVideoView.getContentVideoView();
|
| + if (videoView != null) videoView.exitFullscreen(false);
|
| + } else {
|
| + mContentViewClient.exitFullscreen();
|
| + }
|
| }
|
| +
|
| }
|
|
|
| private static class GetDisplayNameTask extends AsyncTask<Void, Void, String[]> {
|
|
|