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 | <!DOCTYPE dialog [ |
michael@0 | 8 | <!ENTITY % customizeToolbarDTD SYSTEM "chrome://global/locale/customizeToolbar.dtd"> |
michael@0 | 9 | %customizeToolbarDTD; |
michael@0 | 10 | ]> |
michael@0 | 11 | |
michael@0 | 12 | <?xml-stylesheet href="chrome://global/skin/" type="text/css"?> |
michael@0 | 13 | <?xml-stylesheet href="chrome://global/content/customizeToolbar.css" type="text/css"?> |
michael@0 | 14 | <?xml-stylesheet href="chrome://global/skin/customizeToolbar.css" type="text/css"?> |
michael@0 | 15 | |
michael@0 | 16 | <window id="CustomizeToolbarWindow" |
michael@0 | 17 | title="&dialog.title;" |
michael@0 | 18 | onload="onLoad();" |
michael@0 | 19 | onunload="onUnload();" |
michael@0 | 20 | style="&dialog.dimensions;" |
michael@0 | 21 | persist="width height" |
michael@0 | 22 | xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> |
michael@0 | 23 | |
michael@0 | 24 | <script type="application/javascript" src="chrome://global/content/customizeToolbar.js"/> |
michael@0 | 25 | |
michael@0 | 26 | <stringbundle id="stringBundle" src="chrome://global/locale/customizeToolbar.properties"/> |
michael@0 | 27 | |
michael@0 | 28 | <keyset id="CustomizeToolbarKeyset"> |
michael@0 | 29 | <key id="cmd_close1" keycode="VK_ESCAPE" oncommand="onClose();"/> |
michael@0 | 30 | <key id="cmd_close2" keycode="VK_RETURN" oncommand="onClose();"/> |
michael@0 | 31 | </keyset> |
michael@0 | 32 | |
michael@0 | 33 | <vbox id="main-box" flex="1"> |
michael@0 | 34 | <description id="instructions"> |
michael@0 | 35 | &instructions.description; |
michael@0 | 36 | </description> |
michael@0 | 37 | |
michael@0 | 38 | <vbox flex="1" id="palette-box" |
michael@0 | 39 | ondragstart="onToolbarDragStart(event)" |
michael@0 | 40 | ondragover="onPaletteDragOver(event)" |
michael@0 | 41 | ondrop="onPaletteDrop(event)"/> |
michael@0 | 42 | |
michael@0 | 43 | <box align="center"> |
michael@0 | 44 | <label value="&show.label;"/> |
michael@0 | 45 | <menulist id="modelist" value="icons" oncommand="updateToolbarMode(this.value);"> |
michael@0 | 46 | <menupopup id="modelistpopup"> |
michael@0 | 47 | <menuitem id="modefull" value="full" label="&iconsAndText.label;"/> |
michael@0 | 48 | <menuitem id="modeicons" value="icons" label="&icons.label;"/> |
michael@0 | 49 | <menuitem id="modetext" value="text" label="&text.label;"/> |
michael@0 | 50 | </menupopup> |
michael@0 | 51 | </menulist> |
michael@0 | 52 | |
michael@0 | 53 | <checkbox id="smallicons" oncommand="updateIconSize(this.checked ? 'small' : 'large');" label="&useSmallIcons.label;"/> |
michael@0 | 54 | |
michael@0 | 55 | <button id="newtoolbar" label="&addNewToolbar.label;" oncommand="addNewToolbar();" icon="add"/> |
michael@0 | 56 | <button id="restoreDefault" label="&restoreDefaultSet.label;" oncommand="restoreDefaultSet();" icon="revert"/> |
michael@0 | 57 | </box> |
michael@0 | 58 | |
michael@0 | 59 | <separator class="groove"/> |
michael@0 | 60 | |
michael@0 | 61 | <hbox align="center" pack="end"> |
michael@0 | 62 | <button id="donebutton" label="&saveChanges.label;" oncommand="onClose();" |
michael@0 | 63 | default="true" icon="close"/> |
michael@0 | 64 | </hbox> |
michael@0 | 65 | </vbox> |
michael@0 | 66 | |
michael@0 | 67 | </window> |