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 | <!-- This Source Code Form is subject to the terms of the Mozilla Public |
michael@0 | 3 | - License, v. 2.0. If a copy of the MPL was not distributed with this |
michael@0 | 4 | - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> |
michael@0 | 5 | |
michael@0 | 6 | <?xml-stylesheet href="chrome://global/skin/" type="text/css"?> |
michael@0 | 7 | |
michael@0 | 8 | <!DOCTYPE wizard [ |
michael@0 | 9 | <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd"> |
michael@0 | 10 | %brandDTD; |
michael@0 | 11 | <!ENTITY % profileDTD SYSTEM "chrome://mozapps/locale/profile/createProfileWizard.dtd"> |
michael@0 | 12 | %profileDTD; |
michael@0 | 13 | ]> |
michael@0 | 14 | |
michael@0 | 15 | <wizard id="createProfileWizard" |
michael@0 | 16 | title="&newprofile.title;" |
michael@0 | 17 | xmlns:html="http://www.w3.org/1999/xhtml" |
michael@0 | 18 | xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
michael@0 | 19 | xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" |
michael@0 | 20 | onwizardfinish="return onFinish();" |
michael@0 | 21 | onload="initWizard();" |
michael@0 | 22 | style="&window.size;"> |
michael@0 | 23 | |
michael@0 | 24 | <stringbundle id="bundle_profileManager" |
michael@0 | 25 | src="chrome://mozapps/locale/profile/profileSelection.properties"/> |
michael@0 | 26 | |
michael@0 | 27 | <script type="application/javascript" src="chrome://mozapps/content/profile/createProfileWizard.js"/> |
michael@0 | 28 | |
michael@0 | 29 | <wizardpage id="explanation" onpageshow="enableNextButton();"> |
michael@0 | 30 | <description>&profileCreationExplanation_1.text;</description> |
michael@0 | 31 | <description>&profileCreationExplanation_2.text;</description> |
michael@0 | 32 | <description>&profileCreationExplanation_3.text;</description> |
michael@0 | 33 | <spacer flex="1"/> |
michael@0 | 34 | #ifdef XP_MACOSX |
michael@0 | 35 | <description>&profileCreationExplanation_4Mac.text;</description> |
michael@0 | 36 | #else |
michael@0 | 37 | #ifdef XP_UNIX |
michael@0 | 38 | <description>&profileCreationExplanation_4Gnome.text;</description> |
michael@0 | 39 | #else |
michael@0 | 40 | <description>&profileCreationExplanation_4.text;</description> |
michael@0 | 41 | #endif |
michael@0 | 42 | #endif |
michael@0 | 43 | </wizardpage> |
michael@0 | 44 | |
michael@0 | 45 | <wizardpage id="createProfile" onpageshow="initSecondWizardPage();"> |
michael@0 | 46 | <description>&profileCreationIntro.text;</description> |
michael@0 | 47 | |
michael@0 | 48 | <label accesskey="&profilePrompt.accesskey;" control="ProfileName">&profilePrompt.label;</label> |
michael@0 | 49 | <textbox id="profileName" value="&profileDefaultName;" |
michael@0 | 50 | oninput="updateProfileName(this.value);"/> |
michael@0 | 51 | |
michael@0 | 52 | <separator/> |
michael@0 | 53 | |
michael@0 | 54 | <description>&profileDirectoryExplanation.text;</description> |
michael@0 | 55 | |
michael@0 | 56 | <vbox class="indent" flex="1" style="overflow: auto;"> |
michael@0 | 57 | <description id="profileDisplay">*</description> |
michael@0 | 58 | </vbox> |
michael@0 | 59 | |
michael@0 | 60 | <hbox> |
michael@0 | 61 | <button label="&button.choosefolder.label;" oncommand="chooseProfileFolder();" |
michael@0 | 62 | accesskey="&button.choosefolder.accesskey;"/> |
michael@0 | 63 | |
michael@0 | 64 | <button id="useDefault" label="&button.usedefault.label;" |
michael@0 | 65 | oncommand="setDisplayToDefaultFolder(); updateProfileDisplay();" |
michael@0 | 66 | accesskey="&button.usedefault.accesskey;" disabled="true"/> |
michael@0 | 67 | </hbox> |
michael@0 | 68 | |
michael@0 | 69 | <separator/> |
michael@0 | 70 | |
michael@0 | 71 | <description id="finishText">*</description> |
michael@0 | 72 | </wizardpage> |
michael@0 | 73 | |
michael@0 | 74 | </wizard> |