forked from mirrors/gecko-dev
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
53 lines
1.8 KiB
C++
53 lines
1.8 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* 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 "nsString.h"
|
|
|
|
#include "nsEmbedCID.h"
|
|
|
|
#include "nsWebBrowser.h"
|
|
#include "nsCommandHandler.h"
|
|
#include "nsWebBrowserContentPolicy.h"
|
|
|
|
// Factory Constructors
|
|
|
|
NS_GENERIC_FACTORY_CONSTRUCTOR(nsWebBrowser)
|
|
NS_GENERIC_FACTORY_CONSTRUCTOR(nsWebBrowserContentPolicy)
|
|
NS_GENERIC_FACTORY_CONSTRUCTOR(nsCommandHandler)
|
|
|
|
NS_DEFINE_NAMED_CID(NS_WEBBROWSER_CID);
|
|
NS_DEFINE_NAMED_CID(NS_COMMANDHANDLER_CID);
|
|
NS_DEFINE_NAMED_CID(NS_WEBBROWSERCONTENTPOLICY_CID);
|
|
|
|
static const mozilla::Module::CIDEntry kWebBrowserCIDs[] = {
|
|
{ &kNS_WEBBROWSER_CID, false, nullptr, nsWebBrowserConstructor },
|
|
{ &kNS_COMMANDHANDLER_CID, false, nullptr, nsCommandHandlerConstructor },
|
|
{ &kNS_WEBBROWSERCONTENTPOLICY_CID, false, nullptr, nsWebBrowserContentPolicyConstructor },
|
|
{ nullptr }
|
|
};
|
|
|
|
static const mozilla::Module::ContractIDEntry kWebBrowserContracts[] = {
|
|
{ NS_WEBBROWSER_CONTRACTID, &kNS_WEBBROWSER_CID },
|
|
{ NS_COMMANDHANDLER_CONTRACTID, &kNS_COMMANDHANDLER_CID },
|
|
{ NS_WEBBROWSERCONTENTPOLICY_CONTRACTID, &kNS_WEBBROWSERCONTENTPOLICY_CID },
|
|
{ nullptr }
|
|
};
|
|
|
|
static const mozilla::Module::CategoryEntry kWebBrowserCategories[] = {
|
|
{ "content-policy", NS_WEBBROWSERCONTENTPOLICY_CONTRACTID, NS_WEBBROWSERCONTENTPOLICY_CONTRACTID },
|
|
{ nullptr }
|
|
};
|
|
|
|
static const mozilla::Module kWebBrowserModule = {
|
|
mozilla::Module::kVersion,
|
|
kWebBrowserCIDs,
|
|
kWebBrowserContracts,
|
|
kWebBrowserCategories
|
|
};
|
|
|
|
NSMODULE_DEFN(Browser_Embedding_Module) = &kWebBrowserModule;
|