From c007797bdf5df54bc5508539582fa72a295f5d0d Mon Sep 17 00:00:00 2001
From: "danm%netscape.com"
 <danm%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 11 Aug 2000 03:44:49 +0000
Subject: [PATCH] sync with nsWebShellWindow.h rev 1.109

git-svn-id: svn://10.0.0.236/trunk@76086 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/xpfe/appshell/src/nsAppShellService.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/mozilla/xpfe/appshell/src/nsAppShellService.cpp b/mozilla/xpfe/appshell/src/nsAppShellService.cpp
index fd3b5527a39..2f05385a9da 100644
--- a/mozilla/xpfe/appshell/src/nsAppShellService.cpp
+++ b/mozilla/xpfe/appshell/src/nsAppShellService.cpp
@@ -536,9 +536,11 @@ nsAppShellService::JustCreateTopWindow(nsIXULWindow *aParent,
   nsWebShellWindow* window;
   PRBool intrinsicallySized;
   PRUint32 zlevel;
+  PRBool contentScrollbars;
 
   *aResult = nsnull;
   intrinsicallySized = PR_FALSE;
+  contentScrollbars = PR_FALSE;
   window = new nsWebShellWindow();
   // Bump count to one so it doesn't die on us while doing init.
   nsCOMPtr<nsIXULWindow> tempRef(window); 
@@ -577,6 +579,9 @@ nsAppShellService::JustCreateTopWindow(nsIXULWindow *aParent,
       }
     }
 
+    if (aChromeMask & nsIWebBrowserChrome::scrollbarsOn)
+      contentScrollbars = PR_TRUE;
+
     zlevel = nsIXULWindow::normalZ;
     if (aChromeMask & nsIWebBrowserChrome::windowRaised)
       zlevel = nsIXULWindow::raisedZ;
@@ -605,7 +610,8 @@ nsAppShellService::JustCreateTopWindow(nsIXULWindow *aParent,
     }
 
     rv = window->Initialize(aParent, mAppShell, aUrl,
-                            aShowWindow, aLoadDefaultPage, zlevel,
+                            aShowWindow, aLoadDefaultPage,
+                            contentScrollbars, zlevel,
                             aInitialWidth, aInitialHeight, widgetInitData);
       
     if (NS_SUCCEEDED(rv)) {