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 | <?xml-stylesheet href="chrome://mozapps/content/extensions/selectAddons.css" type="text/css"?> |
michael@0 | 9 | <?xml-stylesheet href="chrome://mozapps/skin/extensions/selectAddons.css" type="text/css"?> |
michael@0 | 10 | |
michael@0 | 11 | <!DOCTYPE window [ |
michael@0 | 12 | <!ENTITY % updateDTD SYSTEM "chrome://mozapps/locale/extensions/selectAddons.dtd"> |
michael@0 | 13 | <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd"> |
michael@0 | 14 | %updateDTD; |
michael@0 | 15 | %brandDTD; |
michael@0 | 16 | ]> |
michael@0 | 17 | |
michael@0 | 18 | <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" |
michael@0 | 19 | style="&upgrade.style;" id="select-window"> |
michael@0 | 20 | |
michael@0 | 21 | <script type="application/javascript" src="chrome://mozapps/content/extensions/selectAddons.js"/> |
michael@0 | 22 | <stringbundle id="strings" src="chrome://mozapps/locale/extensions/selectAddons.properties"/> |
michael@0 | 23 | |
michael@0 | 24 | <deck id="view-deck" flex="1" align="stretch" pack="stretch"> |
michael@0 | 25 | <vbox id="checking" align="stretch"> |
michael@0 | 26 | <vbox flex="1"> |
michael@0 | 27 | <label id="checking-heading" class="heading">&checking.heading;</label> |
michael@0 | 28 | </vbox> |
michael@0 | 29 | <progressmeter id="checking-progress" class="progress" mode="undetermined"/> |
michael@0 | 30 | <vbox flex="1"> |
michael@0 | 31 | <label id="checking-progress-label" class="progress-label">&checking.progress.label;</label> |
michael@0 | 32 | </vbox> |
michael@0 | 33 | </vbox> |
michael@0 | 34 | |
michael@0 | 35 | <vbox id="select" align="stretch"> |
michael@0 | 36 | <label id="select-heading" class="heading">&select.heading;</label> |
michael@0 | 37 | |
michael@0 | 38 | <description id="select-description">&select.description;</description> |
michael@0 | 39 | |
michael@0 | 40 | <vbox id="select-list" align="stretch" flex="1"> |
michael@0 | 41 | <hbox id="select-header"> |
michael@0 | 42 | <hbox class="select-keep select-cell" style="&select.keep.style;"> |
michael@0 | 43 | <label value="&select.keep;"/> |
michael@0 | 44 | </hbox> |
michael@0 | 45 | <hbox class="select-icon select-cell"/> |
michael@0 | 46 | <hbox id="heading-name" class="select-name select-cell" style="&select.name.style;"> |
michael@0 | 47 | <label value="&select.name;"/> |
michael@0 | 48 | </hbox> |
michael@0 | 49 | <hbox id="heading-action" class="select-action select-cell" style="&select.action.style;"> |
michael@0 | 50 | <label value="&select.action;"/> |
michael@0 | 51 | </hbox> |
michael@0 | 52 | <hbox class="select-source select-cell" flex="1"> |
michael@0 | 53 | <label value="&select.source;"/> |
michael@0 | 54 | </hbox> |
michael@0 | 55 | </hbox> |
michael@0 | 56 | |
michael@0 | 57 | <scrollbox id="select-scrollbox" flex="1"> |
michael@0 | 58 | <grid id="select-grid" flex="1"> |
michael@0 | 59 | <columns> |
michael@0 | 60 | <column style="&select.keep.style;"/> |
michael@0 | 61 | <column/> |
michael@0 | 62 | <column id="column-name"/> |
michael@0 | 63 | <column id="column-action" class="select-action"/> |
michael@0 | 64 | <column class="select-source" flex="1"/> |
michael@0 | 65 | </columns> |
michael@0 | 66 | |
michael@0 | 67 | <rows id="select-rows"/> |
michael@0 | 68 | </grid> |
michael@0 | 69 | </scrollbox> |
michael@0 | 70 | </vbox> |
michael@0 | 71 | </vbox> |
michael@0 | 72 | |
michael@0 | 73 | <vbox id="confirm" align="stretch"> |
michael@0 | 74 | <label id="confirm-heading" class="heading">&confirm.heading;</label> |
michael@0 | 75 | |
michael@0 | 76 | <description id="confirm-description">&confirm.description;</description> |
michael@0 | 77 | |
michael@0 | 78 | <scrollbox id="confirm-scrollbox" flex="1"> |
michael@0 | 79 | <vbox id="disable-list" class="action-list" hidden="true"> |
michael@0 | 80 | <label class="action-header">&action.disable.heading;</label> |
michael@0 | 81 | </vbox> |
michael@0 | 82 | |
michael@0 | 83 | <vbox id="incompatible-list" class="action-list" hidden="true"> |
michael@0 | 84 | <label class="action-header">&action.incompatible.heading;</label> |
michael@0 | 85 | </vbox> |
michael@0 | 86 | |
michael@0 | 87 | <vbox id="update-list" class="action-list" hidden="true"> |
michael@0 | 88 | <label class="action-header">&action.update.heading;</label> |
michael@0 | 89 | </vbox> |
michael@0 | 90 | |
michael@0 | 91 | <vbox id="enable-list" class="action-list" hidden="true"> |
michael@0 | 92 | <label class="action-header">&action.enable.heading;</label> |
michael@0 | 93 | </vbox> |
michael@0 | 94 | </scrollbox> |
michael@0 | 95 | </vbox> |
michael@0 | 96 | |
michael@0 | 97 | <vbox id="update" align="stretch"> |
michael@0 | 98 | <vbox flex="1"> |
michael@0 | 99 | <label id="update-heading" class="heading">&update.heading;</label> |
michael@0 | 100 | </vbox> |
michael@0 | 101 | <progressmeter id="update-progress" class="progress" mode="undetermined"/> |
michael@0 | 102 | <vbox flex="1"> |
michael@0 | 103 | <label id="update-progress-label" class="progress-label">&update.progress.label;</label> |
michael@0 | 104 | </vbox> |
michael@0 | 105 | </vbox> |
michael@0 | 106 | |
michael@0 | 107 | <vbox id="errors"> |
michael@0 | 108 | <vbox flex="1"> |
michael@0 | 109 | <label id="errors-heading" class="heading">&errors.heading;</label> |
michael@0 | 110 | </vbox> |
michael@0 | 111 | <description id="errors-description" value="&errors.description;"/> |
michael@0 | 112 | <spacer flex="1"/> |
michael@0 | 113 | </vbox> |
michael@0 | 114 | </deck> |
michael@0 | 115 | |
michael@0 | 116 | <hbox id="footer" align="center"> |
michael@0 | 117 | <label id="footer-label" flex="1">&footer.label;</label> |
michael@0 | 118 | <button id="cancel" label="&cancel.label;" oncommand="window.close()"/> |
michael@0 | 119 | <button id="back" label="&back.label;" oncommand="gView.back()" hidden="true"/> |
michael@0 | 120 | <button id="next" label="&next.label;" oncommand="gView.next()" hidden="true"/> |
michael@0 | 121 | <button id="done" label="&done.label;" oncommand="gView.done()" hidden="true"/> |
michael@0 | 122 | </hbox> |
michael@0 | 123 | |
michael@0 | 124 | </window> |