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 | /* This Source Code Form is subject to the terms of the Mozilla Public |
michael@0 | 2 | * License, v. 2.0. If a copy of the MPL was not distributed with this |
michael@0 | 3 | * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
michael@0 | 4 | |
michael@0 | 5 | #if defined(MOZ_UPDATER) |
michael@0 | 6 | # if !defined(MOZ_WIDGET_ANDROID) |
michael@0 | 7 | # define USE_MOZ_UPDATER |
michael@0 | 8 | # endif |
michael@0 | 9 | #endif |
michael@0 | 10 | |
michael@0 | 11 | #define NS_ALERTSERVICE_CONTRACTID \ |
michael@0 | 12 | "@mozilla.org/alerts-service;1" |
michael@0 | 13 | |
michael@0 | 14 | // This separate service uses the same nsIAlertsService interface, |
michael@0 | 15 | // but instead sends a notification to a platform alerts API |
michael@0 | 16 | // if available. Using a separate CID allows us to overwrite the XUL |
michael@0 | 17 | // alerts service at runtime. |
michael@0 | 18 | #define NS_SYSTEMALERTSERVICE_CONTRACTID \ |
michael@0 | 19 | "@mozilla.org/system-alerts-service;1" |
michael@0 | 20 | |
michael@0 | 21 | #define NS_AUTOCOMPLETECONTROLLER_CONTRACTID \ |
michael@0 | 22 | "@mozilla.org/autocomplete/controller;1" |
michael@0 | 23 | |
michael@0 | 24 | #define NS_AUTOCOMPLETESIMPLERESULT_CONTRACTID \ |
michael@0 | 25 | "@mozilla.org/autocomplete/simple-result;1" |
michael@0 | 26 | |
michael@0 | 27 | #define NS_AUTOCOMPLETEMDBRESULT_CONTRACTID \ |
michael@0 | 28 | "@mozilla.org/autocomplete/mdb-result;1" |
michael@0 | 29 | |
michael@0 | 30 | #define NS_DOWNLOADMANAGER_CONTRACTID \ |
michael@0 | 31 | "@mozilla.org/download-manager;1" |
michael@0 | 32 | |
michael@0 | 33 | #define NS_DOWNLOADPLATFORM_CONTRACTID \ |
michael@0 | 34 | "@mozilla.org/toolkit/download-platform;1" |
michael@0 | 35 | |
michael@0 | 36 | #define NS_FORMHISTORY_CONTRACTID \ |
michael@0 | 37 | "@mozilla.org/satchel/form-history;1" |
michael@0 | 38 | |
michael@0 | 39 | #define NS_FORMFILLCONTROLLER_CONTRACTID \ |
michael@0 | 40 | "@mozilla.org/satchel/form-fill-controller;1" |
michael@0 | 41 | |
michael@0 | 42 | #define NS_FORMHISTORYAUTOCOMPLETE_CONTRACTID \ |
michael@0 | 43 | "@mozilla.org/autocomplete/search;1?name=form-history" |
michael@0 | 44 | |
michael@0 | 45 | #define NS_GLOBALHISTORY_DATASOURCE_CONTRACTID \ |
michael@0 | 46 | "@mozilla.org/rdf/datasource;1?name=history" |
michael@0 | 47 | |
michael@0 | 48 | #define NS_GLOBALHISTORY_AUTOCOMPLETE_CONTRACTID \ |
michael@0 | 49 | "@mozilla.org/autocomplete/search;1?name=history" |
michael@0 | 50 | |
michael@0 | 51 | #define NS_TYPEAHEADFIND_CONTRACTID \ |
michael@0 | 52 | "@mozilla.org/typeaheadfind;1" |
michael@0 | 53 | |
michael@0 | 54 | #define NS_PARENTALCONTROLSSERVICE_CONTRACTID \ |
michael@0 | 55 | "@mozilla.org/parental-controls-service;1" |
michael@0 | 56 | |
michael@0 | 57 | #define NS_URLCLASSIFIERPREFIXSET_CONTRACTID \ |
michael@0 | 58 | "@mozilla.org/url-classifier/prefixset;1" |
michael@0 | 59 | |
michael@0 | 60 | #define NS_URLCLASSIFIERDBSERVICE_CONTRACTID \ |
michael@0 | 61 | "@mozilla.org/url-classifier/dbservice;1" |
michael@0 | 62 | |
michael@0 | 63 | #define NS_URLCLASSIFIERSTREAMUPDATER_CONTRACTID \ |
michael@0 | 64 | "@mozilla.org/url-classifier/streamupdater;1" |
michael@0 | 65 | |
michael@0 | 66 | #define NS_URLCLASSIFIERUTILS_CONTRACTID \ |
michael@0 | 67 | "@mozilla.org/url-classifier/utils;1" |
michael@0 | 68 | |
michael@0 | 69 | #define NS_URLCLASSIFIERHASHCOMPLETER_CONTRACTID \ |
michael@0 | 70 | "@mozilla.org/url-classifier/hashcompleter;1" |
michael@0 | 71 | |
michael@0 | 72 | #define NS_NAVHISTORYSERVICE_CONTRACTID \ |
michael@0 | 73 | "@mozilla.org/browser/nav-history-service;1" |
michael@0 | 74 | |
michael@0 | 75 | #define NS_ANNOTATIONSERVICE_CONTRACTID \ |
michael@0 | 76 | "@mozilla.org/browser/annotation-service;1" |
michael@0 | 77 | |
michael@0 | 78 | #define NS_NAVBOOKMARKSSERVICE_CONTRACTID \ |
michael@0 | 79 | "@mozilla.org/browser/nav-bookmarks-service;1" |
michael@0 | 80 | |
michael@0 | 81 | #define NS_LIVEMARKSERVICE_CONTRACTID \ |
michael@0 | 82 | "@mozilla.org/browser/livemark-service;2" |
michael@0 | 83 | |
michael@0 | 84 | #define NS_TAGGINGSERVICE_CONTRACTID \ |
michael@0 | 85 | "@mozilla.org/browser/tagging-service;1" |
michael@0 | 86 | |
michael@0 | 87 | #define NS_FAVICONSERVICE_CONTRACTID \ |
michael@0 | 88 | "@mozilla.org/browser/favicon-service;1" |
michael@0 | 89 | |
michael@0 | 90 | #define NS_APPSTARTUP_CONTRACTID \ |
michael@0 | 91 | "@mozilla.org/toolkit/app-startup;1" |
michael@0 | 92 | |
michael@0 | 93 | #if defined(USE_MOZ_UPDATER) |
michael@0 | 94 | #define NS_UPDATEPROCESSOR_CONTRACTID \ |
michael@0 | 95 | "@mozilla.org/updates/update-processor;1" |
michael@0 | 96 | #endif |
michael@0 | 97 | |
michael@0 | 98 | ///////////////////////////////////////////////////////////////////////////// |
michael@0 | 99 | |
michael@0 | 100 | // {A0CCAAF8-09DA-44D8-B250-9AC3E93C8117} |
michael@0 | 101 | #define NS_ALERTSSERVICE_CID \ |
michael@0 | 102 | { 0xa0ccaaf8, 0x9da, 0x44d8, { 0xb2, 0x50, 0x9a, 0xc3, 0xe9, 0x3c, 0x81, 0x17 } } |
michael@0 | 103 | |
michael@0 | 104 | // {84E11F80-CA55-11DD-AD8B-0800200C9A66} |
michael@0 | 105 | #define NS_SYSTEMALERTSSERVICE_CID \ |
michael@0 | 106 | { 0x84e11f80, 0xca55, 0x11dd, { 0xad, 0x8b, 0x08, 0x00, 0x20, 0x0c, 0x9a, 0x66 } } |
michael@0 | 107 | |
michael@0 | 108 | // {F6D5EBBD-34F4-487d-9D10-3D34123E3EB9} |
michael@0 | 109 | #define NS_AUTOCOMPLETECONTROLLER_CID \ |
michael@0 | 110 | { 0xf6d5ebbd, 0x34f4, 0x487d, { 0x9d, 0x10, 0x3d, 0x34, 0x12, 0x3e, 0x3e, 0xb9 } } |
michael@0 | 111 | |
michael@0 | 112 | // {2ee3039b-2de4-43d9-93b0-649beacff39a} |
michael@0 | 113 | #define NS_AUTOCOMPLETESIMPLERESULT_CID \ |
michael@0 | 114 | { 0x2ee3039b, 0x2de4, 0x43d9, { 0x93, 0xb0, 0x64, 0x9b, 0xea, 0xcf, 0xf3, 0x9a } } |
michael@0 | 115 | |
michael@0 | 116 | // {7A6F70B6-2BBD-44b5-9304-501352D44AB5} |
michael@0 | 117 | #define NS_AUTOCOMPLETEMDBRESULT_CID \ |
michael@0 | 118 | { 0x7a6f70b6, 0x2bbd, 0x44b5, { 0x93, 0x4, 0x50, 0x13, 0x52, 0xd4, 0x4a, 0xb5 } } |
michael@0 | 119 | |
michael@0 | 120 | #define NS_DOWNLOADMANAGER_CID \ |
michael@0 | 121 | { 0xedb0490e, 0x1dd1, 0x11b2, { 0x83, 0xb8, 0xdb, 0xf8, 0xd8, 0x59, 0x06, 0xa6 } } |
michael@0 | 122 | |
michael@0 | 123 | #define NS_DOWNLOADPLATFORM_CID \ |
michael@0 | 124 | { 0x649a14c9, 0xfe5c, 0x48ec, { 0x9c, 0x85, 0x00, 0xca, 0xd9, 0xcc, 0xf3, 0x2e } } |
michael@0 | 125 | |
michael@0 | 126 | // {895DB6C7-DBDF-40ea-9F64-B175033243DC} |
michael@0 | 127 | #define NS_FORMFILLCONTROLLER_CID \ |
michael@0 | 128 | { 0x895db6c7, 0xdbdf, 0x40ea, { 0x9f, 0x64, 0xb1, 0x75, 0x3, 0x32, 0x43, 0xdc } } |
michael@0 | 129 | |
michael@0 | 130 | // {59648a91-5a60-4122-8ff2-54b839c84aed} |
michael@0 | 131 | #define NS_GLOBALHISTORY_CID \ |
michael@0 | 132 | { 0x59648a91, 0x5a60, 0x4122, { 0x8f, 0xf2, 0x54, 0xb8, 0x39, 0xc8, 0x4a, 0xed} } |
michael@0 | 133 | |
michael@0 | 134 | // {59648a91-5a60-4122-8ff2-54b839c84aed} |
michael@0 | 135 | #define NS_PARENTALCONTROLSSERVICE_CID \ |
michael@0 | 136 | { 0x580530e5, 0x118c, 0x4bc7, { 0xab, 0x88, 0xbc, 0x2c, 0xd2, 0xb9, 0x72, 0x23 } } |
michael@0 | 137 | |
michael@0 | 138 | // {e7f70966-9a37-48d7-8aeb-35998f31090e} |
michael@0 | 139 | #define NS_TYPEAHEADFIND_CID \ |
michael@0 | 140 | { 0xe7f70966, 0x9a37, 0x48d7, { 0x8a, 0xeb, 0x35, 0x99, 0x8f, 0x31, 0x09, 0x0e} } |
michael@0 | 141 | |
michael@0 | 142 | // {3d8579f0-75fa-4e00-ba41-38661d5b5d17} |
michael@0 | 143 | #define NS_URLCLASSIFIERPREFIXSET_CID \ |
michael@0 | 144 | { 0x3d8579f0, 0x75fa, 0x4e00, { 0xba, 0x41, 0x38, 0x66, 0x1d, 0x5b, 0x5d, 0x17} } |
michael@0 | 145 | |
michael@0 | 146 | // {8a389f21-f821-4e29-9c6b-3de6f33cd7cf} |
michael@0 | 147 | #define NS_URLCLASSIFIERDBSERVICE_CID \ |
michael@0 | 148 | { 0x8a389f21, 0xf821, 0x4e29, { 0x9c, 0x6b, 0x3d, 0xe6, 0xf3, 0x3c, 0xd7, 0xcf} } |
michael@0 | 149 | |
michael@0 | 150 | // {79e6b710-ce68-4639-ac6b-7d293af424a1} |
michael@0 | 151 | #define NS_URLCLASSIFIERSTREAMUPDATER_CID \ |
michael@0 | 152 | { 0x79e6b710, 0xce68, 0x4639, { 0xac, 0x6b, 0x7d, 0x29, 0x3a, 0xf4, 0x24, 0xa1} } |
michael@0 | 153 | |
michael@0 | 154 | // {b7b2ccec-7912-4ea6-a548-b038447004bd} |
michael@0 | 155 | #define NS_URLCLASSIFIERUTILS_CID \ |
michael@0 | 156 | { 0xb7b2ccec, 0x7912, 0x4ea6, { 0xa5, 0x48, 0xb0, 0x38, 0x44, 0x70, 0x04, 0xbd} } |
michael@0 | 157 | |
michael@0 | 158 | #define NS_NAVHISTORYSERVICE_CID \ |
michael@0 | 159 | { 0x88cecbb7, 0x6c63, 0x4b3b, { 0x8c, 0xd4, 0x84, 0xf3, 0xb8, 0x22, 0x8c, 0x69 } } |
michael@0 | 160 | |
michael@0 | 161 | #define NS_NAVHISTORYRESULTTREEVIEWER_CID \ |
michael@0 | 162 | { 0x2ea8966f, 0x0671, 0x4c02, { 0x9c, 0x70, 0x94, 0x59, 0x56, 0xd4, 0x54, 0x34 } } |
michael@0 | 163 | |
michael@0 | 164 | #define NS_ANNOTATIONSERVICE_CID \ |
michael@0 | 165 | { 0x5e8d4751, 0x1852, 0x434b, { 0xa9, 0x92, 0x2c, 0x6d, 0x2a, 0x25, 0xfa, 0x46 } } |
michael@0 | 166 | |
michael@0 | 167 | #define NS_NAVBOOKMARKSSERVICE_CID \ |
michael@0 | 168 | { 0x9de95a0c, 0x39a4, 0x4d64, {0x9a, 0x53, 0x17, 0x94, 0x0d, 0xd7, 0xca, 0xbb}} |
michael@0 | 169 | |
michael@0 | 170 | #define NS_FAVICONSERVICE_CID \ |
michael@0 | 171 | { 0x984e3259, 0x9266, 0x49cf, { 0xb6, 0x05, 0x60, 0xb0, 0x22, 0xa0, 0x07, 0x56 } } |
michael@0 | 172 | |
michael@0 | 173 | #if defined(USE_MOZ_UPDATER) |
michael@0 | 174 | #define NS_UPDATEPROCESSOR_CID \ |
michael@0 | 175 | { 0xf3dcf644, 0x79e8, 0x4f59, { 0xa1, 0xbb, 0x87, 0x84, 0x54, 0x48, 0x8e, 0xf9 } } |
michael@0 | 176 | #endif |
michael@0 | 177 | |
michael@0 | 178 | #define NS_APPLICATION_REPUTATION_SERVICE_CONTRACTID \ |
michael@0 | 179 | "@mozilla.org/downloads/application-reputation-service;1" |
michael@0 | 180 | |
michael@0 | 181 | #define NS_APPLICATION_REPUTATION_SERVICE_CID \ |
michael@0 | 182 | { 0x8576c950, 0xf4a2, 0x11e2, { 0xb7, 0x78, 0x08, 0x00, 0x20, 0x0c, 0x9a, 0x66 } } |