| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/debug/debugger.h" | 7 #include "base/debug/debugger.h" |
| 8 #include "chrome/browser/ui/browser_list.h" | 8 #include "chrome/browser/ui/browser_list.h" |
| 9 #include "chrome/browser/metrics/metrics_service.h" | 9 #include "chrome/browser/metrics/metrics_service.h" |
| 10 #include "content/browser/browser_thread.h" | 10 #include "content/browser/browser_thread.h" |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 void RecordBrowserStartupTime() { | 79 void RecordBrowserStartupTime() { |
| 80 // Not implemented on X11 for now. | 80 // Not implemented on X11 for now. |
| 81 } | 81 } |
| 82 | 82 |
| 83 // From browser_main_win.h, stubs until we figure out the right thing... | 83 // From browser_main_win.h, stubs until we figure out the right thing... |
| 84 | 84 |
| 85 int DoUninstallTasks(bool chrome_still_running) { | 85 int DoUninstallTasks(bool chrome_still_running) { |
| 86 return content::RESULT_CODE_NORMAL_EXIT; | 86 return content::RESULT_CODE_NORMAL_EXIT; |
| 87 } | 87 } |
| 88 | 88 |
| 89 int HandleIconsCommands(const CommandLine &parsed_command_line) { | |
| 90 return 0; | |
| 91 } | |
| 92 | |
| 93 bool CheckMachineLevelInstall() { | |
| 94 return false; | |
| 95 } | |
| 96 | |
| 97 void PrepareRestartOnCrashEnviroment(const CommandLine &parsed_command_line) { | |
| 98 } | |
| 99 | |
| 100 void SetBrowserX11ErrorHandlers() { | 89 void SetBrowserX11ErrorHandlers() { |
| 101 // Set up error handlers to make sure profile gets written if X server | 90 // Set up error handlers to make sure profile gets written if X server |
| 102 // goes away. | 91 // goes away. |
| 103 ui::SetX11ErrorHandlers(BrowserX11ErrorHandler, BrowserX11IOErrorHandler); | 92 ui::SetX11ErrorHandlers(BrowserX11ErrorHandler, BrowserX11IOErrorHandler); |
| 104 } | 93 } |
| OLD | NEW |