Thu, 22 Jan 2015 13:21:57 +0100
Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6
michael@0 | 1 | /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
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 | #include "mozilla/ModuleUtils.h" |
michael@0 | 7 | |
michael@0 | 8 | #include "nsEntropyCollector.h" |
michael@0 | 9 | #include "nsSecureBrowserUIImpl.h" |
michael@0 | 10 | #include "nsSecurityWarningDialogs.h" |
michael@0 | 11 | #include "nsSiteSecurityService.h" |
michael@0 | 12 | |
michael@0 | 13 | NS_GENERIC_FACTORY_CONSTRUCTOR(nsEntropyCollector) |
michael@0 | 14 | NS_GENERIC_FACTORY_CONSTRUCTOR(nsSecureBrowserUIImpl) |
michael@0 | 15 | NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSecurityWarningDialogs, Init) |
michael@0 | 16 | NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSiteSecurityService, Init) |
michael@0 | 17 | |
michael@0 | 18 | NS_DEFINE_NAMED_CID(NS_ENTROPYCOLLECTOR_CID); |
michael@0 | 19 | NS_DEFINE_NAMED_CID(NS_SECURITYWARNINGDIALOGS_CID); |
michael@0 | 20 | NS_DEFINE_NAMED_CID(NS_SECURE_BROWSER_UI_CID); |
michael@0 | 21 | NS_DEFINE_NAMED_CID(NS_SITE_SECURITY_SERVICE_CID); |
michael@0 | 22 | |
michael@0 | 23 | static const mozilla::Module::CIDEntry kBOOTCIDs[] = { |
michael@0 | 24 | { &kNS_ENTROPYCOLLECTOR_CID, false, nullptr, nsEntropyCollectorConstructor }, |
michael@0 | 25 | { &kNS_SECURITYWARNINGDIALOGS_CID, false, nullptr, nsSecurityWarningDialogsConstructor }, |
michael@0 | 26 | { &kNS_SECURE_BROWSER_UI_CID, false, nullptr, nsSecureBrowserUIImplConstructor }, |
michael@0 | 27 | { &kNS_SITE_SECURITY_SERVICE_CID, false, nullptr, nsSiteSecurityServiceConstructor }, |
michael@0 | 28 | { nullptr } |
michael@0 | 29 | }; |
michael@0 | 30 | |
michael@0 | 31 | static const mozilla::Module::ContractIDEntry kBOOTContracts[] = { |
michael@0 | 32 | { NS_ENTROPYCOLLECTOR_CONTRACTID, &kNS_ENTROPYCOLLECTOR_CID }, |
michael@0 | 33 | { NS_SECURITYWARNINGDIALOGS_CONTRACTID, &kNS_SECURITYWARNINGDIALOGS_CID }, |
michael@0 | 34 | { NS_SECURE_BROWSER_UI_CONTRACTID, &kNS_SECURE_BROWSER_UI_CID }, |
michael@0 | 35 | { NS_SSSERVICE_CONTRACTID, &kNS_SITE_SECURITY_SERVICE_CID }, |
michael@0 | 36 | { nullptr } |
michael@0 | 37 | }; |
michael@0 | 38 | |
michael@0 | 39 | static const mozilla::Module kBootModule = { |
michael@0 | 40 | mozilla::Module::kVersion, |
michael@0 | 41 | kBOOTCIDs, |
michael@0 | 42 | kBOOTContracts |
michael@0 | 43 | }; |
michael@0 | 44 | |
michael@0 | 45 | NSMODULE_DEFN(BOOT) = &kBootModule; |