| Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsCategory.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsCategory.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsCategory.java
|
| index bc1f30baf5100b3b7baa3704115cf7cd1099e0d3..529727c473abdeab4599a685437d5242fcc21d2c 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsCategory.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsCategory.java
|
| @@ -39,7 +39,6 @@ public class SiteSettingsCategory {
|
| public static final String CATEGORY_CAMERA = "camera";
|
| public static final String CATEGORY_COOKIES = "cookies";
|
| public static final String CATEGORY_DEVICE_LOCATION = "device_location";
|
| - public static final String CATEGORY_FULLSCREEN = "fullscreen";
|
| public static final String CATEGORY_JAVASCRIPT = "javascript";
|
| public static final String CATEGORY_MICROPHONE = "microphone";
|
| public static final String CATEGORY_NOTIFICATIONS = "notifications";
|
| @@ -108,10 +107,6 @@ public class SiteSettingsCategory {
|
| if (CATEGORY_DEVICE_LOCATION.equals(category)) {
|
| return new LocationCategory();
|
| }
|
| - if (CATEGORY_FULLSCREEN.equals(category)) {
|
| - return new SiteSettingsCategory(CATEGORY_FULLSCREEN, "",
|
| - ContentSettingsType.CONTENT_SETTINGS_TYPE_FULLSCREEN);
|
| - }
|
| if (CATEGORY_MICROPHONE.equals(category)) {
|
| return new SiteSettingsCategory(
|
| SiteSettingsCategory.CATEGORY_MICROPHONE,
|
| @@ -165,9 +160,6 @@ public class SiteSettingsCategory {
|
| if (contentSettingsType == ContentSettingsType.CONTENT_SETTINGS_TYPE_GEOLOCATION) {
|
| return fromString(CATEGORY_DEVICE_LOCATION);
|
| }
|
| - if (contentSettingsType == ContentSettingsType.CONTENT_SETTINGS_TYPE_FULLSCREEN) {
|
| - return fromString(CATEGORY_FULLSCREEN);
|
| - }
|
| if (contentSettingsType == ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC) {
|
| return fromString(CATEGORY_MICROPHONE);
|
| }
|
| @@ -232,13 +224,6 @@ public class SiteSettingsCategory {
|
| }
|
|
|
| /**
|
| - * Returns whether this category is the Fullscreen category.
|
| - */
|
| - public boolean showFullscreenSites() {
|
| - return mContentSettingsType == ContentSettingsType.CONTENT_SETTINGS_TYPE_FULLSCREEN;
|
| - }
|
| -
|
| - /**
|
| * Returns whether this category is the Geolocation category.
|
| */
|
| public boolean showGeolocationSites() {
|
| @@ -305,7 +290,6 @@ public class SiteSettingsCategory {
|
| if (showBackgroundSyncSites()) return prefs.isBackgroundSyncManaged();
|
| if (showCameraSites()) return !prefs.isCameraUserModifiable();
|
| if (showCookiesSites()) return prefs.isAcceptCookiesManaged();
|
| - if (showFullscreenSites()) return prefs.isFullscreenManaged();
|
| if (showGeolocationSites()) {
|
| return !prefs.isAllowLocationUserModifiable();
|
| }
|
|
|