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.h" | 5 #include "chrome/browser/chrome_browser_main.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.h" | 9 #include "base/message_loop.h" |
10 #include "chrome/browser/browser_shutdown.h" | 10 #include "chrome/browser/browser_shutdown.h" |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 void WarnAboutMinimumSystemRequirements() { | 89 void WarnAboutMinimumSystemRequirements() { |
90 // Nothing to warn about on X11 right now. | 90 // Nothing to warn about on X11 right now. |
91 } | 91 } |
92 | 92 |
93 // From browser_main_win.h, stubs until we figure out the right thing... | 93 // From browser_main_win.h, stubs until we figure out the right thing... |
94 | 94 |
95 int DoUninstallTasks(bool chrome_still_running) { | 95 int DoUninstallTasks(bool chrome_still_running) { |
96 return content::RESULT_CODE_NORMAL_EXIT; | 96 return content::RESULT_CODE_NORMAL_EXIT; |
97 } | 97 } |
98 | 98 |
99 void SetBrowserX11ErrorHandlers() { | 99 void SetBrowserX11ErrorHandlersPreEarlyInitialization() { |
| 100 // Use default error handlers during startup. |
| 101 ui::SetX11ErrorHandlers(NULL, NULL); |
| 102 } |
| 103 |
| 104 void SetBrowserX11ErrorHandlersPostMainMessageLoopStart() { |
100 // Set up error handlers to make sure profile gets written if X server | 105 // Set up error handlers to make sure profile gets written if X server |
101 // goes away. | 106 // goes away. |
102 ui::SetX11ErrorHandlers(BrowserX11ErrorHandler, BrowserX11IOErrorHandler); | 107 ui::SetX11ErrorHandlers(BrowserX11ErrorHandler, BrowserX11IOErrorHandler); |
103 } | 108 } |
104 | 109 |
105 void UnsetBrowserX11ErrorHandlers() { | 110 void UnsetBrowserX11ErrorHandlers() { |
106 ui::SetX11ErrorHandlers(X11EmptyErrorHandler, X11EmptyIOErrorHandler); | 111 ui::SetX11ErrorHandlers(X11EmptyErrorHandler, X11EmptyIOErrorHandler); |
107 } | 112 } |
OLD | NEW |