Add fullscreen permission controls to settings

chrome/browser/android/preferences/website_preference_bridge.cc

Index: chrome/browser/android/preferences/website_preference_bridge.cc
diff --git a/chrome/browser/android/preferences/website_preference_bridge.cc b/chrome/browser/android/preferences/website_preference_bridge.cc
index f5429b1581ad863d1a0e0c5ab35cf72e94b59d56..f3d2252e243aefafda7f9815760019df94b11dd9 100644
--- a/chrome/browser/android/preferences/website_preference_bridge.cc
+++ b/chrome/browser/android/preferences/website_preference_bridge.cc
@@ -111,6 +111,9 @@ static void GetOrigins(JNIEnv* env,
         Java_WebsitePreferenceBridge_insertPushNotificationIntoList(
             env, list, jorigin.obj(), jembedder.obj());
         break;
+      case CONTENT_SETTINGS_TYPE_FULLSCREEN:
+        Java_WebsitePreferenceBridge_insertFullscreenInfoIntoList(
+            env, list, jorigin.obj(), jembedder.obj());

[Finnur, 2015/03/30 13:42:23]

This is missing a break statement which results in a DCHECK on line 118. Working
on a fix (that also fixes the positioning of the menu item under Site Settings).

       default:
         DCHECK(false);
         break;
@@ -145,6 +148,7 @@ static void SetSettingForOrigin(JNIEnv* env,
     case 1: setting = CONTENT_SETTING_ALLOW; break;
     case 2: setting = CONTENT_SETTING_BLOCK; break;
     default:
+      // Note: CONTENT_SETTINGS_ASK is not and should not be supported.
       NOTREACHED();
   }
   GetHostContentSettingsMap()->SetContentSetting(
@@ -156,6 +160,26 @@ static void SetSettingForOrigin(JNIEnv* env,
   WebSiteSettingsUmaUtil::LogPermissionChange(content_type, setting);
 }
 
+static void GetFullscreenOrigins(JNIEnv* env,
+                                 jclass clazz,
+                                 jobject list,
+                                 jboolean managedOnly) {
+  GetOrigins(env, CONTENT_SETTINGS_TYPE_FULLSCREEN, list, managedOnly);
+}
+
+static jint GetFullscreenSettingForOrigin(JNIEnv* env, jclass clazz,
+    jstring origin, jstring embedder) {
+  return GetSettingForOrigin(env, CONTENT_SETTINGS_TYPE_FULLSCREEN,
+                             origin, embedder);
+}
+
+static void SetFullscreenSettingForOrigin(JNIEnv* env, jclass clazz,
+    jstring origin, jstring embedder, jint value) {
+  GURL embedder_url(ConvertJavaStringToUTF8(env, embedder));
+  SetSettingForOrigin(env, CONTENT_SETTINGS_TYPE_FULLSCREEN,
+      origin, ContentSettingsPattern::FromURLNoWildcard(embedder_url), value);
+}
+
 static void GetGeolocationOrigins(JNIEnv* env,
                                   jclass clazz,
                                   jobject list,