Deleted CONTENT_SETTINGS_TYPE_FULLSCREEN and MOUSELOCK.

chrome/browser/ui/website_settings/website_settings.cc

Index: chrome/browser/ui/website_settings/website_settings.cc
diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc
index 2e6df2ff648b8ffca58c62ce228a813f1916572f..4ff29d5274eed147ffc4119a069dd1346e3fd9f0 100644
--- a/chrome/browser/ui/website_settings/website_settings.cc
+++ b/chrome/browser/ui/website_settings/website_settings.cc
@@ -110,10 +110,6 @@ ContentSettingsType kPermissionType[] = {
     CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC,
     CONTENT_SETTINGS_TYPE_KEYGEN,
     CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS,
-#if !defined(OS_ANDROID)
-    CONTENT_SETTINGS_TYPE_MOUSELOCK,
-#endif
-    CONTENT_SETTINGS_TYPE_FULLSCREEN,
     CONTENT_SETTINGS_TYPE_AUTOPLAY,
     CONTENT_SETTINGS_TYPE_MIDI_SYSEX,
 };
@@ -121,17 +117,10 @@ ContentSettingsType kPermissionType[] = {
 // Determines whether to show permission |type| in the Website Settings UI. Only
 // applies to permissions listed in |kPermissionType|.
 bool ShouldShowPermission(ContentSettingsType type) {
-  // TODO(mgiuca): When simplified-fullscreen-ui is enabled permanently on
-  // Android, remove these from kPermissionType, rather than having this check
-  // (http://crbug.com/577396).
 #if !defined(OS_ANDROID)
-  // Fullscreen and mouselock settings are no longer shown (always allow).
   // Autoplay is Android-only at the moment.
-  if (type == CONTENT_SETTINGS_TYPE_AUTOPLAY ||
-      type == CONTENT_SETTINGS_TYPE_FULLSCREEN ||
-      type == CONTENT_SETTINGS_TYPE_MOUSELOCK) {
+  if (type == CONTENT_SETTINGS_TYPE_AUTOPLAY)
     return false;
-  }
 #endif
 
   return true;