Sat, 03 Jan 2015 20:18:00 +0100
Conditionally enable double key logic according to:
private browsing mode or privacy.thirdparty.isolate preference and
implement in GetCookieStringCommon and FindCookie where it counts...
With some reservations of how to convince FindCookie users to test
condition and pass a nullptr when disabling double key logic.
michael@0 | 1 | <?xml version="1.0"?> |
michael@0 | 2 | |
michael@0 | 3 | <!-- This Source Code Form is subject to the terms of the Mozilla Public |
michael@0 | 4 | - License, v. 2.0. If a copy of the MPL was not distributed with this |
michael@0 | 5 | - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> |
michael@0 | 6 | |
michael@0 | 7 | <?xml-stylesheet href="chrome://global/skin/" type="text/css"?> |
michael@0 | 8 | |
michael@0 | 9 | <!DOCTYPE dialog SYSTEM "chrome://cookie/locale/cookieAcceptDialog.dtd"> |
michael@0 | 10 | |
michael@0 | 11 | <!-- use a overlay te be able to put the accept/deny buttons not on the bottom --> |
michael@0 | 12 | <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?> |
michael@0 | 13 | |
michael@0 | 14 | <!-- use buttons="disclosure" to hide ok/cancel buttons. Those are added manually later --> |
michael@0 | 15 | <dialog id="cookieAcceptDialog" |
michael@0 | 16 | acceptLabel="&button.allow.label;" |
michael@0 | 17 | acceptKey="&button.allow.accesskey;" |
michael@0 | 18 | extra1Label="&button.session.label;" |
michael@0 | 19 | extra1Key="&button.session.accesskey;" |
michael@0 | 20 | cancelLabel="&button.deny.label;" |
michael@0 | 21 | cancelKey="&button.deny.accesskey;" |
michael@0 | 22 | onload="onload();" |
michael@0 | 23 | ondialogaccept="return doOKButton();" |
michael@0 | 24 | title="&dialog.title;" |
michael@0 | 25 | buttons="disclosure" |
michael@0 | 26 | aria-describedby="dialog-header" |
michael@0 | 27 | xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> |
michael@0 | 28 | |
michael@0 | 29 | <script src="cookieAcceptDialog.js" type="application/javascript"/> |
michael@0 | 30 | <stringbundle id="cookieBundle" |
michael@0 | 31 | src="chrome://cookie/locale/cookieAcceptDialog.properties"/> |
michael@0 | 32 | |
michael@0 | 33 | <vbox> |
michael@0 | 34 | <hbox> |
michael@0 | 35 | <hbox align="start"> |
michael@0 | 36 | <image id="infoicon" class="spaced alert-icon"/> |
michael@0 | 37 | </hbox> |
michael@0 | 38 | |
michael@0 | 39 | <vbox flex="1"> |
michael@0 | 40 | <!-- text --> |
michael@0 | 41 | <vbox id="dialogtextbox"> |
michael@0 | 42 | <description id="dialog-header" class="header"/> |
michael@0 | 43 | </vbox> |
michael@0 | 44 | |
michael@0 | 45 | <hbox id="checkboxContainer"> |
michael@0 | 46 | <checkbox id="persistDomainAcceptance" |
michael@0 | 47 | label="&dialog.remember.label;" |
michael@0 | 48 | accesskey="&dialog.remember.accesskey;" |
michael@0 | 49 | persist="checked"/> |
michael@0 | 50 | </hbox> |
michael@0 | 51 | </vbox> |
michael@0 | 52 | |
michael@0 | 53 | </hbox> |
michael@0 | 54 | |
michael@0 | 55 | <hbox> |
michael@0 | 56 | <button id="disclosureButton" dlgtype="disclosure" class="exit-dialog" |
michael@0 | 57 | oncommand="showhideinfo();"/> |
michael@0 | 58 | <spacer flex="1"/> |
michael@0 | 59 | <hbox id="okCancelButtonsRight"/> |
michael@0 | 60 | </hbox> |
michael@0 | 61 | |
michael@0 | 62 | <vbox id="infobox" hidden="true" persist="hidden"> |
michael@0 | 63 | <separator class="groove"/> |
michael@0 | 64 | <grid flex="1"> |
michael@0 | 65 | <columns> |
michael@0 | 66 | <column/> |
michael@0 | 67 | <column flex="1"/> |
michael@0 | 68 | </columns> |
michael@0 | 69 | <rows> |
michael@0 | 70 | |
michael@0 | 71 | <row align="center"> |
michael@0 | 72 | <hbox align="center" pack="end"> |
michael@0 | 73 | <label value="&props.name.label;" control="ifl_name"/> |
michael@0 | 74 | </hbox> |
michael@0 | 75 | <textbox id="ifl_name" readonly="true" class="plain"/> |
michael@0 | 76 | </row> |
michael@0 | 77 | |
michael@0 | 78 | <row align="center"> |
michael@0 | 79 | <hbox align="center" pack="end"> |
michael@0 | 80 | <label value="&props.value.label;" control="ifl_value"/> |
michael@0 | 81 | </hbox> |
michael@0 | 82 | <textbox id="ifl_value" readonly="true" class="plain"/> |
michael@0 | 83 | </row> |
michael@0 | 84 | |
michael@0 | 85 | <row align="center"> |
michael@0 | 86 | <hbox align="center" pack="end"> |
michael@0 | 87 | <label id="ifl_isDomain" value="&props.domain.label;" control="ifl_host"/> |
michael@0 | 88 | </hbox> |
michael@0 | 89 | <textbox id="ifl_host" readonly="true" class="plain"/> |
michael@0 | 90 | </row> |
michael@0 | 91 | |
michael@0 | 92 | <row align="center"> |
michael@0 | 93 | <hbox align="center" pack="end"> |
michael@0 | 94 | <label value="&props.path.label;" control="ifl_path"/> |
michael@0 | 95 | </hbox> |
michael@0 | 96 | <textbox id="ifl_path" readonly="true" class="plain"/> |
michael@0 | 97 | </row> |
michael@0 | 98 | |
michael@0 | 99 | <row align="center"> |
michael@0 | 100 | <hbox align="center" pack="end"> |
michael@0 | 101 | <label value="&props.secure.label;" control="ifl_isSecure"/> |
michael@0 | 102 | </hbox> |
michael@0 | 103 | <textbox id="ifl_isSecure" readonly="true" class="plain"/> |
michael@0 | 104 | </row> |
michael@0 | 105 | |
michael@0 | 106 | <row align="center"> |
michael@0 | 107 | <hbox align="center" pack="end"> |
michael@0 | 108 | <label value="&props.expires.label;" control="ifl_expires"/> |
michael@0 | 109 | </hbox> |
michael@0 | 110 | <textbox id="ifl_expires" readonly="true" class="plain"/> |
michael@0 | 111 | </row> |
michael@0 | 112 | |
michael@0 | 113 | </rows> |
michael@0 | 114 | </grid> |
michael@0 | 115 | </vbox> |
michael@0 | 116 | </vbox> |
michael@0 | 117 | </dialog> |
michael@0 | 118 |