| 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" | |
| 11 #include "chrome/browser/lifetime/application_lifetime.h" | 10 #include "chrome/browser/lifetime/application_lifetime.h" |
| 12 #include "chrome/common/chrome_result_codes.h" | 11 #include "chrome/common/chrome_result_codes.h" |
| 13 #include "content/public/browser/browser_thread.h" | 12 #include "content/public/browser/browser_thread.h" |
| 14 #include "ui/base/x/x11_util.h" | 13 #include "ui/base/x/x11_util.h" |
| 15 #include "ui/base/x/x11_util_internal.h" | 14 #include "ui/base/x/x11_util_internal.h" |
| 16 | 15 |
| 17 using content::BrowserThread; | 16 using content::BrowserThread; |
| 18 | 17 |
| 19 namespace { | 18 namespace { |
| 20 | 19 |
| (...skipping 27 matching lines...) Expand all Loading... |
| 48 // to get the error. We can't call shutdown from this thread without | 47 // 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 | 48 // tripping an error. Doing it through a function so that we'll be able |
| 50 // to see it in any crash dumps. | 49 // to see it in any crash dumps. |
| 51 WaitingForUIThreadToHandleIOError(); | 50 WaitingForUIThreadToHandleIOError(); |
| 52 return 0; | 51 return 0; |
| 53 } | 52 } |
| 54 // If there's an IO error it likely means the X server has gone away | 53 // If there's an IO error it likely means the X server has gone away |
| 55 if (!g_in_x11_io_error_handler) { | 54 if (!g_in_x11_io_error_handler) { |
| 56 g_in_x11_io_error_handler = true; | 55 g_in_x11_io_error_handler = true; |
| 57 LOG(ERROR) << "X IO error received (X server probably went away)"; | 56 LOG(ERROR) << "X IO error received (X server probably went away)"; |
| 58 browser_shutdown::SetShuttingDownWithoutClosingBrowsers(true); | |
| 59 chrome::SessionEnding(); | 57 chrome::SessionEnding(); |
| 60 } | 58 } |
| 61 | 59 |
| 62 return 0; | 60 return 0; |
| 63 } | 61 } |
| 64 | 62 |
| 65 int X11EmptyErrorHandler(Display* d, XErrorEvent* error) { | 63 int X11EmptyErrorHandler(Display* d, XErrorEvent* error) { |
| 66 return 0; | 64 return 0; |
| 67 } | 65 } |
| 68 | 66 |
| (...skipping 22 matching lines...) Expand all Loading... |
| 91 // if X exits before us. | 89 // if X exits before us. |
| 92 ui::SetX11ErrorHandlers(BrowserX11ErrorHandler, BrowserX11IOErrorHandler); | 90 ui::SetX11ErrorHandlers(BrowserX11ErrorHandler, BrowserX11IOErrorHandler); |
| 93 } | 91 } |
| 94 | 92 |
| 95 void ChromeBrowserMainExtraPartsX11::PostMainMessageLoopRun() { | 93 void ChromeBrowserMainExtraPartsX11::PostMainMessageLoopRun() { |
| 96 // Unset the X11 error handlers. The X11 error handlers log the errors using a | 94 // 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 | 95 // |PostTask()| on the message-loop. But since the message-loop is in the |
| 98 // process of terminating, this can cause errors. | 96 // process of terminating, this can cause errors. |
| 99 ui::SetX11ErrorHandlers(X11EmptyErrorHandler, X11EmptyIOErrorHandler); | 97 ui::SetX11ErrorHandlers(X11EmptyErrorHandler, X11EmptyIOErrorHandler); |
| 100 } | 98 } |
| OLD | NEW |