| Index: chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java
|
| diff --git a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java
|
| index 62bbbadaaba1bd80d3d799d7de78ff754f5b45b5..48627d2a34d793e954c8a15b96aba8ce87aff631 100644
|
| --- a/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java
|
| +++ b/chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java
|
| @@ -37,7 +37,6 @@ import org.chromium.content.browser.ActivityContentVideoViewClient;
|
| import org.chromium.content.browser.BrowserStartupController;
|
| import org.chromium.content.browser.ContentViewCore;
|
| import org.chromium.content.browser.DeviceUtils;
|
| -import org.chromium.content.common.ContentSwitches;
|
| import org.chromium.printing.PrintManagerDelegateImpl;
|
| import org.chromium.printing.PrintingController;
|
| import org.chromium.sync.signin.AccountManagerHelper;
|
| @@ -141,18 +140,14 @@ public class ChromeShellActivity extends Activity implements AppMenuPropertiesDe
|
| public boolean onShowCustomView(View view) {
|
| if (mTabManager == null) return false;
|
| boolean success = super.onShowCustomView(view);
|
| - if (!CommandLine.getInstance().hasSwitch(
|
| - ContentSwitches.DISABLE_OVERLAY_FULLSCREEN_VIDEO_SUBTITLE)) {
|
| - mTabManager.setOverlayVideoMode(true);
|
| - }
|
| + mTabManager.setOverlayVideoMode(true);
|
| return success;
|
| }
|
|
|
| @Override
|
| public void onDestroyContentVideoView() {
|
| super.onDestroyContentVideoView();
|
| - if (mTabManager != null && !CommandLine.getInstance().hasSwitch(
|
| - ContentSwitches.DISABLE_OVERLAY_FULLSCREEN_VIDEO_SUBTITLE)) {
|
| + if (mTabManager != null) {
|
| mTabManager.setOverlayVideoMode(false);
|
| }
|
| }
|
|
|