Index: chrome/android/java/src/org/chromium/chrome/browser/tab/TabWebContentsDelegateAndroid.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabWebContentsDelegateAndroid.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabWebContentsDelegateAndroid.java |
index 5d8debb9437b3e7b6e84e73365fd24c893813a16..a08d87ab9c4fd6b0c8c3b39a8a2c2a2a827245c7 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabWebContentsDelegateAndroid.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabWebContentsDelegateAndroid.java |
@@ -24,6 +24,8 @@ import org.chromium.base.annotations.CalledByNative; |
import org.chromium.blink_public.platform.WebDisplayMode; |
import org.chromium.chrome.R; |
import org.chromium.chrome.browser.AppHooks; |
+import org.chromium.chrome.browser.ChromeFeatureList; |
+import org.chromium.chrome.browser.FullscreenWebContentsActivity; |
import org.chromium.chrome.browser.RepostFormWarningDialog; |
import org.chromium.chrome.browser.document.DocumentUtils; |
import org.chromium.chrome.browser.document.DocumentWebContentsDelegate; |
@@ -215,8 +217,14 @@ public class TabWebContentsDelegateAndroid extends WebContentsDelegateAndroid { |
@Override |
public void toggleFullscreenModeForTab(boolean enableFullscreen) { |
- if (!VideoPersister.getInstance().shouldDelayFullscreenModeChange(mTab, enableFullscreen)) { |
- mTab.toggleFullscreenMode(enableFullscreen); |
+ if (ChromeFeatureList.isEnabled(ChromeFeatureList.FULLSCREEN_ACTIVITY) |
+ && mTab.getActivity().supportsFullscreenActivity()) { |
+ FullscreenWebContentsActivity.toggleFullscreenMode(enableFullscreen, mTab); |
+ } else { |
+ if (!VideoPersister.getInstance().shouldDelayFullscreenModeChange( |
+ mTab, enableFullscreen)) { |
+ mTab.toggleFullscreenMode(enableFullscreen); |
+ } |
} |
} |