Index: chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandler.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandler.java |
index 41ea156aba4aea743ea54eed0fbbf335ae96dd79..b016c1cf5091136364099c9df0ff9b6d351b0493 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandler.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandler.java |
@@ -18,9 +18,6 @@ import android.view.Window; |
import android.view.WindowManager; |
import org.chromium.chrome.R; |
-import org.chromium.chrome.browser.ChromeFeatureList; |
-import org.chromium.chrome.browser.preferences.website.ContentSetting; |
-import org.chromium.chrome.browser.preferences.website.FullscreenInfo; |
import org.chromium.chrome.browser.tab.Tab; |
import org.chromium.content.browser.ContentViewCore; |
import org.chromium.ui.widget.Toast; |
@@ -58,7 +55,6 @@ public class FullscreenHtmlApiHandler { |
private Toast mNotificationToast; |
private OnLayoutChangeListener mFullscreenOnLayoutChangeListener; |
- private FullscreenInfoBarDelegate mFullscreenInfoBarDelegate; |
/** |
* Delegate that allows embedders to react to fullscreen API requests. |
@@ -251,11 +247,6 @@ public class FullscreenHtmlApiHandler { |
if (contentViewCore.getWebContents() != null) { |
contentViewCore.getWebContents().exitFullscreen(); |
} |
- |
- if (mFullscreenInfoBarDelegate != null) { |
- mFullscreenInfoBarDelegate.closeFullscreenInfoBar(); |
- mFullscreenInfoBarDelegate = null; |
- } |
} |
/** |
@@ -308,13 +299,6 @@ public class FullscreenHtmlApiHandler { |
contentView.setSystemUiVisibility(systemUiVisibility); |
mContentViewCoreInFullscreen = contentViewCore; |
mTabInFullscreen = tab; |
- FullscreenInfo fullscreenInfo = new FullscreenInfo(tab.getUrl(), null, tab.isIncognito()); |
- ContentSetting fullscreenPermission = fullscreenInfo.getContentSetting(); |
- // In simplified fullscreen mode, do not show the infobar (always allow). The toast will |
- // still be shown. |
- if (fullscreenPermission != ContentSetting.ALLOW && !isSimplifiedFullscreenUIEnabled()) { |
- mFullscreenInfoBarDelegate = FullscreenInfoBarDelegate.create(this, tab); |
- } |
} |
/** |
@@ -382,8 +366,4 @@ public class FullscreenHtmlApiHandler { |
} |
return flags; |
} |
- |
- private static boolean isSimplifiedFullscreenUIEnabled() { |
- return ChromeFeatureList.isEnabled("ViewsSimplifiedFullscreenUI"); |
- } |
} |