зеркало из https://github.com/mozilla/gecko-dev.git
Bug 568691 - Mac-specific changes to binary components.
This commit is contained in:
Родитель
c89bc5321c
Коммит
99e38c7ab4
|
@ -36,7 +36,7 @@
|
|||
|
||||
#include "nsAlertsService.h"
|
||||
#include "nsToolkitCompsCID.h"
|
||||
#include "nsIGenericFactory.h"
|
||||
#include "mozilla/ModuleUtils.h"
|
||||
#include "nsCOMPtr.h"
|
||||
#include "nsIServiceManager.h"
|
||||
#include "nsServiceManagerUtils.h"
|
||||
|
@ -44,13 +44,22 @@
|
|||
#include "nsMemory.h"
|
||||
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsAlertsService, Init)
|
||||
NS_DEFINE_NAMED_CID(NS_ALERTSSERVICE_CID);
|
||||
|
||||
static const nsModuleComponentInfo components[] =
|
||||
{
|
||||
{ "Alerts Service",
|
||||
NS_ALERTSSERVICE_CID,
|
||||
NS_ALERTSERVICE_CONTRACTID,
|
||||
nsAlertsServiceConstructor },
|
||||
static const mozilla::Module::CIDEntry kAlertsCIDs[] = {
|
||||
{ &kNS_ALERTSSERVICE_CID, false, NULL, nsAlertsServiceConstructor },
|
||||
{ NULL }
|
||||
};
|
||||
|
||||
NS_IMPL_NSGETMODULE(nsAlertsServiceModule, components)
|
||||
static const mozilla::Module::ContractIDEntry kAlertsContracts[] = {
|
||||
{ NS_ALERTSERVICE_CONTRACTID, &kNS_ALERTSSERVICE_CID },
|
||||
{ NULL }
|
||||
};
|
||||
|
||||
static const mozilla::Module kAlertsModule = {
|
||||
mozilla::Module::kVersion,
|
||||
kAlertsCIDs,
|
||||
kAlertsContracts
|
||||
};
|
||||
|
||||
NSMODULE_DEFN(nsAlertsServiceModule) = &kAlertsModule;
|
||||
|
|
|
@ -47,7 +47,7 @@
|
|||
#import <SystemConfiguration/SystemConfiguration.h>
|
||||
|
||||
#include "nsISystemProxySettings.h"
|
||||
#include "nsIGenericFactory.h"
|
||||
#include "mozilla/ModuleUtils.h"
|
||||
#include "nsIServiceManager.h"
|
||||
#include "nsPrintfCString.h"
|
||||
#include "nsNetUtil.h"
|
||||
|
@ -372,12 +372,22 @@ nsOSXSystemProxySettings::GetProxyForURI(nsIURI* aURI, nsACString& aResult)
|
|||
{ 0x8f, 0x1f, 0x3b, 0xf0, 0xd3, 0xcf, 0x67, 0xde } }
|
||||
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsOSXSystemProxySettings, Init);
|
||||
NS_DEFINE_NAMED_CID(NS_OSXSYSTEMPROXYSERVICE_CID);
|
||||
|
||||
static const nsModuleComponentInfo components[] = {
|
||||
{ "OSX System Proxy Settings Service",
|
||||
NS_OSXSYSTEMPROXYSERVICE_CID,
|
||||
NS_SYSTEMPROXYSETTINGS_CONTRACTID,
|
||||
nsOSXSystemProxySettingsConstructor }
|
||||
static const mozilla::Module::CIDEntry kOSXSysProxyCIDs[] = {
|
||||
{ &kNS_OSXSYSTEMPROXYSERVICE_CID, false, NULL, nsOSXSystemProxySettingsConstructor },
|
||||
{ NULL }
|
||||
};
|
||||
|
||||
NS_IMPL_NSGETMODULE(nsOSXProxyModule, components)
|
||||
static const mozilla::Module::ContractIDEntry kOSXSysProxyContracts[] = {
|
||||
{ NS_SYSTEMPROXYSETTINGS_CONTRACTID, &kNS_OSXSYSTEMPROXYSERVICE_CID },
|
||||
{ NULL }
|
||||
};
|
||||
|
||||
static const mozilla::Module kOSXSysProxyModule = {
|
||||
mozilla::Module::kVersion,
|
||||
kOSXSysProxyCIDs,
|
||||
kOSXSysProxyContracts
|
||||
};
|
||||
|
||||
NSMODULE_DEFN(nsOSXProxyModule) = &kOSXSysProxyModule;
|
||||
|
|
Загрузка…
Ссылка в новой задаче