--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -137,17 +137,16 @@
@RESPATH@/components/chrome.xpt
@RESPATH@/components/commandhandler.xpt
@RESPATH@/components/commandlines.xpt
@RESPATH@/components/composer.xpt
@RESPATH@/components/content_events.xpt
@RESPATH@/components/content_geckomediaplugins.xpt
@RESPATH@/components/content_html.xpt
@RESPATH@/components/content_xslt.xpt
-@RESPATH@/components/cookie.xpt
@RESPATH@/components/directory.xpt
@RESPATH@/components/diskspacewatcher.xpt
@RESPATH@/components/docshell.xpt
@RESPATH@/components/dom.xpt
@RESPATH@/components/dom_activities.xpt
@RESPATH@/components/dom_audiochannel.xpt
@RESPATH@/components/dom_base.xpt
@RESPATH@/components/dom_file.xpt
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -180,17 +180,16 @@
@RESPATH@/components/composer.xpt
@RESPATH@/components/content_events.xpt
@RESPATH@/components/content_html.xpt
@RESPATH@/components/content_geckomediaplugins.xpt
#ifdef MOZ_WEBRTC
@RESPATH@/components/content_webrtc.xpt
#endif
@RESPATH@/components/content_xslt.xpt
-@RESPATH@/components/cookie.xpt
@RESPATH@/components/directory.xpt
@RESPATH@/components/docshell.xpt
@RESPATH@/components/dom.xpt
@RESPATH@/components/dom_base.xpt
@RESPATH@/components/dom_file.xpt
@RESPATH@/components/dom_system.xpt
@RESPATH@/components/dom_canvas.xpt
@RESPATH@/components/dom_core.xpt
--- a/extensions/cookie/moz.build
+++ b/extensions/cookie/moz.build
@@ -1,27 +1,19 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
TEST_DIRS += ['test']
-XPIDL_SOURCES += [
- 'nsICookieAcceptDialog.idl',
- 'nsICookiePromptService.idl',
-]
-
-XPIDL_MODULE = 'cookie'
-
UNIFIED_SOURCES += [
'nsCookieModule.cpp',
'nsCookiePermission.cpp',
- 'nsCookiePromptService.cpp',
'nsPermission.cpp',
'nsPermissionManager.cpp',
'nsPopupWindowManager.cpp',
]
include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul'
--- a/extensions/cookie/nsCookieModule.cpp
+++ b/extensions/cookie/nsCookieModule.cpp
@@ -4,45 +4,40 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "mozilla/ModuleUtils.h"
#include "nsIServiceManager.h"
#include "nsPermissionManager.h"
#include "nsPopupWindowManager.h"
#include "nsICategoryManager.h"
-#include "nsCookiePromptService.h"
#include "nsCookiePermission.h"
#include "nsXPIDLString.h"
// Define the constructor function for the objects
NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsIPermissionManager,
nsPermissionManager::GetXPCOMSingleton)
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPopupWindowManager, Init)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsCookiePermission)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsCookiePromptService)
NS_DEFINE_NAMED_CID(NS_PERMISSIONMANAGER_CID);
NS_DEFINE_NAMED_CID(NS_POPUPWINDOWMANAGER_CID);
-NS_DEFINE_NAMED_CID(NS_COOKIEPROMPTSERVICE_CID);
NS_DEFINE_NAMED_CID(NS_COOKIEPERMISSION_CID);
static const mozilla::Module::CIDEntry kCookieCIDs[] = {
{ &kNS_PERMISSIONMANAGER_CID, false, nullptr, nsIPermissionManagerConstructor },
{ &kNS_POPUPWINDOWMANAGER_CID, false, nullptr, nsPopupWindowManagerConstructor },
- { &kNS_COOKIEPROMPTSERVICE_CID, false, nullptr, nsCookiePromptServiceConstructor },
{ &kNS_COOKIEPERMISSION_CID, false, nullptr, nsCookiePermissionConstructor },
{ nullptr }
};
static const mozilla::Module::ContractIDEntry kCookieContracts[] = {
{ NS_PERMISSIONMANAGER_CONTRACTID, &kNS_PERMISSIONMANAGER_CID },
{ NS_POPUPWINDOWMANAGER_CONTRACTID, &kNS_POPUPWINDOWMANAGER_CID },
- { NS_COOKIEPROMPTSERVICE_CONTRACTID, &kNS_COOKIEPROMPTSERVICE_CID },
{ NS_COOKIEPERMISSION_CONTRACTID, &kNS_COOKIEPERMISSION_CID },
{ nullptr }
};
static const mozilla::Module kCookieModule = {
mozilla::Module::kVersion,
kCookieCIDs,
kCookieContracts
--- a/extensions/cookie/nsCookiePermission.cpp
+++ b/extensions/cookie/nsCookiePermission.cpp
@@ -4,17 +4,16 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "nsCookiePermission.h"
#include "mozIThirdPartyUtil.h"
#include "nsICookie2.h"
#include "nsIServiceManager.h"
-#include "nsICookiePromptService.h"
#include "nsICookieManager2.h"
#include "nsNetUtil.h"
#include "nsIInterfaceRequestorUtils.h"
#include "nsIProtocolHandler.h"
#include "nsIURI.h"
#include "nsIPrefService.h"
#include "nsIPrefBranch.h"
#include "nsIChannel.h"
deleted file mode 100644
--- a/extensions/cookie/nsCookiePromptService.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-
-#include "nsCookiePromptService.h"
-#include "nsICookie.h"
-#include "nsICookieAcceptDialog.h"
-#include "nsIDOMWindow.h"
-#include "nsPIDOMWindow.h"
-#include "nsIWindowWatcher.h"
-#include "nsIServiceManager.h"
-#include "nsString.h"
-#include "nsIDialogParamBlock.h"
-#include "nsIMutableArray.h"
-#include "mozilla/dom/ScriptSettings.h"
-
-/****************************************************************
- ************************ nsCookiePromptService *****************
- ****************************************************************/
-
-NS_IMPL_ISUPPORTS(nsCookiePromptService, nsICookiePromptService)
-
-nsCookiePromptService::nsCookiePromptService() {
-}
-
-nsCookiePromptService::~nsCookiePromptService() {
-}
-
-NS_IMETHODIMP
-nsCookiePromptService::CookieDialog(mozIDOMWindowProxy *aParent,
- nsICookie *aCookie,
- const nsACString &aHostname,
- int32_t aCookiesFromHost,
- bool aChangingCookie,
- bool *aRememberDecision,
- int32_t *aAccept)
-{
- nsresult rv;
-
- nsCOMPtr<nsIDialogParamBlock> block = do_CreateInstance(NS_DIALOGPARAMBLOCK_CONTRACTID,&rv);
- if (NS_FAILED(rv)) return rv;
-
- block->SetInt(nsICookieAcceptDialog::ACCEPT_COOKIE, 1);
- block->SetString(nsICookieAcceptDialog::HOSTNAME, NS_ConvertUTF8toUTF16(aHostname).get());
- block->SetInt(nsICookieAcceptDialog::COOKIESFROMHOST, aCookiesFromHost);
- block->SetInt(nsICookieAcceptDialog::CHANGINGCOOKIE, aChangingCookie ? 1 : 0);
-
- nsCOMPtr<nsIMutableArray> objects =
- do_CreateInstance(NS_ARRAY_CONTRACTID, &rv);
- if (NS_FAILED(rv)) return rv;
-
- rv = objects->AppendElement(aCookie, false);
- if (NS_FAILED(rv)) return rv;
-
- block->SetObjects(objects);
-
- nsCOMPtr<nsIWindowWatcher> wwatcher = do_GetService(NS_WINDOWWATCHER_CONTRACTID, &rv);
- if (NS_FAILED(rv)) return rv;
-
- nsCOMPtr<nsISupports> arguments = do_QueryInterface(block);
-
- nsCOMPtr<mozIDOMWindowProxy> parent(aParent);
- if (!parent) // if no parent provided, consult the window watcher:
- wwatcher->GetActiveWindow(getter_AddRefs(parent));
-
- if (parent) {
- auto* privateParent = nsPIDOMWindowOuter::From(parent);
- if (privateParent)
- privateParent = privateParent->GetPrivateRoot();
- parent = privateParent;
- }
-
- // We're opening a chrome window and passing in a nsIDialogParamBlock. Setting
- // the nsIDialogParamBlock as the .arguments property on the chrome window
- // requires system principals on the stack, so we use an AutoNoJSAPI for that.
- mozilla::dom::AutoNoJSAPI nojsapi;
-
- // The cookie dialog will be modal for the root chrome window rather than the
- // tab containing the permission-requesting page. This removes confusion
- // about which monitor is displaying the dialog (see bug 470356), but also
- // avoids unwanted tab switches (see bug 405239).
- nsCOMPtr<mozIDOMWindowProxy> dialog;
- rv = wwatcher->OpenWindow(parent, "chrome://cookie/content/cookieAcceptDialog.xul", "_blank",
- "centerscreen,chrome,modal,titlebar", arguments,
- getter_AddRefs(dialog));
-
- if (NS_FAILED(rv)) return rv;
-
- // get back output parameters
- int32_t tempValue;
- block->GetInt(nsICookieAcceptDialog::ACCEPT_COOKIE, &tempValue);
- *aAccept = tempValue;
-
- // GetInt returns a int32_t; we need to sanitize it into bool
- block->GetInt(nsICookieAcceptDialog::REMEMBER_DECISION, &tempValue);
- *aRememberDecision = (tempValue == 1);
-
- return rv;
-}
-
deleted file mode 100644
--- a/extensions/cookie/nsCookiePromptService.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nsCookiePromptService_h__
-#define nsCookiePromptService_h__
-
-#include "nsICookiePromptService.h"
-
-class nsCookiePromptService : public nsICookiePromptService {
-
- virtual ~nsCookiePromptService();
-
-public:
-
- nsCookiePromptService();
-
- NS_DECL_NSICOOKIEPROMPTSERVICE
- NS_DECL_ISUPPORTS
-
-private:
-
-};
-
-// {CE002B28-92B7-4701-8621-CC925866FB87}
-#define NS_COOKIEPROMPTSERVICE_CID \
- {0xCE002B28, 0x92B7, 0x4701, {0x86, 0x21, 0xCC, 0x92, 0x58, 0x66, 0xFB, 0x87}}
-
-#endif
deleted file mode 100644
--- a/extensions/cookie/nsICookieAcceptDialog.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsISupports.idl"
-
-/*
-
- This file contains some constants for the cookie accept dialog
-
- */
-
-[scriptable, uuid(3F2F0D2C-BDEA-4B5A-AFC6-FCF18F66B97E)]
-interface nsICookieAcceptDialog: nsISupports {
-
- const short ACCEPT_COOKIE=0;
- const short REMEMBER_DECISION=1;
- const short HOSTNAME=2;
- const short COOKIESFROMHOST=3;
- const short CHANGINGCOOKIE=4;
-};
deleted file mode 100644
--- a/extensions/cookie/nsICookiePromptService.idl
+++ /dev/null
@@ -1,45 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsISupports.idl"
-
-/**
- * An interface to open a dialog to ask to permission to accept the cookie.
- */
-
-interface mozIDOMWindowProxy;
-interface nsICookie;
-
-[scriptable, uuid(65ca07c3-6241-4de1-bf41-3336470499db)]
-interface nsICookiePromptService : nsISupports
-{
- const uint32_t DENY_COOKIE = 0;
- const uint32_t ACCEPT_COOKIE = 1;
- const uint32_t ACCEPT_SESSION_COOKIE = 2;
-
- /* Open a dialog that asks for permission to accept a cookie
- *
- * @param parent
- * @param cookie
- * @param hostname the host that wants to set the cookie,
- * not the domain: part of the cookie
- * @param cookiesFromHost the number of cookies there are already for this host
- * @param changingCookie are we changing this cookie?
- * @param rememberDecision should we set the matching permission for this host?
- * @returns 0 == deny cookie
- * 1 == accept cookie
- * 2 == accept cookie for current session
- */
-
- long cookieDialog(in mozIDOMWindowProxy parent,
- in nsICookie cookie,
- in ACString hostname,
- in long cookiesFromHost,
- in boolean changingCookie,
- out boolean rememberDecision);
-};
-
-%{C++
-#define NS_COOKIEPROMPTSERVICE_CONTRACTID "@mozilla.org/embedcomp/cookieprompt-service;1"
-%}
deleted file mode 100644
--- a/extensions/cookie/test/unit/cookieprompt.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- http://creativecommons.org/publicdomain/zero/1.0/ */
-
-Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-
-var Ci = Components.interfaces;
-
-function CookiePromptService() {
-}
-
-CookiePromptService.prototype = {
- classID: Components.ID("{509b5540-c87c-11dd-ad8b-0800200c9a66}"),
- QueryInterface: XPCOMUtils.generateQI([Ci.nsICookiePromptService]),
-
- cookieDialog: function(parent, cookie, hostname,
- cookiesFromHost, changingCookie,
- rememberDecision) {
- return 0;
- }
-};
-
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([CookiePromptService]);
deleted file mode 100644
--- a/extensions/cookie/test/unit/cookieprompt.manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-component {509b5540-c87c-11dd-ad8b-0800200c9a66} cookieprompt.js
-contract @mozilla.org/embedcomp/cookieprompt-service;1 {509b5540-c87c-11dd-ad8b-0800200c9a66}
--- a/extensions/cookie/test/unit/xpcshell.ini
+++ b/extensions/cookie/test/unit/xpcshell.ini
@@ -1,15 +1,12 @@
[DEFAULT]
head = head_cookies.js
tail =
skip-if = toolkit == 'android'
-support-files =
- cookieprompt.js
- cookieprompt.manifest
[test_bug526789.js]
[test_bug650522.js]
[test_bug667087.js]
[test_cookies_async_failure.js]
[test_cookies_persistence.js]
skip-if = true # Bug 863738
[test_cookies_privatebrowsing.js]
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -104,17 +104,16 @@
@BINPATH@/components/commandhandler.xpt
@BINPATH@/components/commandlines.xpt
@BINPATH@/components/composer.xpt
@BINPATH@/components/content_events.xpt
@BINPATH@/components/content_geckomediaplugins.xpt
@BINPATH@/components/content_html.xpt
@BINPATH@/components/content_webrtc.xpt
@BINPATH@/components/content_xslt.xpt
-@BINPATH@/components/cookie.xpt
@BINPATH@/components/directory.xpt
@BINPATH@/components/docshell.xpt
@BINPATH@/components/dom.xpt
@BINPATH@/components/dom_base.xpt
@BINPATH@/components/dom_canvas.xpt
@BINPATH@/components/dom_core.xpt
@BINPATH@/components/dom_css.xpt
@BINPATH@/components/dom_events.xpt
deleted file mode 100644
--- a/toolkit/components/cookie/content/cookieAcceptDialog.js
+++ /dev/null
@@ -1,180 +0,0 @@
-// -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
-
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-const nsICookieAcceptDialog = Components.interfaces.nsICookieAcceptDialog;
-const nsIDialogParamBlock = Components.interfaces.nsIDialogParamBlock;
-const nsICookie = Components.interfaces.nsICookie;
-const nsICookiePromptService = Components.interfaces.nsICookiePromptService;
-
-Components.utils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
-
-var params;
-var cookieBundle;
-
-var showDetails = "";
-var hideDetails = "";
-var detailsAccessKey = "";
-
-function onload() {
- doSetOKCancel(cookieAcceptNormal, cookieDeny, cookieAcceptSession);
-
- var dialog = document.documentElement;
-
- document.getElementById("Button2").collapsed = false;
-
- document.getElementById("ok").label = dialog.getAttribute("acceptLabel");
- document.getElementById("ok").accessKey = dialog.getAttribute("acceptKey");
- document.getElementById("Button2").label = dialog.getAttribute("extra1Label");
- document.getElementById("Button2").accessKey = dialog.getAttribute("extra1Key");
- document.getElementById("cancel").label = dialog.getAttribute("cancelLabel");
- document.getElementById("cancel").accessKey = dialog.getAttribute("cancelKey");
-
- // hook up button icons where implemented
- document.getElementById("ok").setAttribute("icon", "accept");
- document.getElementById("cancel").setAttribute("icon", "cancel");
- document.getElementById("disclosureButton").setAttribute("icon", "properties");
-
- cookieBundle = document.getElementById("cookieBundle");
-
- // cache strings
- if (!showDetails) {
- showDetails = cookieBundle.getString('showDetails');
- }
- if (!hideDetails) {
- hideDetails = cookieBundle.getString('hideDetails');
- }
- detailsAccessKey = cookieBundle.getString('detailsAccessKey');
-
- if (document.getElementById('infobox').hidden) {
- document.getElementById('disclosureButton').setAttribute("label", showDetails);
- } else {
- document.getElementById('disclosureButton').setAttribute("label", hideDetails);
- }
- document.getElementById('disclosureButton').setAttribute("accesskey", detailsAccessKey);
-
- if ("arguments" in window && window.arguments.length >= 1 && window.arguments[0]) {
- try {
- params = window.arguments[0].QueryInterface(nsIDialogParamBlock);
- var cookie = params.objects.queryElementAt(0, nsICookie);
- var cookiesFromHost = params.GetInt(nsICookieAcceptDialog.COOKIESFROMHOST);
-
- var messageFormat;
- if (params.GetInt(nsICookieAcceptDialog.CHANGINGCOOKIE))
- messageFormat = 'permissionToModifyCookie';
- else if (cookiesFromHost > 1)
- messageFormat = 'permissionToSetAnotherCookie';
- else if (cookiesFromHost == 1)
- messageFormat = 'permissionToSetSecondCookie';
- else
- messageFormat = 'permissionToSetACookie';
-
- var hostname = params.GetString(nsICookieAcceptDialog.HOSTNAME);
-
- var messageText;
- if (cookie)
- messageText = cookieBundle.getFormattedString(messageFormat, [hostname, cookiesFromHost]);
- else
- // No cookies means something went wrong. Bring up the dialog anyway
- // to not make the mess worse.
- messageText = cookieBundle.getFormattedString(messageFormat, ["", cookiesFromHost]);
-
- var messageParent = document.getElementById("dialogtextbox");
- var messageParagraphs = messageText.split("\n");
-
- // use value for the header, so it doesn't wrap.
- var headerNode = document.getElementById("dialog-header");
- headerNode.setAttribute("value", messageParagraphs[0]);
-
- // use childnodes here, the text can wrap
- for (var i = 1; i < messageParagraphs.length; i++) {
- var descriptionNode = document.createElement("description");
- let text = document.createTextNode(messageParagraphs[i]);
- descriptionNode.appendChild(text);
- messageParent.appendChild(descriptionNode);
- }
-
- if (cookie) {
- document.getElementById('ifl_name').setAttribute("value", cookie.name);
- document.getElementById('ifl_value').setAttribute("value", cookie.value);
- document.getElementById('ifl_host').setAttribute("value", cookie.host);
- document.getElementById('ifl_path').setAttribute("value", cookie.path);
- document.getElementById('ifl_isSecure').setAttribute("value",
- cookie.isSecure ?
- cookieBundle.getString("forSecureOnly") : cookieBundle.getString("forAnyConnection")
- );
- document.getElementById('ifl_expires').setAttribute("value", GetExpiresString(cookie.expires));
- document.getElementById('ifl_isDomain').setAttribute("value",
- cookie.isDomain ?
- cookieBundle.getString("domainColon") : cookieBundle.getString("hostColon")
- );
- }
- // set default result to not accept the cookie
- params.SetInt(nsICookieAcceptDialog.ACCEPT_COOKIE, 0);
- // and to not persist
- params.SetInt(nsICookieAcceptDialog.REMEMBER_DECISION, 0);
- } catch (e) {
- }
- }
-
- // The Private Browsing service might not be available
- try {
- if (window.opener && PrivateBrowsingUtils.isWindowPrivate(window.opener)) {
- var persistCheckbox = document.getElementById("persistDomainAcceptance");
- persistCheckbox.removeAttribute("checked");
- persistCheckbox.setAttribute("disabled", "true");
- }
- } catch (ex) {}
-}
-
-function showhideinfo() {
- var infobox = document.getElementById('infobox');
-
- if (infobox.hidden) {
- infobox.setAttribute("hidden", "false");
- document.getElementById('disclosureButton').setAttribute("label", hideDetails);
- } else {
- infobox.setAttribute("hidden", "true");
- document.getElementById('disclosureButton').setAttribute("label", showDetails);
- }
- sizeToContent();
-}
-
-function cookieAcceptNormal() {
- // accept the cookie normally
- params.SetInt(nsICookieAcceptDialog.ACCEPT_COOKIE, nsICookiePromptService.ACCEPT_COOKIE);
- // And remember that when needed
- params.SetInt(nsICookieAcceptDialog.REMEMBER_DECISION, document.getElementById('persistDomainAcceptance').checked);
- window.close();
-}
-
-function cookieAcceptSession() {
- // accept for the session only
- params.SetInt(nsICookieAcceptDialog.ACCEPT_COOKIE, nsICookiePromptService.ACCEPT_SESSION_COOKIE);
- // And remember that when needed
- params.SetInt(nsICookieAcceptDialog.REMEMBER_DECISION, document.getElementById('persistDomainAcceptance').checked);
- window.close();
-}
-
-function cookieDeny() {
- // say that the cookie was rejected
- params.SetInt(nsICookieAcceptDialog.ACCEPT_COOKIE, nsICookiePromptService.DENY_COOKIE);
- // And remember that when needed
- params.SetInt(nsICookieAcceptDialog.REMEMBER_DECISION, document.getElementById('persistDomainAcceptance').checked);
- window.close();
-}
-
-function GetExpiresString(secondsUntilExpires) {
- if (secondsUntilExpires) {
- var date = new Date(1000 * secondsUntilExpires);
- const locale = Components.classes["@mozilla.org/chrome/chrome-registry;1"]
- .getService(Components.interfaces.nsIXULChromeRegistry)
- .getSelectedLocale("global", true);
- const dtOptions = { year: 'numeric', month: 'long', day: 'numeric',
- hour: 'numeric', minute: 'numeric', second: 'numeric' };
- return date.toLocaleString(locale, dtOptions);
- }
- return cookieBundle.getString("expireAtEndOfSession");
-}
deleted file mode 100644
--- a/toolkit/components/cookie/content/cookieAcceptDialog.xul
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- - License, v. 2.0. If a copy of the MPL was not distributed with this
- - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE dialog SYSTEM "chrome://cookie/locale/cookieAcceptDialog.dtd">
-
-<!-- use a overlay te be able to put the accept/deny buttons not on the bottom -->
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
-
-<!-- use buttons="disclosure" to hide ok/cancel buttons. Those are added manually later -->
-<dialog id="cookieAcceptDialog"
- acceptLabel="&button.allow.label;"
- acceptKey="&button.allow.accesskey;"
- extra1Label="&button.session.label;"
- extra1Key="&button.session.accesskey;"
- cancelLabel="&button.deny.label;"
- cancelKey="&button.deny.accesskey;"
- onload="onload();"
- ondialogaccept="return doOKButton();"
- title="&dialog.title;"
- buttons="disclosure"
- aria-describedby="dialog-header"
- xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
- <script src="cookieAcceptDialog.js" type="application/javascript"/>
- <stringbundle id="cookieBundle"
- src="chrome://cookie/locale/cookieAcceptDialog.properties"/>
-
- <vbox>
- <hbox>
- <hbox align="start">
- <image id="infoicon" class="spaced alert-icon"/>
- </hbox>
-
- <vbox flex="1">
- <!-- text -->
- <vbox id="dialogtextbox">
- <description id="dialog-header" class="header"/>
- </vbox>
-
- <hbox id="checkboxContainer">
- <checkbox id="persistDomainAcceptance"
- label="&dialog.remember.label;"
- accesskey="&dialog.remember.accesskey;"
- persist="checked"/>
- </hbox>
- </vbox>
-
- </hbox>
-
- <hbox>
- <button id="disclosureButton" dlgtype="disclosure" class="exit-dialog"
- oncommand="showhideinfo();"/>
- <spacer flex="1"/>
- <hbox id="okCancelButtonsRight"/>
- </hbox>
-
- <vbox id="infobox" hidden="true" persist="hidden">
- <separator class="groove"/>
- <grid flex="1">
- <columns>
- <column/>
- <column flex="1"/>
- </columns>
- <rows>
-
- <row align="center">
- <hbox align="center" pack="end">
- <label value="&props.name.label;" control="ifl_name"/>
- </hbox>
- <textbox id="ifl_name" readonly="true" class="plain"/>
- </row>
-
- <row align="center">
- <hbox align="center" pack="end">
- <label value="&props.value.label;" control="ifl_value"/>
- </hbox>
- <textbox id="ifl_value" readonly="true" class="plain"/>
- </row>
-
- <row align="center">
- <hbox align="center" pack="end">
- <label id="ifl_isDomain" value="&props.domain.label;" control="ifl_host"/>
- </hbox>
- <textbox id="ifl_host" readonly="true" class="plain"/>
- </row>
-
- <row align="center">
- <hbox align="center" pack="end">
- <label value="&props.path.label;" control="ifl_path"/>
- </hbox>
- <textbox id="ifl_path" readonly="true" class="plain"/>
- </row>
-
- <row align="center">
- <hbox align="center" pack="end">
- <label value="&props.secure.label;" control="ifl_isSecure"/>
- </hbox>
- <textbox id="ifl_isSecure" readonly="true" class="plain"/>
- </row>
-
- <row align="center">
- <hbox align="center" pack="end">
- <label value="&props.expires.label;" control="ifl_expires"/>
- </hbox>
- <textbox id="ifl_expires" readonly="true" class="plain"/>
- </row>
-
- </rows>
- </grid>
- </vbox>
- </vbox>
-</dialog>
-
deleted file mode 100644
--- a/toolkit/components/cookie/jar.mn
+++ /dev/null
@@ -1,10 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-toolkit.jar:
-#ifndef MOZ_FENNEC
-% content cookie %content/cookie/
- content/cookie/cookieAcceptDialog.xul (content/cookieAcceptDialog.xul)
- content/cookie/cookieAcceptDialog.js (content/cookieAcceptDialog.js)
-#endif
deleted file mode 100644
--- a/toolkit/components/cookie/moz.build
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-if CONFIG['MOZ_BUILD_APP'] == 'mobile/android':
- DEFINES['MOZ_FENNEC'] = True
-
-JAR_MANIFESTS += ['jar.mn']
--- a/toolkit/components/moz.build
+++ b/toolkit/components/moz.build
@@ -15,17 +15,16 @@ DIRS += [
'aboutperformance',
'addoncompat',
'alerts',
'apppicker',
'asyncshutdown',
'commandlines',
'contentprefs',
'contextualidentity',
- 'cookie',
'crashmonitor',
'diskspacewatcher',
'downloads',
'extensions',
'exthelper',
'filewatcher',
'finalizationwitness',
'formautofill',
deleted file mode 100644
--- a/toolkit/locales/en-US/chrome/cookie/cookieAcceptDialog.dtd
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- - License, v. 2.0. If a copy of the MPL was not distributed with this
- - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY props.name.label "Name:">
-<!ENTITY props.value.label "Content:">
-<!ENTITY props.domain.label "Host:">
-<!ENTITY props.path.label "Path:">
-<!ENTITY props.secure.label "Send For:">
-<!ENTITY props.expires.label "Expires:">
-
-<!ENTITY button.allow.label "Allow">
-<!ENTITY button.allow.accesskey "A">
-<!ENTITY button.session.label "Allow for Session">
-<!ENTITY button.session.accesskey "S">
-<!ENTITY button.deny.label "Deny">
-<!ENTITY button.deny.accesskey "D">
-
-<!ENTITY dialog.title "Confirm setting cookie">
-<!ENTITY dialog.remember.label "Use my choice for all cookies from this site">
-<!ENTITY dialog.remember.accesskey "U">
deleted file mode 100644
--- a/toolkit/locales/en-US/chrome/cookie/cookieAcceptDialog.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-hostColon=Host:
-domainColon=Domain:
-forSecureOnly=Encrypted connections only
-forAnyConnection=Any type of connection
-expireAtEndOfSession=At end of session
-
-showDetails=Show Details
-hideDetails=Hide Details
-detailsAccessKey=T
-
-permissionToSetACookie = The site %S wants to set a cookie.
-permissionToSetSecondCookie = The site %S wants to set a second cookie.
-# LOCALIZATION NOTE (PermissionToSetAnotherCookie): First %S: sitename, second %S: number of cookies already present for that site
-permissionToSetAnotherCookie = The site %S wants to set another cookie.\nYou already have %S cookies from this site.
-permissionToModifyCookie = The site %S wants to modify an existing cookie.
--- a/toolkit/locales/jar.mn
+++ b/toolkit/locales/jar.mn
@@ -127,21 +127,16 @@
locale/@AB_CD@/mozapps/update/history.dtd (%chrome/mozapps/update/history.dtd)
locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.dtd (%chrome/mozapps/extensions/xpinstallConfirm.dtd)
locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.properties (%chrome/mozapps/extensions/xpinstallConfirm.properties)
% locale pluginproblem @AB_CD@ %locale/@AB_CD@/pluginproblem/
locale/@AB_CD@/pluginproblem/pluginproblem.dtd (%chrome/pluginproblem/pluginproblem.dtd)
% locale alerts @AB_CD@ %locale/@AB_CD@/alerts/
locale/@AB_CD@/alerts/alert.dtd (%chrome/alerts/alert.dtd)
locale/@AB_CD@/alerts/alert.properties (%chrome/alerts/alert.properties)
-#ifndef MOZ_FENNEC
-% locale cookie @AB_CD@ %locale/@AB_CD@/cookie/
- locale/@AB_CD@/cookie/cookieAcceptDialog.dtd (%chrome/cookie/cookieAcceptDialog.dtd)
- locale/@AB_CD@/cookie/cookieAcceptDialog.properties (%chrome/cookie/cookieAcceptDialog.properties)
-#endif
% locale passwordmgr @AB_CD@ %locale/@AB_CD@/passwordmgr/
locale/@AB_CD@/passwordmgr/passwordmgr.properties (%chrome/passwordmgr/passwordmgr.properties)
locale/@AB_CD@/passwordmgr/passwordManager.dtd (%chrome/passwordmgr/passwordManager.dtd)
% locale autoconfig @AB_CD@ %locale/@AB_CD@/autoconfig/
locale/@AB_CD@/autoconfig/autoconfig.properties (%chrome/autoconfig/autoconfig.properties)
% locale places @AB_CD@ %locale/@AB_CD@/places/
locale/@AB_CD@/places/places.properties (%chrome/places/places.properties)
locale/@AB_CD@/global/search/search.properties (%chrome/search/search.properties)