mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-16 06:45:42 +00:00
f582d96b98
This is straightforward, with only two notable things. - `#include "nsXPIDLString.h" is replaced with `#include "nsString.h"` throughout, because all nsXPIDLString.h did was include nsString.h. The exception is for files which already include nsString.h, in which case the patch just removes the nsXPIDLString.h inclusion. - The patch removes the |xpidl_string| gtest, but improves the |voided| test to cover some of its ground, e.g. testing Adopt(nullptr). --HG-- extra : rebase_source : 452cc4a08046a1adb1a8099a7e85a1917de5add8
47 lines
1.7 KiB
C++
47 lines
1.7 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
|
|
#include "mozilla/ModuleUtils.h"
|
|
#include "nsIServiceManager.h"
|
|
#include "nsPermissionManager.h"
|
|
#include "nsPopupWindowManager.h"
|
|
#include "nsICategoryManager.h"
|
|
#include "nsCookiePermission.h"
|
|
#include "nsString.h"
|
|
|
|
// Define the constructor function for the objects
|
|
NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsIPermissionManager,
|
|
nsPermissionManager::GetXPCOMSingleton)
|
|
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPopupWindowManager, Init)
|
|
NS_GENERIC_FACTORY_CONSTRUCTOR(nsCookiePermission)
|
|
|
|
NS_DEFINE_NAMED_CID(NS_PERMISSIONMANAGER_CID);
|
|
NS_DEFINE_NAMED_CID(NS_POPUPWINDOWMANAGER_CID);
|
|
NS_DEFINE_NAMED_CID(NS_COOKIEPERMISSION_CID);
|
|
|
|
|
|
static const mozilla::Module::CIDEntry kCookieCIDs[] = {
|
|
{ &kNS_PERMISSIONMANAGER_CID, false, nullptr, nsIPermissionManagerConstructor },
|
|
{ &kNS_POPUPWINDOWMANAGER_CID, false, nullptr, nsPopupWindowManagerConstructor },
|
|
{ &kNS_COOKIEPERMISSION_CID, false, nullptr, nsCookiePermissionConstructor },
|
|
{ nullptr }
|
|
};
|
|
|
|
static const mozilla::Module::ContractIDEntry kCookieContracts[] = {
|
|
{ NS_PERMISSIONMANAGER_CONTRACTID, &kNS_PERMISSIONMANAGER_CID },
|
|
{ NS_POPUPWINDOWMANAGER_CONTRACTID, &kNS_POPUPWINDOWMANAGER_CID },
|
|
{ NS_COOKIEPERMISSION_CONTRACTID, &kNS_COOKIEPERMISSION_CID },
|
|
{ nullptr }
|
|
};
|
|
|
|
static const mozilla::Module kCookieModule = {
|
|
mozilla::Module::kVersion,
|
|
kCookieCIDs,
|
|
kCookieContracts
|
|
};
|
|
|
|
NSMODULE_DEFN(nsCookieModule) = &kCookieModule;
|