From 508b009b9fdac19a4169cf47ddfd1f4987e93534 Mon Sep 17 00:00:00 2001
From: "tbogard%aol.net" <tbogard%aol.net@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 14 Mar 2000 07:20:17 +0000
Subject: [PATCH] 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.

git-svn-id: svn://10.0.0.236/trunk@62899 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../browser/build/nsWebBrowserModule.cpp          |  8 +++++---
 .../embedding/browser/setup/nsWebBrowserSetup.cpp | 15 ---------------
 .../embedding/browser/setup/nsWebBrowserSetup.h   |  2 --
 .../embedding/browser/webBrowser/nsWebBrowser.cpp | 15 ---------------
 .../embedding/browser/webBrowser/nsWebBrowser.h   |  2 --
 5 files changed, 5 insertions(+), 37 deletions(-)

diff --git a/mozilla/embedding/browser/build/nsWebBrowserModule.cpp b/mozilla/embedding/browser/build/nsWebBrowserModule.cpp
index 89366d25b47..3093395bea7 100644
--- a/mozilla/embedding/browser/build/nsWebBrowserModule.cpp
+++ b/mozilla/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)
 
 
 
diff --git a/mozilla/embedding/browser/setup/nsWebBrowserSetup.cpp b/mozilla/embedding/browser/setup/nsWebBrowserSetup.cpp
index 923111adfee..115909d5d07 100644
--- a/mozilla/embedding/browser/setup/nsWebBrowserSetup.cpp
+++ b/mozilla/embedding/browser/setup/nsWebBrowserSetup.cpp
@@ -37,21 +37,6 @@ 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
 //*****************************************************************************   
diff --git a/mozilla/embedding/browser/setup/nsWebBrowserSetup.h b/mozilla/embedding/browser/setup/nsWebBrowserSetup.h
index 6423bb37e94..e1909cc6b76 100644
--- a/mozilla/embedding/browser/setup/nsWebBrowserSetup.h
+++ b/mozilla/embedding/browser/setup/nsWebBrowserSetup.h
@@ -34,8 +34,6 @@ public:
    
    NS_DECL_NSIWEBBROWSERSETUP
 
-   static NS_METHOD Create(nsISupports* aOuter, const nsIID& aIID, void** ppv);
-
 protected:
    virtual ~nsWebBrowserSetup();
 };
diff --git a/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp b/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp
index 0dea3293299..8d9676ec412 100644
--- a/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp
+++ b/mozilla/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
 //*****************************************************************************   
diff --git a/mozilla/embedding/browser/webBrowser/nsWebBrowser.h b/mozilla/embedding/browser/webBrowser/nsWebBrowser.h
index 638c04c2b57..4d583271198 100644
--- a/mozilla/embedding/browser/webBrowser/nsWebBrowser.h
+++ b/mozilla/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();