The Tor Browser: embedding/browser/build/nsWebBrowserModule.cpp@deefc01c0e14

Integrate friendly tips from Tor colleagues to make (or not) 4.5 alpha 3;
This includes removal of overloaded (but unused) methods, and addition of
a overlooked call to DataStruct::SetData(nsISupports, uint32_t, bool.)

     1 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-

     2  *

     3  * This Source Code Form is subject to the terms of the Mozilla Public

     4  * License, v. 2.0. If a copy of the MPL was not distributed with this

     5  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

     7 #include "mozilla/ModuleUtils.h"

     8 #include "nsIServiceManager.h"

     9 #include "nsXPIDLString.h"

    11 #include "nsEmbedCID.h"

    13 #include "nsWebBrowser.h"

    14 #include "nsCommandHandler.h"

    15 #include "nsWebBrowserContentPolicy.h"

    17 // Factory Constructors

    19 NS_GENERIC_FACTORY_CONSTRUCTOR(nsWebBrowser)

    20 NS_GENERIC_FACTORY_CONSTRUCTOR(nsWebBrowserContentPolicy)

    21 NS_GENERIC_FACTORY_CONSTRUCTOR(nsCommandHandler)

    23 NS_DEFINE_NAMED_CID(NS_WEBBROWSER_CID);

    24 NS_DEFINE_NAMED_CID(NS_COMMANDHANDLER_CID);

    25 NS_DEFINE_NAMED_CID(NS_WEBBROWSERCONTENTPOLICY_CID);

    27 static const mozilla::Module::CIDEntry kWebBrowserCIDs[] = {

    28     { &kNS_WEBBROWSER_CID, false, nullptr, nsWebBrowserConstructor },

    29     { &kNS_COMMANDHANDLER_CID, false, nullptr, nsCommandHandlerConstructor },

    30     { &kNS_WEBBROWSERCONTENTPOLICY_CID, false, nullptr, nsWebBrowserContentPolicyConstructor },

    31     { nullptr }

    32 };

    34 static const mozilla::Module::ContractIDEntry kWebBrowserContracts[] = {

    35     { NS_WEBBROWSER_CONTRACTID, &kNS_WEBBROWSER_CID },

    36     { NS_COMMANDHANDLER_CONTRACTID, &kNS_COMMANDHANDLER_CID },

    37     { NS_WEBBROWSERCONTENTPOLICY_CONTRACTID, &kNS_WEBBROWSERCONTENTPOLICY_CID },

    38     { nullptr }

    39 };

    41 static const mozilla::Module::CategoryEntry kWebBrowserCategories[] = {

    42     { "content-policy", NS_WEBBROWSERCONTENTPOLICY_CONTRACTID, NS_WEBBROWSERCONTENTPOLICY_CONTRACTID },

    43     { nullptr }

    44 };

    46 static const mozilla::Module kWebBrowserModule = {

    47     mozilla::Module::kVersion,

    48     kWebBrowserCIDs,

    49     kWebBrowserContracts,

    50     kWebBrowserCategories

    51 };

    53 NSMODULE_DEFN(Browser_Embedding_Module) = &kWebBrowserModule;

The Tor Browser / file revision

embedding/browser/build/nsWebBrowserModule.cpp@deefc01c0e14

embedding/browser/build/nsWebBrowserModule.cpp