OLD | NEW |
1 // Copyright (c) 2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/browser_main.h" | 5 #include "chrome/browser/browser_main.h" |
6 | 6 |
7 #include "app/x11_util.h" | 7 #include "app/x11_util.h" |
8 #include "app/x11_util_internal.h" | 8 #include "app/x11_util_internal.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/debug_util.h" | 10 #include "base/debug/debugger.h" |
11 #include "chrome/browser/browser_list.h" | 11 #include "chrome/browser/browser_list.h" |
12 #include "chrome/browser/browser_main_gtk.h" | 12 #include "chrome/browser/browser_main_gtk.h" |
13 #include "chrome/browser/browser_main_win.h" | 13 #include "chrome/browser/browser_main_win.h" |
14 #include "chrome/browser/metrics/metrics_service.h" | 14 #include "chrome/browser/metrics/metrics_service.h" |
15 #include "chrome/common/result_codes.h" | 15 #include "chrome/common/result_codes.h" |
16 | 16 |
17 #if defined(USE_LINUX_BREAKPAD) | 17 #if defined(USE_LINUX_BREAKPAD) |
18 #include "chrome/app/breakpad_linux.h" | 18 #include "chrome/app/breakpad_linux.h" |
19 #endif | 19 #endif |
20 | 20 |
(...skipping 23 matching lines...) Expand all Loading... |
44 | 44 |
45 void DidEndMainMessageLoop() { | 45 void DidEndMainMessageLoop() { |
46 } | 46 } |
47 | 47 |
48 void RecordBreakpadStatusUMA(MetricsService* metrics) { | 48 void RecordBreakpadStatusUMA(MetricsService* metrics) { |
49 #if defined(USE_LINUX_BREAKPAD) | 49 #if defined(USE_LINUX_BREAKPAD) |
50 metrics->RecordBreakpadRegistration(IsCrashReporterEnabled()); | 50 metrics->RecordBreakpadRegistration(IsCrashReporterEnabled()); |
51 #else | 51 #else |
52 metrics->RecordBreakpadRegistration(false); | 52 metrics->RecordBreakpadRegistration(false); |
53 #endif | 53 #endif |
54 metrics->RecordBreakpadHasDebugger(DebugUtil::BeingDebugged()); | 54 metrics->RecordBreakpadHasDebugger(base::debug::BeingDebugged()); |
55 } | 55 } |
56 | 56 |
57 void WarnAboutMinimumSystemRequirements() { | 57 void WarnAboutMinimumSystemRequirements() { |
58 // Nothing to warn about on GTK right now. | 58 // Nothing to warn about on GTK right now. |
59 } | 59 } |
60 | 60 |
61 // From browser_main_win.h, stubs until we figure out the right thing... | 61 // From browser_main_win.h, stubs until we figure out the right thing... |
62 | 62 |
63 int DoUninstallTasks(bool chrome_still_running) { | 63 int DoUninstallTasks(bool chrome_still_running) { |
64 return ResultCodes::NORMAL_EXIT; | 64 return ResultCodes::NORMAL_EXIT; |
(...skipping 10 matching lines...) Expand all Loading... |
75 void PrepareRestartOnCrashEnviroment(const CommandLine &parsed_command_line) { | 75 void PrepareRestartOnCrashEnviroment(const CommandLine &parsed_command_line) { |
76 } | 76 } |
77 | 77 |
78 void SetBrowserX11ErrorHandlers() { | 78 void SetBrowserX11ErrorHandlers() { |
79 // Set up error handlers to make sure profile gets written if X server | 79 // Set up error handlers to make sure profile gets written if X server |
80 // goes away. | 80 // goes away. |
81 x11_util::SetX11ErrorHandlers( | 81 x11_util::SetX11ErrorHandlers( |
82 BrowserX11ErrorHandler, | 82 BrowserX11ErrorHandler, |
83 BrowserX11IOErrorHandler); | 83 BrowserX11IOErrorHandler); |
84 } | 84 } |
OLD | NEW |