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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java

Issue 986653004: Add fullscreen permission controls to settings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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/preferences/website/Website.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java
index 255081a11ae78f30803867a0a2afa7c738ddbcff..b212acb7b5d583907969541919b8252b818e25e3 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java
@@ -212,6 +212,14 @@ public class Website implements Serializable {
entry.defaultEnabledValue = ContentSetting.ASK;
entry.defaultDisabledValue = ContentSetting.BLOCK;
return entry;
+ case ContentSettingsType.CONTENT_SETTINGS_TYPE_FULLSCREEN:
+ entry = new PermissionDataEntry();
+ entry.iconResourceId = R.drawable.permission_fullscreen;
+ entry.titleResourceId = R.string.website_settings_fullscreen;
+ entry.explanationResourceId = R.string.fullscreen_permission_title;
+ entry.defaultEnabledValue = ContentSetting.ALLOW;
+ entry.defaultDisabledValue = ContentSetting.ASK;
+ return entry;
default:
return null;
}
@@ -232,6 +240,7 @@ public class Website implements Serializable {
private LocalStorageInfo mLocalStorageInfo;
private final List<StorageInfo> mStorageInfo = new ArrayList<StorageInfo>();
private int mStorageInfoCallbacksLeft;
+ private FullscreenInfo mFullscreenInfo;
public Website(WebsiteAddress address) {
mAddress = address;
@@ -603,4 +612,42 @@ public class Website implements Serializable {
}
return usage;
}
+
+ /**
+ * Set fullscreen permission information class.
+ *
+ * @param info Fullscreen information about the website.
+ */
+ public void setFullscreenInfo(FullscreenInfo info) {
+ mFullscreenInfo = info;
+ WebsiteAddress embedder = WebsiteAddress.create(info.getEmbedder());
+ if (embedder != null) {
+ mSummary = embedder.getTitle();
+ }
+ }
+
+ /**
+ * @return fullscreen information of the site.
+ */
+ public FullscreenInfo getFullscreenInfo() {
+ return mFullscreenInfo;
+ }
+
+ /**
+ * @return what permission governs fullscreen access.
+ */
+ public ContentSetting getFullscreenPermission() {
+ return mFullscreenInfo != null ? mFullscreenInfo.getContentSetting() : null;
+ }
+
+ /**
+ * Configure fullscreen setting for this site.
+ *
+ * @param value Content setting for fullscreen permission.
+ */
+ public void setFullscreenPermission(ContentSetting value) {
+ if (mFullscreenInfo != null) {
+ mFullscreenInfo.setContentSetting(value);
+ }
+ }
}

Powered by Google App Engine
This is Rietveld 408576698