Bugzilla Bug 76339�get rid of nsIAppShellComponent

(QNX changes)
r=dbradley sr=jst

embedding/browser/photon/src/nsUnknownContentTypeHandler.cpp

@@ -38,7 +38,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsUnknownContentTypeHandler.h"
-
+#include "nsIGenericFactory.h"
 #include "nsIDOMWindowInternal.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsIInterfaceRequestorUtils.h"
@@ -190,15 +190,6 @@ NS_IMETHODIMP nsWebProgressListener::OnSecurityChange(nsIWebProgress *aWebProgre
 
 //#######################################################################################
 
-
-
-/* Define instance counter implementation stuff. */
-NS_DEFINE_MODULE_INSTANCE_COUNTER()
-
-/* Define component globals. */
-NS_DEFINE_COMPONENT_GLOBALS()
-
-
 #define className             nsUnknownContentTypeHandler
 #define interfaceName         nsIHelperAppLauncherDialog
 #define contractId            NS_IUNKNOWNCONTENTTYPEHANDLER_CONTRACTID
@@ -222,10 +213,6 @@ NS_IMETHODIMP className::QueryInterface( REFNSIID anIID, void **anInstancePtr )
 			*anInstancePtr = (void*) (nsIHelperAppLauncherDialog*)this; 
 			NS_ADDREF_THIS();
 			}
-		else if ( anIID.Equals( NS_GET_IID(nsIAppShellComponent) ) ) { 
-			*anInstancePtr = (void*) ( (nsIAppShellComponent*)this ); 
-			NS_ADDREF_THIS();
-			}
 		else if ( anIID.Equals( NS_GET_IID(nsISupports) ) ) { 
 			*anInstancePtr = (void*) ( (nsISupports*) (interfaceName*)this ); 
 			NS_ADDREF_THIS();
@@ -235,25 +222,8 @@ NS_IMETHODIMP className::QueryInterface( REFNSIID anIID, void **anInstancePtr )
 	return rv; 
 	}
 
-
- 
-/* Component's implementation of Initialize. */
-NS_IMETHODIMP className::Initialize( nsIAppShellService *anAppShell, nsICmdLineService  *aCmdLineService ) {
-	return NS_OK;
-	}
- 
-/* Component's implementation of Shutdown. */
-NS_IMETHODIMP className::Shutdown() { 
-	return NS_OK;
-	} 
-
-NS_IMPL_IAPPSHELLCOMPONENTIMPL_CTORDTOR( className ) 
-
- 
 NS_GENERIC_FACTORY_CONSTRUCTOR( nsUnknownContentTypeHandler )
 
-
-
 // The list of components we register
 static nsModuleComponentInfo info[] = {
 	"nsUnknownContentTypeHandler",

embedding/browser/photon/src/nsUnknownContentTypeHandler.h

@@ -2,7 +2,6 @@
 #define NSUNKNOWNCONTENTTYPEHANDLER_EMB
 
 #include "nsIHelperAppLauncherDialog.h"
-#include "nsIAppShellComponentImpl.h"
 #include "nsIExternalHelperAppService.h"
 #include "nsIWebProgressListener.h"
 #include "nsIWebBrowserPersist.h"
@@ -13,8 +12,7 @@
 
 static NS_DEFINE_CID( kCID, NS_IHELPERAPPLAUNCHERDIALOG_IID );
 
-class nsUnknownContentTypeHandler : public nsIHelperAppLauncherDialog,
-																		public nsAppShellComponentImpl {
+class nsUnknownContentTypeHandler : public nsIHelperAppLauncherDialog {
 
 public:
 
@@ -26,9 +24,6 @@ public:
     // This class implements the nsISupports interface functions.
     NS_DECL_ISUPPORTS
 
-    // This class implements the nsIAppShellComponent interface functions.
-    NS_DECL_NSIAPPSHELLCOMPONENT
-
     // This class implements the nsIHelperAppLauncherDialog interface functions.
     NS_DECL_NSIHELPERAPPLAUNCHERDIALOG