Add fullscreen permission controls to settings

chrome/browser/android/preferences/website_preference_bridge.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/preferences/website_preference_bridge.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/bind.h"
@@ skipping 93 matching lines @@
             env, list, jorigin.obj(), jembedder.obj());
         break;
       case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:
         Java_WebsitePreferenceBridge_insertProtectedMediaIdentifierInfoIntoList(
             env, list, jorigin.obj(), jembedder.obj());
         break;
       case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
         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;
     }
   }
 }
 
 static jint GetSettingForOrigin(JNIEnv* env,
                                 ContentSettingsType content_type,
                                 jstring origin,
@@ skipping 14 matching lines @@
                                 ContentSettingsPattern secondary_pattern,
                                 jint value) {
   GURL url(ConvertJavaStringToUTF8(env, origin));
   ContentSetting setting = CONTENT_SETTING_DEFAULT;
   switch (value) {
     case -1: break;
     case 0: setting = CONTENT_SETTING_DEFAULT; break;
     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(
       ContentSettingsPattern::FromURLNoWildcard(url),
       secondary_pattern,
       content_type,
       std::string(),
       setting);
   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,
                                   jboolean managedOnly) {
   GetOrigins(env, CONTENT_SETTINGS_TYPE_GEOLOCATION, list, managedOnly);
 }
 
 static jint GetGeolocationSettingForOrigin(JNIEnv* env, jclass clazz,
     jstring origin, jstring embedder) {
   return GetSettingForOrigin(env, CONTENT_SETTINGS_TYPE_GEOLOCATION,
@@ skipping 493 matching lines @@
   GURL url(ConvertJavaStringToUTF8(env, jorigin));
   scoped_refptr<SiteDataDeleteHelper> site_data_deleter(
       new SiteDataDeleteHelper(profile, url));
   site_data_deleter->Run();
 }
 
 // Register native methods
 bool RegisterWebsitePreferenceBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }