Allow overriding of X error functions

chrome/browser/browser_list.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/browser_list.h"
 
 #include "base/histogram.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "build/build_config.h"
@@ skipping 205 matching lines @@
 void BrowserList::AddObserver(BrowserList::Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 // static
 void BrowserList::RemoveObserver(BrowserList::Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 // static
-void BrowserList::CloseAllBrowsers(bool use_post) {
+void BrowserList::CloseAllBrowsers() {
+  bool session_ending =
+      browser_shutdown::GetShutdownType() == browser_shutdown::END_SESSION;
+  bool use_post = !session_ending;
+  bool force_exit = false;
+#if defined(USE_X11)
+  if (session_ending)
+    force_exit = true;
+#endif
   // Tell everyone that we are shutting down.
   browser_shutdown::SetTryingToQuit(true);
 
   // Before we close the browsers shutdown all session services. That way an
   // exit can restore all browsers open before exiting.
   ProfileManager::ShutdownSessionServices();
 
   // If there are no browsers, send the APP_TERMINATING action here. Otherwise,
   // it will be sent by RemoveBrowser() when the last browser has closed.
-  if (browsers_.empty()) {
+  if (force_exit || browsers_.empty()) {
     NotificationService::current()->Notify(NotificationType::APP_TERMINATING,
                                            NotificationService::AllSources(),
                                            NotificationService::NoDetails());
     AllBrowsersClosedAndAppExiting();
     return;
   }
   for (BrowserList::const_iterator i = BrowserList::begin();
        i != BrowserList::end();) {
     if (use_post) {
       (*i)->window()->Close();
@@ skipping 22 matching lines @@
 
 // static
 void BrowserList::CloseAllBrowsersAndExit() {
   NotificationService::current()->Notify(
       NotificationType::APP_EXITING,
       NotificationService::AllSources(),
       NotificationService::NoDetails());
 
 #if !defined(OS_MACOSX)
   // On most platforms, closing all windows causes the application to exit.
-  CloseAllBrowsers(true);
+  CloseAllBrowsers();
 #else
   // On the Mac, the application continues to run once all windows are closed.
-  // Terminate will result in a CloseAllBrowsers(true) call, and once (and if)
+  // Terminate will result in a CloseAllBrowsers() call, and once (and if)
   // that is done, will cause the application to exit cleanly.
   chrome_browser_application_mac::Terminate();
 #endif
 }
 
 // static
 void BrowserList::WindowsSessionEnding() {
   // EndSession is invoked once per frame. Only do something the first time.
   static bool already_ended = false;
   if (already_ended)
     return;
   already_ended = true;
 
   browser_shutdown::OnShutdownStarting(browser_shutdown::END_SESSION);
 
   NotificationService::current()->Notify(
       NotificationType::APP_EXITING,
       NotificationService::AllSources(),
       NotificationService::NoDetails());
 
   // Write important data first.
   g_browser_process->EndSession();
 
-  // Close all the browsers.
-  BrowserList::CloseAllBrowsers(false);
+  BrowserList::CloseAllBrowsers();
 
   // Send out notification. This is used during testing so that the test harness
   // can properly shutdown before we exit.
   NotificationService::current()->Notify(
       NotificationType::SESSION_END,
       NotificationService::AllSources(),
       NotificationService::NoDetails());
 
   // And shutdown.
   browser_shutdown::Shutdown();
 
 #if defined(OS_WIN)
   // At this point the message loop is still running yet we've shut everything
   // down. If any messages are processed we'll likely crash. Exit now.
   ExitProcess(ResultCodes::NORMAL_EXIT);
+#elif defined(OS_LINUX)
+  _exit(ResultCodes::NORMAL_EXIT);
 #else
   NOTIMPLEMENTED();
 #endif
 }
 
 // static
 bool BrowserList::HasBrowserWithProfile(Profile* profile) {
   return FindBrowserMatching(BrowserList::begin(),
                              BrowserList::end(),
                              profile, Browser::TYPE_ANY,
@@ skipping 18 matching lines @@
   DCHECK(keep_alive_count_ > 0);
   keep_alive_count_--;
   // Allow the app to shutdown again.
   if (!WillKeepAlive()) {
     g_browser_process->ReleaseModule();
     // If there are no browsers open and we aren't already shutting down,
     // initiate a shutdown. Also skips shutdown if this is a unit test
     // (MessageLoop::current() == null).
     if (browsers_.empty() && !browser_shutdown::IsTryingToQuit() &&
         MessageLoop::current())
-      CloseAllBrowsers(true);
+      CloseAllBrowsers();
   }
 }
 
 // static
 bool BrowserList::WillKeepAlive() {
   return keep_alive_count_ > 0;
 }
 
 // static
 BrowserList::BrowserVector BrowserList::last_active_browsers_;
@@ skipping 135 matching lines @@
     }
 
     TabContents* next_tab =
         (*browser_iterator_)->GetTabContentsAt(web_view_index_);
     if (next_tab) {
       cur_ = next_tab;
       return;
     }
   }
 }