Add fullscreen permission controls to settings

chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java
index 5a11bae983aa0ab564f72cc3b07ac83448a38125..88b8fca62bae6de0cc924d7dc5fe8f483f819722 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java
@@ -53,6 +53,7 @@ public class SingleWebsitePreferences extends PreferenceFragment
     // Website permissions (if adding new, see hasPermissionsPreferences and resetSite below):
     public static final String PREF_COOKIES_PERMISSION = "cookies_permission_list";
     public static final String PREF_JAVASCRIPT_PERMISSION = "javascript_permission_list";
+    public static final String PREF_FULLSCREEN_PERMISSION = "fullscreen_permission_list";

[Finnur, 2015/03/13 10:42:13]

This list (Website permissions) is in alphabetical order, so please move this up
one line. 

[qinmin, 2015/03/17 23:49:30]

Done.

     public static final String PREF_LOCATION_ACCESS = "location_access_list";
     public static final String PREF_MIDI_SYSEX_PERMISSION = "midi_sysex_permission_list";
     public static final String PREF_POPUP_PERMISSION = "popup_permission_list";
@@ -152,6 +153,10 @@ public class SingleWebsitePreferences extends PreferenceFragment
                         && permissionInfoIsForTopLevelOrigin(other.getCookieInfo(), origin)) {
                     merged.setCookieInfo(other.getCookieInfo());
                 }
+                if (merged.getFullscreenInfo() == null && other.getFullscreenInfo() != null
+                        && permissionInfoIsForTopLevelOrigin(other.getFullscreenInfo(), origin)) {
+                    merged.setFullscreenInfo(other.getFullscreenInfo());
+                }
                 if (merged.getGeolocationInfo() == null && other.getGeolocationInfo() != null
                         && permissionInfoIsForTopLevelOrigin(other.getGeolocationInfo(), origin)) {
                     merged.setGeolocationInfo(other.getGeolocationInfo());
@@ -227,6 +232,8 @@ public class SingleWebsitePreferences extends PreferenceFragment
                 preference.setOnPreferenceClickListener(this);
             } else if (PREF_COOKIES_PERMISSION.equals(preference.getKey())) {
                 setUpListPreference(preference, mSite.getCookiePermission());
+            } else if (PREF_FULLSCREEN_PERMISSION.equals(preference.getKey())) {
+                setUpListPreference(preference, mSite.getFullscreenPermission());
             } else if (PREF_JAVASCRIPT_PERMISSION.equals(preference.getKey())) {
                 setUpListPreference(preference, mSite.getJavaScriptPermission());
             } else if (PREF_LOCATION_ACCESS.equals(preference.getKey())) {
@@ -267,6 +274,7 @@ public class SingleWebsitePreferences extends PreferenceFragment
         // category headings can be removed when no permissions are shown.
         PreferenceScreen screen = getPreferenceScreen();
         return screen.findPreference(PREF_COOKIES_PERMISSION) != null
+                || screen.findPreference(PREF_FULLSCREEN_PERMISSION) != null
                 || screen.findPreference(PREF_JAVASCRIPT_PERMISSION) != null
                 || screen.findPreference(PREF_LOCATION_ACCESS) != null
                 || screen.findPreference(PREF_MIDI_SYSEX_PERMISSION) != null
@@ -315,6 +323,9 @@ public class SingleWebsitePreferences extends PreferenceFragment
         if (PREF_COOKIES_PERMISSION.equals(preferenceKey)) {
             return Website.PermissionDataEntry.getPermissionDataEntry(
                     ContentSettingsType.CONTENT_SETTINGS_TYPE_COOKIES);
+        } else if (PREF_FULLSCREEN_PERMISSION.equals(preferenceKey)) {
+            return Website.PermissionDataEntry.getPermissionDataEntry(
+                    ContentSettingsType.CONTENT_SETTINGS_TYPE_FULLSCREEN);
         } else if (PREF_JAVASCRIPT_PERMISSION.equals(preferenceKey)) {
             return Website.PermissionDataEntry.getPermissionDataEntry(
                     ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT);
@@ -450,6 +461,8 @@ public class SingleWebsitePreferences extends PreferenceFragment
                 ContentSetting.fromString((String) newValue);
         if (PREF_COOKIES_PERMISSION.equals(preference.getKey())) {
             mSite.setCookiePermission(permission);
+        } else if (PREF_FULLSCREEN_PERMISSION.equals(preference.getKey())) {
+            mSite.setFullscreenPermission(permission);
         } else if (PREF_JAVASCRIPT_PERMISSION.equals(preference.getKey())) {
             mSite.setJavaScriptPermission(permission);
         } else if (PREF_LOCATION_ACCESS.equals(preference.getKey())) {
@@ -492,6 +505,7 @@ public class SingleWebsitePreferences extends PreferenceFragment
 
     private void resetSite() {
         mSite.setCookiePermission(null);
+        mSite.setFullscreenPermission(null);
         mSite.setGeolocationPermission(null);
         mSite.setJavaScriptPermission(null);
         mSite.setMidiPermission(null);