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/location.h" | 9 #include "base/location.h" |
10 #include "base/sequenced_task_runner.h" | 10 #include "base/sequenced_task_runner.h" |
(...skipping 11 matching lines...) Expand all Loading... |
22 // Indicates that we're currently responding to an IO error (by shutting down). | 22 // Indicates that we're currently responding to an IO error (by shutting down). |
23 bool g_in_x11_io_error_handler = false; | 23 bool g_in_x11_io_error_handler = false; |
24 | 24 |
25 // Number of seconds to wait for UI thread to get an IO error if we get it on | 25 // Number of seconds to wait for UI thread to get an IO error if we get it on |
26 // the background thread. | 26 // the background thread. |
27 const int kWaitForUIThreadSeconds = 10; | 27 const int kWaitForUIThreadSeconds = 10; |
28 | 28 |
29 int BrowserX11ErrorHandler(Display* d, XErrorEvent* error) { | 29 int BrowserX11ErrorHandler(Display* d, XErrorEvent* error) { |
30 if (!g_in_x11_io_error_handler) { | 30 if (!g_in_x11_io_error_handler) { |
31 base::SequencedTaskRunnerHandle::Get()->PostTask( | 31 base::SequencedTaskRunnerHandle::Get()->PostTask( |
32 FROM_HERE, base::Bind(&ui::LogErrorEventDescription, d, *error)); | 32 FROM_HERE, base::BindOnce(&ui::LogErrorEventDescription, d, *error)); |
33 } | 33 } |
34 return 0; | 34 return 0; |
35 } | 35 } |
36 | 36 |
37 | 37 |
38 // This function is used to help us diagnose crash dumps that happen | 38 // This function is used to help us diagnose crash dumps that happen |
39 // during the shutdown process. | 39 // during the shutdown process. |
40 NOINLINE void WaitingForUIThreadToHandleIOError() { | 40 NOINLINE void WaitingForUIThreadToHandleIOError() { |
41 // Ensure function isn't optimized away. | 41 // Ensure function isn't optimized away. |
42 asm(""); | 42 asm(""); |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
94 // if X exits before us. | 94 // if X exits before us. |
95 ui::SetX11ErrorHandlers(BrowserX11ErrorHandler, BrowserX11IOErrorHandler); | 95 ui::SetX11ErrorHandlers(BrowserX11ErrorHandler, BrowserX11IOErrorHandler); |
96 } | 96 } |
97 | 97 |
98 void ChromeBrowserMainExtraPartsX11::PostMainMessageLoopRun() { | 98 void ChromeBrowserMainExtraPartsX11::PostMainMessageLoopRun() { |
99 // Unset the X11 error handlers. The X11 error handlers log the errors using a | 99 // Unset the X11 error handlers. The X11 error handlers log the errors using a |
100 // |PostTask()| on the message-loop. But since the message-loop is in the | 100 // |PostTask()| on the message-loop. But since the message-loop is in the |
101 // process of terminating, this can cause errors. | 101 // process of terminating, this can cause errors. |
102 ui::SetX11ErrorHandlers(X11EmptyErrorHandler, X11EmptyIOErrorHandler); | 102 ui::SetX11ErrorHandlers(X11EmptyErrorHandler, X11EmptyIOErrorHandler); |
103 } | 103 } |
OLD | NEW |