3 files changed, 5 insertions, 20 deletions
diff --git a/xpfe/appshell/nsAppShellService.cpp b/xpfe/appshell/nsAppShellService.cpp
index 1ac989aaa3..06f2476c25 100644
--- a/xpfe/appshell/nsAppShellService.cpp
+++ b/xpfe/appshell/nsAppShellService.cpp
@@ -579,26 +579,11 @@ nsresult nsAppShellService::JustCreateTopWindow(
       !!(aChromeMask & nsIWebBrowserChrome::CHROME_ALERT) &&
       widgetInitData.mWindowType == widget::WindowType::Dialog;
 
-#ifdef XP_MACOSX
-  // Mac OS X sheet support
-  // Adding CHROME_OPENAS_CHROME to sheetMask makes modal windows opened from
-  // nsGlobalWindow::ShowModalDialog() be dialogs (not sheets), while modal
-  // windows opened from nsPromptService::DoDialog() still are sheets.  This
-  // fixes bmo bug 395465 (see nsCocoaWindow::StandardCreate() and
-  // nsCocoaWindow::SetModal()).
-  uint32_t sheetMask = nsIWebBrowserChrome::CHROME_OPENAS_DIALOG |
-                       nsIWebBrowserChrome::CHROME_MODAL |
-                       nsIWebBrowserChrome::CHROME_OPENAS_CHROME;
-  if (parent && (parent != mHiddenWindow) &&
-      ((aChromeMask & sheetMask) == sheetMask)) {
-    widgetInitData.mWindowType = widget::WindowType::Sheet;
-  }
-#endif
-
 #if defined(XP_WIN)
   if (widgetInitData.mWindowType == widget::WindowType::TopLevel ||
-      widgetInitData.mWindowType == widget::WindowType::Dialog)
+      widgetInitData.mWindowType == widget::WindowType::Dialog) {
     widgetInitData.mClipChildren = true;
+  }
 #endif
 
   // note default chrome overrides other OS chrome settings, but
diff --git a/xpfe/appshell/nsIAppShellService.idl b/xpfe/appshell/nsIAppShellService.idl
index d8de8ae149..3f793c4ec8 100644
--- a/xpfe/appshell/nsIAppShellService.idl
+++ b/xpfe/appshell/nsIAppShellService.idl
@@ -52,7 +52,7 @@ interface nsIAppShellService : nsISupports
    * @param aChromeMask Used to specify chrome flags that should be set on the
    *                    window. See nsIWebBrowserChrome for flag definitions.
    */
-  nsIWindowlessBrowser createWindowlessBrowser([optional] in bool aIsChrome,
+  nsIWindowlessBrowser createWindowlessBrowser([optional] in boolean aIsChrome,
                                                [optional] in uint32_t aChromeMask);
 
   [noscript]
@@ -123,6 +123,6 @@ interface nsIAppShellService : nsISupports
    * is already enabled has no effect.
    * @return true if tracking succeeded.
    */
-  bool startEventLoopLagTracking();
+  boolean startEventLoopLagTracking();
   void stopEventLoopLagTracking();
 };
diff --git a/xpfe/appshell/nsIAppWindow.idl b/xpfe/appshell/nsIAppWindow.idl
index 3c3229071a..d373043bac 100644
--- a/xpfe/appshell/nsIAppWindow.idl
+++ b/xpfe/appshell/nsIAppWindow.idl
@@ -101,7 +101,7 @@ interface nsIAppWindow : nsISupports
    * Locks the aspect ratio for a window.
    * @param aShouldLock boolean
    */
-  void lockAspectRatio(in bool aShouldLock);
+  void lockAspectRatio(in boolean aShouldLock);
 
   const unsigned long lowestZ = 0;
   const unsigned long loweredZ = 4;  /* "alwaysLowered" attribute */