diff --git a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp
index b72befb3a4c..baf2856780d 100644
--- a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp
+++ b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp
@@ -767,6 +767,11 @@ void nsWebShellWindow::LoadMenus(nsIDOMDocument * aDOMDoc, nsIWidget * aParentWi
 
 } // nsWebShellWindow::LoadMenus
 
+NS_IMETHODIMP
+nsWebShellWindow::ChildShellAdded(nsIWebShell* aChildShell, nsIContent* frameNode, PRBool& aResult)
+{
+  return NS_OK;
+}
 
 NS_IMETHODIMP 
 nsWebShellWindow::NewWebShell(PRUint32 aChromeMask, PRBool aVisible,
@@ -819,7 +824,7 @@ nsWebShellWindow::SetNewWebShellInfo(const nsString& aName, const nsString& anUR
   *aNewWebShellResult = mWebShell;
 
   // Cache our webshell info.
-  nsWebShellInfo* webShellInfo = new nsWebShellInfo("contentframe", 
+  nsWebShellInfo* webShellInfo = new nsWebShellInfo("content_frame", 
                                                     aName, anURL, aOpenerShell);
 
   if (mContentShells == nsnull)
diff --git a/mozilla/xpfe/appshell/src/nsWebShellWindow.h b/mozilla/xpfe/appshell/src/nsWebShellWindow.h
index c379313196c..6f2447f8c55 100644
--- a/mozilla/xpfe/appshell/src/nsWebShellWindow.h
+++ b/mozilla/xpfe/appshell/src/nsWebShellWindow.h
@@ -84,6 +84,8 @@ public:
                         PRInt32 aStatus);
 
 
+  NS_IMETHOD ChildShellAdded(nsIWebShell* aChildShell, nsIContent* frameNode, PRBool& aResult);
+
   NS_IMETHOD NewWebShell(PRUint32 aChromeMask,
                          PRBool aVisible,
                          nsIWebShell *&aNewWebShell);