[PALEMOON] Remove fullscreen and pointer-lock from permission managing

2 files changed, 0 insertions, 43 deletions

diff --git a/application/palemoon/base/content/pageinfo/pageInfo.xul b/application/palemoon/base/content/pageinfo/pageInfo.xul
index 5bca1b495..943fa805c 100644
--- a/application/palemoon/base/content/pageinfo/pageInfo.xul
+++ b/application/palemoon/base/content/pageinfo/pageInfo.xul
@@ -52,7 +52,6 @@
     <command id="cmd_cookieDef"     oncommand="onCheckboxClick('cookie');"/>
     <command id="cmd_desktop-notificationDef" oncommand="onCheckboxClick('desktop-notification');"/>
     <command id="cmd_installDef"    oncommand="onCheckboxClick('install');"/>
-    <command id="cmd_fullscreenDef" oncommand="onCheckboxClick('fullscreen');"/>
     <command id="cmd_geoDef"        oncommand="onCheckboxClick('geo');"/>
     <command id="cmd_indexedDBDef"  oncommand="onCheckboxClick('indexedDB');"/>
     <command id="cmd_pluginsDef"    oncommand="onCheckboxClick('plugins');"/>
@@ -61,12 +60,9 @@
     <command id="cmd_cookieToggle"  oncommand="onRadioClick('cookie');"/>
     <command id="cmd_desktop-notificationToggle" oncommand="onRadioClick('desktop-notification');"/>
     <command id="cmd_installToggle" oncommand="onRadioClick('install');"/>
-    <command id="cmd_fullscreenToggle" oncommand="onRadioClick('fullscreen');"/>
     <command id="cmd_geoToggle"     oncommand="onRadioClick('geo');"/>
     <command id="cmd_indexedDBToggle" oncommand="onRadioClick('indexedDB');"/>
     <command id="cmd_pluginsToggle" oncommand="onPluginRadioClick(event);"/>
-    <command id="cmd_pointerLockDef"    oncommand="onCheckboxClick('pointerLock');"/>
-    <command id="cmd_pointerLockToggle" oncommand="onRadioClick('pointerLock');"/>
   </commandset>
 
   <keyset id="pageInfoKeySet">
@@ -405,31 +401,6 @@
             </radiogroup>
           </hbox>
         </vbox>
-        <vbox class="permission" id="permFullscreenRow">
-          <label class="permissionLabel" id="permFullscreenLabel"
-                 value="&permFullscreen;" control="fullscreenRadioGroup"/>
-          <hbox id="permFullscreenBox" role="group" aria-labelledby="permFullscreenLabel">
-            <checkbox id="fullscreenDef" command="cmd_fullscreenDef" label="&permUseDefault;"/>
-            <spacer flex="1"/>
-            <radiogroup id="fullscreenRadioGroup" orient="horizontal">
-              <radio id="fullscreen#0" command="cmd_fullscreenToggle" label="&permAskAlways;"/>
-              <radio id="fullscreen#1" command="cmd_fullscreenToggle" label="&permAllow;"/>
-              <radio id="fullscreen#2" command="cmd_fullscreenToggle" label="&permBlock;"/>
-            </radiogroup>
-          </hbox>
-        </vbox>
-        <vbox class="permission" id="permPointerLockRow" >
-          <label class="permissionLabel" id="permPointerLockLabel"
-                 value="&permPointerLock2;" control="pointerLockRadioGroup"/>
-          <hbox id="permPointerLockBox" role="group" aria-labelledby="permPointerLockLabel">
-            <checkbox id="pointerLockDef" command="cmd_pointerLockDef" label="&permAskAlways;"/>
-            <spacer flex="1"/>
-            <radiogroup id="pointerLockRadioGroup" orient="horizontal">
-              <radio id="pointerLock#1" command="cmd_pointerLockToggle" label="&permAllow;"/>
-              <radio id="pointerLock#2" command="cmd_pointerLockToggle" label="&permBlock;"/>
-            </radiogroup>
-          </hbox>
-        </vbox>
       </vbox>
     </vbox>
 
diff --git a/application/palemoon/base/content/pageinfo/permissions.js b/application/palemoon/base/content/pageinfo/permissions.js
index 68261ce6e..e0fb01f76 100644
--- a/application/palemoon/base/content/pageinfo/permissions.js
+++ b/application/palemoon/base/content/pageinfo/permissions.js
@@ -76,20 +76,6 @@ var gPermObj = {
   {
     return UNKNOWN;
   },
-  fullscreen: function getFullscreenDefaultPermissions()
-  {
-    if (!gPrefs.getBoolPref("full-screen-api.enabled")) {
-      return DENY;
-    }
-    return UNKNOWN;  
-  },
-  pointerLock: function getPointerLockPermissions()
-  {
-    if (!gPrefs.getBoolPref("full-screen-api.pointer-lock.enabled")) {
-      return DENY;
-    }
-    return ALLOW;
-  },
 };
 
 var permissionObserver = {