Add fullscreen permission controls to settings

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

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentPreferences.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentPreferences.java
index 317138b580c3c429693f97de64e127ecca6001dc..d15c888260cd57d340618d0e6350322fba34443c 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentPreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentPreferences.java
@@ -26,6 +26,7 @@ public class ContentPreferences extends PreferenceFragment
     // The keys for each category shown on the Site Settings page.
     static final String ALL_SITES_KEY = "website_settings";
     static final String COOKIES_KEY = "cookies";
+    static final String FULLSCREEN_KEY = "fullscreen";
     static final String LOCATION_KEY = "device_location";
     static final String CAMERA_AND_MIC_KEY = "use_camera_or_mic";
     static final String JAVASCRIPT_KEY = "javascript";
@@ -52,6 +53,8 @@ public class ContentPreferences extends PreferenceFragment
     private int keyToContentSettingsType(String key) {
         if (COOKIES_KEY.equals(key)) {
             return ContentSettingsType.CONTENT_SETTINGS_TYPE_COOKIES;
+        } else if (FULLSCREEN_KEY.equals(key)) {
+            return ContentSettingsType.CONTENT_SETTINGS_TYPE_FULLSCREEN;
         } else if (LOCATION_KEY.equals(key)) {
             return ContentSettingsType.CONTENT_SETTINGS_TYPE_GEOLOCATION;
         } else if (CAMERA_AND_MIC_KEY.equals(key)) {
@@ -81,6 +84,7 @@ public class ContentPreferences extends PreferenceFragment
         List<String> websitePrefs = new ArrayList<String>();
         websitePrefs.add(LOCATION_KEY);
         if (Build.VERSION.SDK_INT >= 19) {
+            websitePrefs.add(FULLSCREEN_KEY);

[Ted C, 2015/03/12 21:21:35]

why guard this to only api 19+?

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

Immersive fullscreen is only available for api 19+. 
But since the settings can exist for non-immersive mode, moved it outside the if
statement.

             websitePrefs.add(PROTECTED_CONTENT_KEY);
         }
         websitePrefs.add(COOKIES_KEY);
@@ -110,6 +114,8 @@ public class ContentPreferences extends PreferenceFragment
                 checked = PrefServiceBridge.getInstance().isPushNotificationsEnabled();
             } else if (POPUPS_KEY.equals(prefName)) {
                 checked = PrefServiceBridge.getInstance().popupsEnabled();
+            } else if (FULLSCREEN_KEY.equals(prefName)) {
+                checked = PrefServiceBridge.getInstance().isFullscreenAllowed();
             }
             p.setTitle(entry.titleResourceId);
             if (COOKIES_KEY.equals(prefName) && checked