Merge pull request #583 from janekptacijarabaci/_testBranch_pageInfo_permissions_indexedDB

Remove the UI for indexedDB in Page Info and Permissions Manager

2 files changed, 6 insertions, 51 deletions

diff --git a/application/palemoon/components/permissions/aboutPermissions.js b/application/palemoon/components/permissions/aboutPermissions.js
index 3e40260d1..750dbaac3 100644
--- a/application/palemoon/components/permissions/aboutPermissions.js
+++ b/application/palemoon/components/permissions/aboutPermissions.js
@@ -130,7 +130,7 @@ Site.prototype = {
    *
    * @param aType
    *        The permission type string stored in permission manager.
-   *        e.g. "cookie", "geo", "indexedDB", "popup", "image"
+   *        e.g. "cookie", "geo", "popup", "image"
    * @param aResultObj
    *        An object that stores the permission value set for aType.
    *
@@ -169,7 +169,7 @@ Site.prototype = {
    *
    * @param aType
    *        The permission type string stored in permission manager.
-   *        e.g. "cookie", "geo", "indexedDB", "popup", "image"
+   *        e.g. "cookie", "geo", "popup", "image"
    * @param aPerm
    *        The permission value to set for the permission type. This should
    *        be one of the constants defined in nsIPermissionManager.
@@ -196,7 +196,7 @@ Site.prototype = {
    *
    * @param aType
    *        The permission type string stored in permission manager.
-   *        e.g. "cookie", "geo", "indexedDB", "popup", "image"
+   *        e.g. "cookie", "geo", "popup", "image"
    */
   clearPermission: function(aType) {
     Services.perms.removeFromPrincipal(this.principal, aType);
@@ -405,20 +405,6 @@ var PermissionDefaults = {
     let value = (aValue != this.DENY);
     Services.prefs.setBoolPref("geo.enabled", value);
   },
-
-  get indexedDB() {
-    if (!Services.prefs.getBoolPref("dom.indexedDB.enabled")) {
-      return this.DENY;
-    }
-    // We always ask for permission to enable indexedDB storage for a specific
-    // site, so there is no global ALLOW.
-    return this.UNKNOWN;
-  },
-  set indexedDB(aValue) {
-    let value = (aValue != this.DENY);
-    Services.prefs.setBoolPref("dom.indexedDB.enabled", value);
-  },
-
 }
 
 /**
@@ -465,12 +451,12 @@ var AboutPermissions = {
    * Potential future additions: "sts/use", "sts/subd"
    */
   _supportedPermissions: ["password", "image", "popup", "cookie",
-                          "desktop-notification", "install", "geo", "indexedDB"],
+                          "desktop-notification", "install", "geo"],
 
   /**
    * Permissions that don't have a global "Allow" option.
    */
-  _noGlobalAllow: ["desktop-notification", "geo", "indexedDB"],
+  _noGlobalAllow: ["desktop-notification", "geo"],
 
   /**
    * Permissions that don't have a global "Deny" option.
@@ -515,7 +501,6 @@ var AboutPermissions = {
     Services.prefs.addObserver("dom.webnotifications.enabled", this, false);
     Services.prefs.addObserver("xpinstall.whitelist.required", this, false);
     Services.prefs.addObserver("geo.enabled", this, false);
-    Services.prefs.addObserver("dom.indexedDB.enabled", this, false);
     Services.prefs.addObserver("plugins.click_to_play", this, false);
     Services.prefs.addObserver("permissions.places-sites-limit", this, false);
 
@@ -665,7 +650,6 @@ var AboutPermissions = {
       Services.prefs.removeObserver("dom.webnotifications.enabled", this, false);
       Services.prefs.removeObserver("xpinstall.whitelist.required", this, false);
       Services.prefs.removeObserver("geo.enabled", this, false);
-      Services.prefs.removeObserver("dom.indexedDB.enabled", this, false);
       Services.prefs.removeObserver("plugins.click_to_play", this, false);
       Services.prefs.removeObserver("permissions.places-sites-limit", this, false);
 
@@ -1030,7 +1014,7 @@ var AboutPermissions = {
    *
    * @param aType
    *        The permission type string stored in permission manager.
-   *        e.g. "cookie", "geo", "indexedDB", "popup", "image"
+   *        e.g. "cookie", "geo", "popup", "image"
    */
   updatePermission: function(aType) {
     let allowItem = document.getElementById(
diff --git a/application/palemoon/components/permissions/aboutPermissions.xul b/application/palemoon/components/permissions/aboutPermissions.xul
index 23c1dd861..afd98247b 100644
--- a/application/palemoon/components/permissions/aboutPermissions.xul
+++ b/application/palemoon/components/permissions/aboutPermissions.xul
@@ -298,35 +298,6 @@
         </vbox>
       </hbox>
 
-      <!-- IndexedDB Storage -->  
-      <hbox id="indexedDB-pref-item"
-            class="pref-item" align="top">
-        <image class="pref-icon" type="indexedDB"/>
-        <vbox>
-          <hbox>
-            <label class="pref-title" value="&indexedDB.label;"/>
-            <label id="indexedDB-default" class="pref-default" value="*"/>
-          </hbox>
-          <hbox>
-            <menulist id="indexedDB-menulist"
-                      class="pref-menulist"
-                      type="indexedDB"
-                      oncommand="AboutPermissions.onPermissionCommand(event, false);">
-              <menupopup>
-                <menuitem id="indexedDB-0" value="0" label="&permission.alwaysAsk;"/>
-                <menuitem id="indexedDB-1" value="1" label="&permission.allow;"/>
-                <menuitem id="indexedDB-2" value="2" label="&permission.block;"/>
-              </menupopup>
-            </menulist>
-            <button id="indexedDB-set-default"
-                    class="pref-set-default"
-                    label="&permission.default;"
-                    type="indexedDB"
-                    oncommand="AboutPermissions.onPermissionCommand(event, true);"/>
-          </hbox>
-        </vbox>
-      </hbox>
-
       <!-- Opt-in activation of Plug-ins -->
       <hbox id="plugins-pref-item"
             class="pref-item" align="top">