NOT FOR REVIEW: Modify ToggleFullscreenMode.

android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java

 // Copyright 2013 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.
 
 package org.chromium.android_webview;
 
 import android.content.ContentResolver;
 import android.content.Context;
 import android.net.Uri;
 import android.os.AsyncTask;
@@ skipping 13 matching lines @@
 
 /**
  * Adapts the AwWebContentsDelegate interface to the AwContentsClient interface.
  * This class also serves a secondary function of routing certain callbacks from the content layer
  * to specific listener interfaces.
  */
 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;
     }
 
     public void setContainerView(View containerView) {
         mContainerView = containerView;
     }
 
     @Override
     public void onLoadProgressChanged(int progress) {
@@ skipping 156 matching lines @@
     public boolean addNewContents(boolean isDialog, boolean isUserGesture) {
         return mContentsClient.onCreateWindow(isDialog, isUserGesture);
     }
 
     @Override
     public void activateContents() {
         mContentsClient.onRequestFocus();
     }
 
     @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[]> {
         final int mProcessId;
         final int mRenderId;
         final int mModeFlags;
         final String[] mFilePaths;
         final ContentResolver mContentResolver;
 
         public GetDisplayNameTask(ContentResolver contentResolver, int processId, int renderId,
@@ skipping 24 matching lines @@
          * or an empty string otherwise.
          */
         private String resolveFileName(String filePath) {
             if (mContentResolver == null || filePath == null) return "";
             Uri uri = Uri.parse(filePath);
             return ContentUriUtils.getDisplayName(
                     uri, mContentResolver, MediaStore.MediaColumns.DISPLAY_NAME);
         }
     }
 }