Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4307)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandler.java

Issue 986653004: Add fullscreen permission controls to settings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressing comments Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 6f16a74d1e3bddcc61b5f7af16c7748e655bcea6..477784607526d254f2503f338241072f2f632037 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
@@ -21,6 +21,8 @@ import android.view.WindowManager;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.Tab;
+import org.chromium.chrome.browser.preferences.website.ContentSetting;
+import org.chromium.chrome.browser.preferences.website.FullscreenInfo;
import org.chromium.chrome.browser.widget.TextBubble;
import org.chromium.content.browser.ContentViewCore;
@@ -48,6 +50,8 @@ public class FullscreenHtmlApiHandler {
private static final int NOTIFICATION_BUBBLE_ALPHA = 252; // 255 * 0.99
+ private static final String TAG = "FullscreenHtmlApiHandler";
+
private static boolean sFullscreenNotificationShown;
private final Window mWindow;
@@ -66,6 +70,7 @@ public class FullscreenHtmlApiHandler {
private TextBubble mNotificationBubble;
private OnLayoutChangeListener mFullscreenOnLayoutChangeListener;
+ private FullscreenInfoBarDelegate mFullscreenInfoBarDelegate;
/**
* Delegate that allows embedders to react to fullscreen API requests.
@@ -273,6 +278,10 @@ public class FullscreenHtmlApiHandler {
};
contentView.addOnLayoutChangeListener(mFullscreenOnLayoutChangeListener);
contentViewCore.getWebContents().exitFullscreen();
+ if (mFullscreenInfoBarDelegate != null) {
+ mFullscreenInfoBarDelegate.closeFullscreenInfoBar();
+ mFullscreenInfoBarDelegate = null;
+ }
}
/**
@@ -325,6 +334,11 @@ public class FullscreenHtmlApiHandler {
contentView.setSystemUiVisibility(systemUiVisibility);
mContentViewCoreInFullscreen = contentViewCore;
mTabInFullscreen = tab;
+ FullscreenInfo fullscreenInfo = new FullscreenInfo(tab.getUrl(), null);
+ ContentSetting fullscreenPermission = fullscreenInfo.getContentSetting();
+ if (fullscreenPermission != ContentSetting.ALLOW) {
+ mFullscreenInfoBarDelegate = FullscreenInfoBarDelegate.create(this, tab);
+ }
}
/**

Powered by Google App Engine
This is Rietveld 408576698