diff --git a/mozilla/xpfe/appshell/public/nsINativeAppSupport.idl b/mozilla/xpfe/appshell/public/nsINativeAppSupport.idl
index 75db280e05b..c0446fa2c65 100644
--- a/mozilla/xpfe/appshell/public/nsINativeAppSupport.idl
+++ b/mozilla/xpfe/appshell/public/nsINativeAppSupport.idl
@@ -187,5 +187,5 @@ interface nsINativeAppSupport : nsISupports {
     attribute boolean shouldShowUI;
     void startServerMode();
 
-    void onLastWindowClosing(in nsIXULWindow aWindow);
+    void onLastWindowClosing();
 };
diff --git a/mozilla/xpfe/bootstrap/nsNativeAppSupportBase.cpp b/mozilla/xpfe/bootstrap/nsNativeAppSupportBase.cpp
index 6e9b75bfba0..6124df33e30 100644
--- a/mozilla/xpfe/bootstrap/nsNativeAppSupportBase.cpp
+++ b/mozilla/xpfe/bootstrap/nsNativeAppSupportBase.cpp
@@ -130,7 +130,7 @@ nsNativeAppSupportBase::StartServerMode() {
 }
 
 NS_IMETHODIMP
-nsNativeAppSupportBase::OnLastWindowClosing(nsIXULWindow *aWindow) {
+nsNativeAppSupportBase::OnLastWindowClosing() {
     return NS_OK;
 }
 
diff --git a/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp b/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp
index 4ee415dfce3..eddb848ed89 100644
--- a/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp
+++ b/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp
@@ -342,7 +342,7 @@ public:
     NS_IMETHOD Stop( PRBool *aResult );
     NS_IMETHOD Quit();
     NS_IMETHOD StartServerMode();
-    NS_IMETHOD OnLastWindowClosing( nsIXULWindow *aWindow );
+    NS_IMETHOD OnLastWindowClosing();
     NS_IMETHOD SetIsServerMode( PRBool isServerMode );
     NS_IMETHOD EnsureProfile(nsICmdLineService* args);
 
@@ -945,7 +945,7 @@ struct MessageWindow {
                  if ( NS_SUCCEEDED( rv ) )
                      native->SetIsServerMode( PR_FALSE );
                  if ( !win )
-                     appShell->Quit();
+                     appShell->Quit(nsIAppShellService::eAttemptQuit);
              }
              break;
          }
@@ -1798,7 +1798,7 @@ nsNativeAppSupportWin::HandleRequest( LPBYTE request, PRBool newWindow ) {
           nsCOMPtr<nsIDOMWindowInternal> win;
           GetMostRecentWindow( 0, getter_AddRefs( win ) );
           if (!win)
-            appShell->Quit();
+            appShell->Quit(nsIAppShellService::eAttemptQuit);
         }
       }
 
@@ -2540,7 +2540,7 @@ nsNativeAppSupportWin::SetIsServerMode( PRBool isServerMode ) {
 }
 
 NS_IMETHODIMP
-nsNativeAppSupportWin::OnLastWindowClosing( nsIXULWindow *aWindow ) {
+nsNativeAppSupportWin::OnLastWindowClosing() {
 
     if ( !mServerMode )
         return NS_OK;
@@ -2581,7 +2581,7 @@ nsNativeAppSupportWin::OnLastWindowClosing( nsIXULWindow *aWindow ) {
                 nsCOMPtr<nsIAppShellService> appShell =
                     do_GetService( "@mozilla.org/appshell/appShellService;1", &rv);
                 if ( NS_SUCCEEDED( rv ) ) {
-                    appShell->Quit();
+                    appShell->Quit(nsIAppShellService::eAttemptQuit);
                 }
                 return NS_OK;
             }
@@ -2653,7 +2653,7 @@ nsNativeAppSupportWin::OnLastWindowClosing( nsIXULWindow *aWindow ) {
     
         // Turn off turbo mode and quit the application.
         SetIsServerMode( PR_FALSE );
-        appShell->Quit();
+        appShell->Quit(nsIAppShellService::eAttemptQuit);
 
         // Done.  This app will now commence shutdown.
     }
diff --git a/mozilla/xpfe/components/startup/public/nsINativeAppSupport.idl b/mozilla/xpfe/components/startup/public/nsINativeAppSupport.idl
index 75db280e05b..c0446fa2c65 100644
--- a/mozilla/xpfe/components/startup/public/nsINativeAppSupport.idl
+++ b/mozilla/xpfe/components/startup/public/nsINativeAppSupport.idl
@@ -187,5 +187,5 @@ interface nsINativeAppSupport : nsISupports {
     attribute boolean shouldShowUI;
     void startServerMode();
 
-    void onLastWindowClosing(in nsIXULWindow aWindow);
+    void onLastWindowClosing();
 };