Use the generic factory to create the actual objects for the nsWebBrowserSetup and nsWebBrowser classes. Got rid of the unneeded ::Create methods on those classes.

embedding/browser/build/nsWebBrowserModule.cpp

@@ -38,14 +38,16 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsWebBrowserSetup)
 
 static nsModuleComponentInfo components[] =
 {
-  { "WebBrowser Component", NS_WEBBROWSER_CID, NS_WEBBROWSER_PROGID, nsWebBrowser::Create },
-  { "WebBrowserSetup Component", NS_WEBBROWSER_SETUP_CID, NS_WEBBROWSER_SETUP_PROGID, nsWebBrowserSetup::Create }
+   { "WebBrowser Component", NS_WEBBROWSER_CID, 
+      NS_WEBBROWSER_PROGID, nsWebBrowserConstructor },
+   { "WebBrowserSetup Component", NS_WEBBROWSER_SETUP_CID, 
+      NS_WEBBROWSER_SETUP_PROGID, nsWebBrowserSetupConstructor }
 };
 
 
 // NSGetModule implementation.
 
-NS_IMPL_NSGETMODULE("nsWebBrowserModule", components)
+NS_IMPL_NSGETMODULE("Browser Embedding Module", components)
 
 
 

embedding/browser/setup/nsWebBrowserSetup.cpp

@@ -1,87 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Mozilla browser.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications, Inc.  Portions created by Netscape are
- * Copyright (C) 1999, Mozilla.  All Rights Reserved.
- * 
- * Contributor(s):
- *   Travis Bogard <travis@netscape.com>
- */
-
-//#include "nsIComponentManager.h"
-
-#include "nsWebBrowserSetup.h"
-
-//*****************************************************************************
-//***    nsWebBrowserSetup: Object Management
-//*****************************************************************************
-
-nsWebBrowserSetup::nsWebBrowserSetup()
-{
-	NS_INIT_REFCNT();
-}
-
-nsWebBrowserSetup::~nsWebBrowserSetup()
-{
-}
-
-NS_IMETHODIMP nsWebBrowserSetup::Create(nsISupports* aOuter, const nsIID& aIID, 
-	void** ppv)
-{
-	NS_ENSURE_ARG_POINTER(ppv);
-	NS_ENSURE_NO_AGGREGATION(aOuter);
-
-	nsWebBrowserSetup* setup = new  nsWebBrowserSetup();
-	NS_ENSURE_TRUE(setup, NS_ERROR_OUT_OF_MEMORY);
-
-	NS_ADDREF(setup);
-	nsresult rv = setup->QueryInterface(aIID, ppv);
-	NS_RELEASE(setup);
-	return rv;
-}
-
-//*****************************************************************************
-// nsWebBrowser::nsISupports
-//*****************************************************************************   
-
-NS_IMPL_ISUPPORTS1(nsWebBrowserSetup, nsIWebBrowserSetup)
-
-//*****************************************************************************
-// nsWebBrowserSetup::nsIWebBrowserSetup
-//*****************************************************************************   
-
-NS_IMETHODIMP nsWebBrowserSetup::ChangeCurrentUser(const PRUnichar* newUser)
-{
-   NS_ENSURE_ARG(newUser);
-
-   //XXX
-   //Load up the Profile Manager and Change the current user.
-
-   //XXX Implement
-   return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP nsWebBrowserSetup::GetUserList(nsIEnumerator** enumerator)
-{
-   NS_ENSURE_ARG_POINTER(enumerator);
-
-   //XXX
-   // Load up the profile manager and get a list of users.  Create an 
-   // enumeration object to stuff these users into.  Return this object.
-
-   //XXX Implement
-   return NS_ERROR_FAILURE;
-}
-

embedding/browser/setup/nsWebBrowserSetup.h

@@ -1,43 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- * 
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- * 
- * The Original Code is the Mozilla browser.
- * 
- * The Initial Developer of the Original Code is Netscape
- * Communications, Inc.  Portions created by Netscape are
- * Copyright (C) 1999, Mozilla.  All Rights Reserved.
- * 
- * Contributor(s):
- *   Travis Bogard <travis@netscape.com>
- */
-
-#ifndef nsWebBrowserSetup_h__
-#define nsWebBrowserSetup_h__
-
-#include "nsCWebBrowserSetup.h"
-
-class nsWebBrowserSetup : public nsIWebBrowserSetup
-{
-public:
-   nsWebBrowserSetup();
-
-   NS_DECL_ISUPPORTS
-   
-   NS_DECL_NSIWEBBROWSERSETUP
-
-   static NS_METHOD Create(nsISupports* aOuter, const nsIID& aIID, void** ppv);
-
-protected:
-   virtual ~nsWebBrowserSetup();
-};
-
-#endif /* nsWebBrowserSetup_h__ */

embedding/browser/webBrowser/nsWebBrowser.cpp

@@ -66,21 +66,6 @@ nsWebBrowser::~nsWebBrowser()
       }
 }
 
-NS_IMETHODIMP nsWebBrowser::Create(nsISupports* aOuter, const nsIID& aIID, 
-	void** ppv)
-{
-	NS_ENSURE_ARG_POINTER(ppv);
-	NS_ENSURE_NO_AGGREGATION(aOuter);
-
-	nsWebBrowser* browser = new  nsWebBrowser();
-	NS_ENSURE_TRUE(browser, NS_ERROR_OUT_OF_MEMORY);
-
-	NS_ADDREF(browser);
-	nsresult rv = browser->QueryInterface(aIID, ppv);
-	NS_RELEASE(browser);  
-	return rv;
-}
-
 //*****************************************************************************
 // nsWebBrowser::nsISupports
 //*****************************************************************************   

embedding/browser/webBrowser/nsWebBrowser.h

@@ -82,8 +82,6 @@ public:
    NS_DECL_NSIWEBNAVIGATION
    NS_DECL_NSIWEBPROGRESS
 
-   static NS_METHOD Create(nsISupports* aOuter, const nsIID& aIID, void** ppv);
-
 protected:
    virtual ~nsWebBrowser();