From ec97d88f7da901ff54c96b28511cfd604350c419 Mon Sep 17 00:00:00 2001 From: "mscott%netscape.com" Date: Tue, 18 Apr 2000 02:45:00 +0000 Subject: [PATCH] Bug #36119 --> implement DoContent for nsBrowserInstance. This broke over the weekend and caused us to fail to load browser urls in a current browser window from the mail window. git-svn-id: svn://10.0.0.236/trunk@66240 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpfe/browser/src/nsBrowserInstance.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mozilla/xpfe/browser/src/nsBrowserInstance.cpp b/mozilla/xpfe/browser/src/nsBrowserInstance.cpp index cedcfe2d8df..311dd6b269b 100644 --- a/mozilla/xpfe/browser/src/nsBrowserInstance.cpp +++ b/mozilla/xpfe/browser/src/nsBrowserInstance.cpp @@ -1390,8 +1390,11 @@ NS_IMETHODIMP nsBrowserInstance::DoContent(const char *aContentType, nsURILoadCommand aCommand, const char *aWindowTarget, nsIChannel *aChannel, nsIStreamListener **aContentHandler, PRBool *aAbortProcess) { - NS_ERROR("This shouldn't be getting called"); - return NS_ERROR_FAILURE; + // forward the DoContent call to our content area webshell + nsCOMPtr ctnListener (do_GetInterface(mContentAreaDocShell)); + if (ctnListener) + return ctnListener->DoContent(aContentType, aCommand, aWindowTarget, aChannel, aContentHandler, aAbortProcess); + return NS_OK; } NS_IMETHODIMP