diff --git a/application/basilisk/base/content/browser.xul b/application/basilisk/base/content/browser.xul
index a11b525a3a..776a825130 100644
--- a/application/basilisk/base/content/browser.xul
+++ b/application/basilisk/base/content/browser.xul
@@ -646,8 +646,6 @@
tooltiptext="&urlbar.webNotificationsBlocked.tooltip;"/>
-
-
diff --git a/application/basilisk/base/content/pageinfo/permissions.js b/application/basilisk/base/content/pageinfo/permissions.js
index 0e6b9cba12..1e73b6d657 100644
--- a/application/basilisk/base/content/pageinfo/permissions.js
+++ b/application/basilisk/base/content/pageinfo/permissions.js
@@ -5,8 +5,6 @@
Components.utils.import("resource:///modules/SitePermissions.jsm");
Components.utils.import("resource://gre/modules/BrowserUtils.jsm");
-const nsIQuotaManagerService = Components.interfaces.nsIQuotaManagerService;
-
var gPermURI;
var gPermPrincipal;
var gUsageRequest;
@@ -90,10 +88,6 @@ function initRow(aPartId)
perm = SitePermissions.getDefault(aPartId);
}
setRadioState(aPartId, perm);
-
- if (aPartId == "indexedDB") {
- initIndexedDBRow();
- }
}
function createRow(aPartId) {
@@ -188,66 +182,6 @@ function setRadioState(aPartId, aValue)
}
}
-function initIndexedDBRow()
-{
- let row = document.getElementById("perm-indexedDB-row");
- let extras = document.getElementById("perm-indexedDB-extras");
-
- row.appendChild(extras);
-
- var quotaManagerService =
- Components.classes["@mozilla.org/dom/quota-manager-service;1"]
- .getService(nsIQuotaManagerService);
- gUsageRequest =
- quotaManagerService.getUsageForPrincipal(gPermPrincipal,
- onIndexedDBUsageCallback);
-
- var status = document.getElementById("indexedDBStatus");
- var button = document.getElementById("indexedDBClear");
-
- status.value = "";
- status.setAttribute("hidden", "true");
- button.setAttribute("hidden", "true");
-}
-
-function onIndexedDBClear()
-{
- Components.classes["@mozilla.org/dom/quota-manager-service;1"]
- .getService(nsIQuotaManagerService)
- .clearStoragesForPrincipal(gPermPrincipal);
-
- Components.classes["@mozilla.org/serviceworkers/manager;1"]
- .getService(Components.interfaces.nsIServiceWorkerManager)
- .removeAndPropagate(gPermURI.host);
-
- SitePermissions.remove(gPermURI, "indexedDB");
- initIndexedDBRow();
-}
-
-function onIndexedDBUsageCallback(request)
-{
- let uri = request.principal.URI;
- if (!uri.equals(gPermURI)) {
- throw new Error("Callback received for bad URI: " + uri);
- }
-
- let usage = request.result.usage;
- if (usage) {
- if (!("DownloadUtils" in window)) {
- Components.utils.import("resource://gre/modules/DownloadUtils.jsm");
- }
-
- var status = document.getElementById("indexedDBStatus");
- var button = document.getElementById("indexedDBClear");
-
- status.value =
- gBundle.getFormattedString("indexedDBUsage",
- DownloadUtils.convertByteUnits(usage));
- status.removeAttribute("hidden");
- button.removeAttribute("hidden");
- }
-}
-
function fillInPluginPermissionTemplate(aPluginName, aPermissionString) {
let permPluginTemplate = document.getElementById("permPluginTemplate").cloneNode(true);
permPluginTemplate.setAttribute("permString", aPermissionString);
diff --git a/application/basilisk/locales/en-US/chrome/browser/browser.dtd b/application/basilisk/locales/en-US/chrome/browser/browser.dtd
index 0b2e41612f..f75aa46a70 100644
--- a/application/basilisk/locales/en-US/chrome/browser/browser.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/browser.dtd
@@ -215,7 +215,6 @@ These should match what Safari and other Apple applications use on OS X Lion. --
-
diff --git a/application/basilisk/locales/en-US/chrome/browser/pageInfo.dtd b/application/basilisk/locales/en-US/chrome/browser/pageInfo.dtd
index 1e861c59c6..1a4efbf15b 100644
--- a/application/basilisk/locales/en-US/chrome/browser/pageInfo.dtd
+++ b/application/basilisk/locales/en-US/chrome/browser/pageInfo.dtd
@@ -59,9 +59,6 @@
-
-
-
diff --git a/application/basilisk/locales/en-US/chrome/browser/sitePermissions.properties b/application/basilisk/locales/en-US/chrome/browser/sitePermissions.properties
index 8126995f20..4a95570f61 100644
--- a/application/basilisk/locales/en-US/chrome/browser/sitePermissions.properties
+++ b/application/basilisk/locales/en-US/chrome/browser/sitePermissions.properties
@@ -17,4 +17,3 @@ permission.screen.label = Share the Screen
permission.install.label = Install Add-ons
permission.popup.label = Open Pop-up Windows
permission.geo.label = Access Your Location
-permission.indexedDB.label = Maintain Offline Storage
diff --git a/application/basilisk/modules/SitePermissions.jsm b/application/basilisk/modules/SitePermissions.jsm
index d15ddb21b9..237ad1f8d1 100644
--- a/application/basilisk/modules/SitePermissions.jsm
+++ b/application/basilisk/modules/SitePermissions.jsm
@@ -262,8 +262,6 @@ var gPermissionObject = {
"geo": {
exactHostMatch: true
},
-
- "indexedDB": {}
};
const kPermissionIDs = Object.keys(gPermissionObject);
diff --git a/application/basilisk/themes/shared/notification-icons.inc.css b/application/basilisk/themes/shared/notification-icons.inc.css
index 86dce73a18..f641e72c1a 100644
--- a/application/basilisk/themes/shared/notification-icons.inc.css
+++ b/application/basilisk/themes/shared/notification-icons.inc.css
@@ -87,10 +87,6 @@
list-style-image: url(chrome://browser/skin/notification-icons.svg#indexedDB);
}
-.indexedDB-icon.blocked-permission-icon {
- list-style-image: url(chrome://browser/skin/notification-icons.svg#indexedDB-blocked);
-}
-
.login-icon {
list-style-image: url(chrome://browser/skin/notification-icons.svg#login);
}
diff --git a/application/basilisk/themes/shared/notification-icons.svg b/application/basilisk/themes/shared/notification-icons.svg
index 206157cf20..06bd6f7d25 100644
--- a/application/basilisk/themes/shared/notification-icons.svg
+++ b/application/basilisk/themes/shared/notification-icons.svg
@@ -85,7 +85,6 @@
-
diff --git a/application/palemoon/base/content/pageinfo/pageInfo.xul b/application/palemoon/base/content/pageinfo/pageInfo.xul
index 943fa805ca..e3a61d31ee 100644
--- a/application/palemoon/base/content/pageinfo/pageInfo.xul
+++ b/application/palemoon/base/content/pageinfo/pageInfo.xul
@@ -53,7 +53,6 @@
-
@@ -61,7 +60,6 @@
-
@@ -366,27 +364,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/application/palemoon/base/content/pageinfo/permissions.js b/application/palemoon/base/content/pageinfo/permissions.js
index e0fb01f76c..5d25a800d5 100644
--- a/application/palemoon/base/content/pageinfo/permissions.js
+++ b/application/palemoon/base/content/pageinfo/permissions.js
@@ -12,8 +12,6 @@ const IMAGE_DENY = 2;
const COOKIE_DENY = 2;
const COOKIE_SESSION = 2;
-const nsIQuotaManagerService = Components.interfaces.nsIQuotaManagerService;
-
var gPermURI;
var gPermPrincipal;
var gPrefs;
@@ -65,13 +63,6 @@ var gPermObj = {
}
return ALLOW;
},
- indexedDB: function getIndexedDBDefaultPermissions()
- {
- if (!gPrefs.getBoolPref("dom.indexedDB.enabled")) {
- return DENY;
- }
- return UNKNOWN;
- },
plugins: function getPluginsDefaultPermissions()
{
return UNKNOWN;
@@ -161,10 +152,6 @@ function initRow(aPartId)
perm = gPermObj[aPartId]();
}
setRadioState(aPartId, perm);
-
- if (aPartId == "indexedDB") {
- initIndexedDBRow();
- }
}
function onCheckboxClick(aPartId)
@@ -211,65 +198,6 @@ function setRadioState(aPartId, aValue)
radio.radioGroup.selectedItem = radio;
}
-function initIndexedDBRow()
-{
- let row = document.getElementById("permIndexedDBRow");
- let extras = document.getElementById("permIndexedDBExtras");
-
- row.appendChild(extras);
-
- var quotaManagerService =
- Components.classes["@mozilla.org/dom/quota-manager-service;1"]
- .getService(nsIQuotaManagerService);
-
- gUsageRequest =
- quotaManagerService.getUsageForPrincipal(gPermPrincipal,
- onIndexedDBUsageCallback);
-
- var status = document.getElementById("indexedDBStatus");
- var button = document.getElementById("indexedDBClear");
-
- status.value = "";
- status.setAttribute("hidden", "true");
- button.setAttribute("hidden", "true");
-}
-
-function onIndexedDBClear()
-{
- Components.classes["@mozilla.org/dom/quota-manager-service;1"]
- .getService(nsIQuotaManagerService)
- .clearStoragesForPrincipal(gPermPrincipal);
-
- var permissionManager = Components.classes[PERMISSION_CONTRACTID]
- .getService(nsIPermissionManager);
- permissionManager.remove(gPermURI, "indexedDB");
- initIndexedDBRow();
-}
-
-function onIndexedDBUsageCallback(request)
-{
- let uri = request.principal.URI;
- if (!uri.equals(gPermURI)) {
- throw new Error("Callback received for bad URI: " + uri.spec);
- }
-
- let usage = request.result.usage;
- if (usage) {
- if (!("DownloadUtils" in window)) {
- Components.utils.import("resource://gre/modules/DownloadUtils.jsm");
- }
-
- var status = document.getElementById("indexedDBStatus");
- var button = document.getElementById("indexedDBClear");
-
- status.value =
- gBundle.getFormattedString("indexedDBUsage",
- DownloadUtils.convertByteUnits(usage));
- status.removeAttribute("hidden");
- button.removeAttribute("hidden");
- }
-}
-
// XXX copied this from browser-plugins.js - is there a way to share?
function makeNicePluginName(aName) {
if (aName == "Shockwave Flash")
diff --git a/application/palemoon/components/permissions/aboutPermissions.js b/application/palemoon/components/permissions/aboutPermissions.js
index 3e40260d14..750dbaac3d 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 23c1dd861e..afd98247b1 100644
--- a/application/palemoon/components/permissions/aboutPermissions.xul
+++ b/application/palemoon/components/permissions/aboutPermissions.xul
@@ -298,35 +298,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/application/palemoon/locales/en-US/chrome/browser/pageInfo.dtd b/application/palemoon/locales/en-US/chrome/browser/pageInfo.dtd
index 70c2bbc136..50382a11a0 100644
--- a/application/palemoon/locales/en-US/chrome/browser/pageInfo.dtd
+++ b/application/palemoon/locales/en-US/chrome/browser/pageInfo.dtd
@@ -67,10 +67,6 @@
-
-
-
-
diff --git a/application/palemoon/locales/en-US/chrome/browser/permissions/aboutPermissions.dtd b/application/palemoon/locales/en-US/chrome/browser/permissions/aboutPermissions.dtd
index 14412607af..2030d4f594 100644
--- a/application/palemoon/locales/en-US/chrome/browser/permissions/aboutPermissions.dtd
+++ b/application/palemoon/locales/en-US/chrome/browser/permissions/aboutPermissions.dtd
@@ -45,10 +45,6 @@
-
-
-
diff --git a/application/palemoon/themes/linux/permissions/aboutPermissions.css b/application/palemoon/themes/linux/permissions/aboutPermissions.css
index 2ad833fb29..f4fd3d0baa 100644
--- a/application/palemoon/themes/linux/permissions/aboutPermissions.css
+++ b/application/palemoon/themes/linux/permissions/aboutPermissions.css
@@ -98,9 +98,6 @@
.pref-icon[type="geo"] {
list-style-image: url(chrome://browser/skin/Geolocation-64.png);
}
-.pref-icon[type="indexedDB"] {
- list-style-image: url(chrome://global/skin/icons/question-64.png);
-}
.pref-icon[type="plugins"] {
list-style-image: url(chrome://mozapps/skin/plugins/pluginGeneric.png);
}
diff --git a/application/palemoon/themes/osx/permissions/aboutPermissions.css b/application/palemoon/themes/osx/permissions/aboutPermissions.css
index de636f5c4d..406bb92046 100644
--- a/application/palemoon/themes/osx/permissions/aboutPermissions.css
+++ b/application/palemoon/themes/osx/permissions/aboutPermissions.css
@@ -101,9 +101,6 @@
.pref-icon[type="geo"] {
list-style-image: url(chrome://browser/skin/Geolocation-64.png);
}
-.pref-icon[type="indexedDB"] {
- list-style-image: url(chrome://global/skin/icons/question-64.png);
-}
.pref-icon[type="plugins"] {
list-style-image: url(chrome://mozapps/skin/plugins/pluginGeneric.png);
}
diff --git a/application/palemoon/themes/windows/permissions/aboutPermissions.css b/application/palemoon/themes/windows/permissions/aboutPermissions.css
index c985150dea..fb28ef02a3 100644
--- a/application/palemoon/themes/windows/permissions/aboutPermissions.css
+++ b/application/palemoon/themes/windows/permissions/aboutPermissions.css
@@ -101,9 +101,6 @@
.pref-icon[type="geo"] {
list-style-image: url(chrome://browser/skin/Geolocation-64.png);
}
-.pref-icon[type="indexedDB"] {
- list-style-image: url(chrome://global/skin/icons/question-48.png);
-}
.pref-icon[type="plugins"] {
list-style-image: url(chrome://mozapps/skin/plugins/pluginGeneric-48.png);
}