Changes to support different methods on the webshellcontainer interface.

webshell/embed/ActiveX/WebShellContainer.cpp

@@ -260,47 +260,7 @@ CWebShellContainer::FocusAvailable(nsIWebShell* aFocusedWebShell, PRBool& aFocus
 
 
 NS_IMETHODIMP
-CWebShellContainer::CanCreateNewWebShell(PRBool& aResult)
-{		
-	aResult = PR_FALSE;
-	nsresult rv = NS_OK;
-	return rv;
-}
-
-
-NS_IMETHODIMP
-CWebShellContainer::SetNewWebShellInfo(const nsString& aName, const nsString& anURL,
-							nsIWebShell* aOpenerShell, PRUint32 aChromeMask,
-							nsIWebShell** aNewShell, nsIWebShell** anInnerShell)
-{
-	nsresult rv = NS_ERROR_FAILURE;
-
-	CIPtr(IDispatch) cpDispNew;
-	VARIANT_BOOL bCancel = VARIANT_FALSE;
-	m_pEvents2->Fire_NewWindow2(&cpDispNew, &bCancel);
-
-	if (bCancel == VARIANT_FALSE && cpDispNew)
-	{
-		CIPtr(IWebBrowser2) cpOther = cpDispNew;
-		if (cpDispNew)
-		{
-			BSTR bstrURL = SysAllocString(anURL);
-			CComVariant vURL(bstrURL);
-			VARIANT vNull;
-			vNull.vt = VT_NULL;
-			cpOther->Navigate2(&vURL, &vNull, &vNull, &vNull, &vNull);
-			SysFreeString(bstrURL);
-		}
-
-		rv = NS_OK;
-	}
-
-	return rv;
-}
-
-
-NS_IMETHODIMP
-CWebShellContainer::ChildShellAdded(nsIWebShell** aChildShell, nsIContent* frameNode)
+CWebShellContainer::ContentShellAdded(nsIWebShell* aWebShell, nsIContent* frameNode)
 {
 	nsresult rv = NS_OK;
 	return rv;

webshell/embed/ActiveX/WebShellContainer.h

@@ -54,11 +54,7 @@ public:
                          nsIWebShell *&aNewWebShell);
 	NS_IMETHOD FindWebShellWithName(const PRUnichar* aName, nsIWebShell*& aResult);
 	NS_IMETHOD FocusAvailable(nsIWebShell* aFocusedWebShell, PRBool& aFocusTaken);
-	NS_IMETHOD CanCreateNewWebShell(PRBool& aResult);
-    NS_IMETHOD SetNewWebShellInfo(const nsString& aName, const nsString& anURL, 
-							nsIWebShell* aOpenerShell, PRUint32 aChromeMask,
-							nsIWebShell** aNewShell, nsIWebShell** anInnerShell);
-    NS_IMETHOD ChildShellAdded(nsIWebShell** aChildShell, nsIContent* frameNode);
+	NS_IMETHOD ContentShellAdded(nsIWebShell* aWebShell, nsIContent* frameNode);
 
 	// nsIStreamObserver
     NS_IMETHOD OnStartBinding(nsIURL* aURL, const char *aContentType);