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

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

Issue 10532178: Rename back _linuxish to linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed a typo Created 8 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
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"
11 #include "chrome/browser/lifetime/application_lifetime.h" 11 #include "chrome/browser/lifetime/application_lifetime.h"
12 #include "chrome/browser/metrics/metrics_service.h" 12 #include "chrome/browser/metrics/metrics_service.h"
13 #include "chrome/common/chrome_result_codes.h" 13 #include "chrome/common/chrome_result_codes.h"
14 #include "content/public/browser/browser_thread.h" 14 #include "content/public/browser/browser_thread.h"
15 #include "ui/base/x/x11_util.h" 15 #include "ui/base/x/x11_util.h"
16 #include "ui/base/x/x11_util_internal.h" 16 #include "ui/base/x/x11_util_internal.h"
17 17
18 #if defined(USE_LINUX_BREAKPAD) 18 #if defined(USE_LINUX_BREAKPAD)
19 #include "chrome/app/breakpad_linuxish.h" 19 #include "chrome/app/breakpad_linux.h"
20 #endif 20 #endif
21 21
22 using content::BrowserThread; 22 using content::BrowserThread;
23 23
24 namespace { 24 namespace {
25 25
26 // Indicates that we're currently responding to an IO error (by shutting down). 26 // Indicates that we're currently responding to an IO error (by shutting down).
27 bool g_in_x11_io_error_handler = false; 27 bool g_in_x11_io_error_handler = false;
28 28
29 // Number of seconds to wait for UI thread to get an IO error if we get it on 29 // Number of seconds to wait for UI thread to get an IO error if we get it on
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 86
87 int DoUninstallTasks(bool chrome_still_running) { 87 int DoUninstallTasks(bool chrome_still_running) {
88 return content::RESULT_CODE_NORMAL_EXIT; 88 return content::RESULT_CODE_NORMAL_EXIT;
89 } 89 }
90 90
91 void SetBrowserX11ErrorHandlers() { 91 void SetBrowserX11ErrorHandlers() {
92 // Set up error handlers to make sure profile gets written if X server 92 // Set up error handlers to make sure profile gets written if X server
93 // goes away. 93 // goes away.
94 ui::SetX11ErrorHandlers(BrowserX11ErrorHandler, BrowserX11IOErrorHandler); 94 ui::SetX11ErrorHandlers(BrowserX11ErrorHandler, BrowserX11IOErrorHandler);
95 } 95 }
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main_linux.cc ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698