Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(187)

Side by Side Diff: chrome/browser/chrome_browser_main_x11.cc

Issue 18967002: Small cleanup for ChromeBrowserMain: (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
(Empty)
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
3 // found in the LICENSE file.
4
5 #include "chrome/browser/chrome_browser_main.h"
6
7 #include "base/bind.h"
8 #include "base/debug/debugger.h"
9 #include "base/message_loop.h"
10 #include "chrome/browser/browser_shutdown.h"
11 #include "chrome/browser/lifetime/application_lifetime.h"
12 #include "chrome/browser/metrics/metrics_service.h"
13 #include "chrome/common/chrome_result_codes.h"
14 #include "content/public/browser/browser_thread.h"
15 #include "ui/base/x/x11_util.h"
16 #include "ui/base/x/x11_util_internal.h"
17
18 #if defined(USE_LINUX_BREAKPAD)
19 #include "chrome/app/breakpad_linux.h"
20 #endif
21
22 using content::BrowserThread;
23
24 namespace {
25
26 // Indicates that we're currently responding to an IO error (by shutting down).
27 bool g_in_x11_io_error_handler = false;
28
29 // Number of seconds to wait for UI thread to get an IO error if we get it on
30 // the background thread.
31 const int kWaitForUIThreadSeconds = 10;
32
33 int BrowserX11ErrorHandler(Display* d, XErrorEvent* error) {
34 if (!g_in_x11_io_error_handler)
35 base::MessageLoop::current()->PostTask(
36 FROM_HERE,
37 base::Bind(&ui::LogErrorEventDescription, d, *error));
38 return 0;
39 }
40
41
42 // This function is used to help us diagnose crash dumps that happen
43 // during the shutdown process.
44 NOINLINE void WaitingForUIThreadToHandleIOError() {
45 // Ensure function isn't optimized away.
46 asm("");
47 sleep(kWaitForUIThreadSeconds);
48 }
49
50 int BrowserX11IOErrorHandler(Display* d) {
51 if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
52 // Wait for the UI thread (which has a different connection to the X server)
53 // to get the error. We can't call shutdown from this thread without
54 // tripping an error. Doing it through a function so that we'll be able
55 // to see it in any crash dumps.
56 WaitingForUIThreadToHandleIOError();
57 return 0;
58 }
59 // If there's an IO error it likely means the X server has gone away
60 if (!g_in_x11_io_error_handler) {
61 g_in_x11_io_error_handler = true;
62 LOG(ERROR) << "X IO error received (X server probably went away)";
63 browser_shutdown::SetShuttingDownWithoutClosingBrowsers(true);
64 chrome::SessionEnding();
65 }
66
67 return 0;
68 }
69
70 int X11EmptyErrorHandler(Display* d, XErrorEvent* error) {
71 return 0;
72 }
73
74 int X11EmptyIOErrorHandler(Display* d) {
75 return 0;
76 }
77
78 } // namespace
79
80 void RecordBreakpadStatusUMA(MetricsService* metrics) {
81 #if defined(USE_LINUX_BREAKPAD)
82 metrics->RecordBreakpadRegistration(IsCrashReporterEnabled());
83 #else
84 metrics->RecordBreakpadRegistration(false);
85 #endif
86 metrics->RecordBreakpadHasDebugger(base::debug::BeingDebugged());
87 }
88
89 void WarnAboutMinimumSystemRequirements() {
90 // Nothing to warn about on X11 right now.
91 }
92
93 // From browser_main_win.h, stubs until we figure out the right thing...
94
95 int DoUninstallTasks(bool chrome_still_running) {
96 return content::RESULT_CODE_NORMAL_EXIT;
97 }
98
99 void SetBrowserX11ErrorHandlersPreEarlyInitialization() {
100 // Use default error handlers during startup.
101 ui::SetX11ErrorHandlers(NULL, NULL);
102 }
103
104 void SetBrowserX11ErrorHandlersPostMainMessageLoopStart() {
105 // Set up error handlers to make sure profile gets written if X server
106 // goes away.
107 ui::SetX11ErrorHandlers(BrowserX11ErrorHandler, BrowserX11IOErrorHandler);
108 }
109
110 void UnsetBrowserX11ErrorHandlers() {
111 ui::SetX11ErrorHandlers(X11EmptyErrorHandler, X11EmptyIOErrorHandler);
112 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698