| OLD | NEW |
| 1 // Copyright (c) 2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2008 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 "base/at_exit.h" | 5 #include "base/at_exit.h" |
| 6 #include "base/process_util.h" | 6 #include "base/process_util.h" |
| 7 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | 7 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
| 8 #include "chrome/browser/first_run.h" | 8 #include "chrome/browser/first_run/first_run.h" |
| 9 #endif | 9 #endif |
| 10 | 10 |
| 11 // The entry point for all invocations of Chromium, browser and renderer. On | 11 // The entry point for all invocations of Chromium, browser and renderer. On |
| 12 // windows, this does nothing but load chrome.dll and invoke its entry point in | 12 // windows, this does nothing but load chrome.dll and invoke its entry point in |
| 13 // order to make it easy to update the app from GoogleUpdate. We don't need | 13 // order to make it easy to update the app from GoogleUpdate. We don't need |
| 14 // that extra layer with on linux. | 14 // that extra layer with on linux. |
| 15 // | 15 // |
| 16 // TODO(tc): This is similar to chrome_exe_main.mm. After it's more clear what | 16 // TODO(tc): This is similar to chrome_exe_main.mm. After it's more clear what |
| 17 // needs to go here, we should evaluate whether or not to merge this file with | 17 // needs to go here, we should evaluate whether or not to merge this file with |
| 18 // chrome_exe_main.mm. | 18 // chrome_exe_main.mm. |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 int return_code = ChromeMain(argc, argv); | 50 int return_code = ChromeMain(argc, argv); |
| 51 | 51 |
| 52 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | 52 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
| 53 // Launch a new instance if we're shutting down because we detected an | 53 // Launch a new instance if we're shutting down because we detected an |
| 54 // upgrade in the persistent mode. | 54 // upgrade in the persistent mode. |
| 55 Upgrade::RelaunchChromeBrowserWithNewCommandLineIfNeeded(); | 55 Upgrade::RelaunchChromeBrowserWithNewCommandLineIfNeeded(); |
| 56 #endif | 56 #endif |
| 57 | 57 |
| 58 return return_code; | 58 return return_code; |
| 59 } | 59 } |
| OLD | NEW |