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/command_line.h" | |
9 #include "base/debug/debugger.h" | 8 #include "base/debug/debugger.h" |
10 #include "base/location.h" | 9 #include "base/location.h" |
11 #include "base/sequenced_task_runner.h" | 10 #include "base/sequenced_task_runner.h" |
12 #include "base/strings/string_number_conversions.h" | |
13 #include "base/threading/sequenced_task_runner_handle.h" | 11 #include "base/threading/sequenced_task_runner_handle.h" |
14 #include "chrome/browser/lifetime/application_lifetime.h" | 12 #include "chrome/browser/lifetime/application_lifetime.h" |
15 #include "chrome/common/chrome_result_codes.h" | 13 #include "chrome/common/chrome_result_codes.h" |
16 #include "chrome/common/chrome_switches.h" | |
17 #include "content/public/browser/browser_thread.h" | 14 #include "content/public/browser/browser_thread.h" |
18 #include "ui/base/x/x11_util.h" | 15 #include "ui/base/x/x11_util.h" |
19 #include "ui/base/x/x11_util_internal.h" | 16 #include "ui/base/x/x11_util_internal.h" |
20 #include "ui/events/platform/x11/x11_event_source.h" | |
21 | 17 |
22 using content::BrowserThread; | 18 using content::BrowserThread; |
23 | 19 |
24 namespace { | 20 namespace { |
25 | 21 |
26 // 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). |
27 bool g_in_x11_io_error_handler = false; | 23 bool g_in_x11_io_error_handler = false; |
28 | 24 |
29 // 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 |
30 // the background thread. | 26 // the background thread. |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
90 // startup. They simply print error messages and exit because | 86 // startup. They simply print error messages and exit because |
91 // we can't shutdown properly while creating and initializing services. | 87 // we can't shutdown properly while creating and initializing services. |
92 ui::SetX11ErrorHandlers(NULL, NULL); | 88 ui::SetX11ErrorHandlers(NULL, NULL); |
93 } | 89 } |
94 | 90 |
95 void ChromeBrowserMainExtraPartsX11::PostMainMessageLoopStart() { | 91 void ChromeBrowserMainExtraPartsX11::PostMainMessageLoopStart() { |
96 // Installs the X11 error handlers for the browser process after the | 92 // Installs the X11 error handlers for the browser process after the |
97 // main message loop has started. This will allow us to exit cleanly | 93 // main message loop has started. This will allow us to exit cleanly |
98 // if X exits before us. | 94 // if X exits before us. |
99 ui::SetX11ErrorHandlers(BrowserX11ErrorHandler, BrowserX11IOErrorHandler); | 95 ui::SetX11ErrorHandlers(BrowserX11ErrorHandler, BrowserX11IOErrorHandler); |
100 | |
101 #if !defined(OS_CHROMEOS) | |
102 // It is possible for X11EventSource to not have been created (e.g. when | |
103 // running as a mus client). | |
104 if (ui::X11EventSource::HasInstance()) { | |
105 // Get a timestamp from the X server. This makes our requests to the server | |
106 // less likely to be thrown away by the window manager. Put the timestamp | |
107 // in a command line flag so we can forward it to an existing browser | |
108 // process if necessary. | |
109 base::CommandLine::ForCurrentProcess()->AppendSwitchASCII( | |
110 switches::kWmUserTimeMs, | |
111 base::Uint64ToString( | |
112 ui::X11EventSource::GetInstance()->UpdateLastSeenServerTime())); | |
113 } | |
114 #endif | |
115 } | 96 } |
116 | 97 |
117 void ChromeBrowserMainExtraPartsX11::PostMainMessageLoopRun() { | 98 void ChromeBrowserMainExtraPartsX11::PostMainMessageLoopRun() { |
118 // 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 |
119 // |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 |
120 // process of terminating, this can cause errors. | 101 // process of terminating, this can cause errors. |
121 ui::SetX11ErrorHandlers(X11EmptyErrorHandler, X11EmptyIOErrorHandler); | 102 ui::SetX11ErrorHandlers(X11EmptyErrorHandler, X11EmptyIOErrorHandler); |
122 } | 103 } |
OLD | NEW |