| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/chrome_browser_main_extra_parts_x11.h" | 5 #include "chrome/browser/chrome_browser_main_extra_parts_x11.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/debug/debugger.h" | 8 #include "base/debug/debugger.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "chrome/browser/browser_shutdown.h" | 10 #include "chrome/browser/browser_shutdown.h" |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 // to get the error. We can't call shutdown from this thread without | 48 // to get the error. We can't call shutdown from this thread without |
| 49 // tripping an error. Doing it through a function so that we'll be able | 49 // tripping an error. Doing it through a function so that we'll be able |
| 50 // to see it in any crash dumps. | 50 // to see it in any crash dumps. |
| 51 WaitingForUIThreadToHandleIOError(); | 51 WaitingForUIThreadToHandleIOError(); |
| 52 return 0; | 52 return 0; |
| 53 } | 53 } |
| 54 // If there's an IO error it likely means the X server has gone away | 54 // If there's an IO error it likely means the X server has gone away |
| 55 if (!g_in_x11_io_error_handler) { | 55 if (!g_in_x11_io_error_handler) { |
| 56 g_in_x11_io_error_handler = true; | 56 g_in_x11_io_error_handler = true; |
| 57 LOG(ERROR) << "X IO error received (X server probably went away)"; | 57 LOG(ERROR) << "X IO error received (X server probably went away)"; |
| 58 browser_shutdown::SetShuttingDownWithoutClosingBrowsers(true); | |
| 59 chrome::SessionEnding(); | 58 chrome::SessionEnding(); |
| 60 } | 59 } |
| 61 | 60 |
| 62 return 0; | 61 return 0; |
| 63 } | 62 } |
| 64 | 63 |
| 65 int X11EmptyErrorHandler(Display* d, XErrorEvent* error) { | 64 int X11EmptyErrorHandler(Display* d, XErrorEvent* error) { |
| 66 return 0; | 65 return 0; |
| 67 } | 66 } |
| 68 | 67 |
| (...skipping 22 matching lines...) Expand all Loading... |
| 91 // if X exits before us. | 90 // if X exits before us. |
| 92 ui::SetX11ErrorHandlers(BrowserX11ErrorHandler, BrowserX11IOErrorHandler); | 91 ui::SetX11ErrorHandlers(BrowserX11ErrorHandler, BrowserX11IOErrorHandler); |
| 93 } | 92 } |
| 94 | 93 |
| 95 void ChromeBrowserMainExtraPartsX11::PostMainMessageLoopRun() { | 94 void ChromeBrowserMainExtraPartsX11::PostMainMessageLoopRun() { |
| 96 // Unset the X11 error handlers. The X11 error handlers log the errors using a | 95 // Unset the X11 error handlers. The X11 error handlers log the errors using a |
| 97 // |PostTask()| on the message-loop. But since the message-loop is in the | 96 // |PostTask()| on the message-loop. But since the message-loop is in the |
| 98 // process of terminating, this can cause errors. | 97 // process of terminating, this can cause errors. |
| 99 ui::SetX11ErrorHandlers(X11EmptyErrorHandler, X11EmptyIOErrorHandler); | 98 ui::SetX11ErrorHandlers(X11EmptyErrorHandler, X11EmptyIOErrorHandler); |
| 100 } | 99 } |
| OLD | NEW |