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 #include "chrome/browser/first_run.h" |
7 | 8 |
8 // The entry point for all invocations of Chromium, browser and renderer. On | 9 // The entry point for all invocations of Chromium, browser and renderer. On |
9 // windows, this does nothing but load chrome.dll and invoke its entry point in | 10 // windows, this does nothing but load chrome.dll and invoke its entry point in |
10 // order to make it easy to update the app from GoogleUpdate. We don't need | 11 // order to make it easy to update the app from GoogleUpdate. We don't need |
11 // that extra layer with on linux. | 12 // that extra layer with on linux. |
12 // | 13 // |
13 // TODO(tc): This is similar to chrome_exe_main.mm. After it's more clear what | 14 // TODO(tc): This is similar to chrome_exe_main.mm. After it's more clear what |
14 // needs to go here, we should evaluate whether or not to merge this file with | 15 // needs to go here, we should evaluate whether or not to merge this file with |
15 // chrome_exe_main.mm. | 16 // chrome_exe_main.mm. |
16 | 17 |
(...skipping 20 matching lines...) Loading... |
37 #if defined(OS_LINUX) && defined(USE_TCMALLOC) | 38 #if defined(OS_LINUX) && defined(USE_TCMALLOC) |
38 // For tcmalloc, we need to tell it to behave like new. | 39 // For tcmalloc, we need to tell it to behave like new. |
39 tc_set_new_mode(1); | 40 tc_set_new_mode(1); |
40 #endif | 41 #endif |
41 | 42 |
42 // The exit manager is in charge of calling the dtors of singletons. | 43 // The exit manager is in charge of calling the dtors of singletons. |
43 // Win has one here, but we assert with multiples from BrowserMain() if we | 44 // Win has one here, but we assert with multiples from BrowserMain() if we |
44 // keep it. | 45 // keep it. |
45 // base::AtExitManager exit_manager; | 46 // base::AtExitManager exit_manager; |
46 | 47 |
47 return ChromeMain(argc, argv); | 48 int return_code = ChromeMain(argc, argv); |
| 49 |
| 50 // Launch a new instance if we're shutting down because we detected an |
| 51 // upgrade in the persistent mode. |
| 52 Upgrade::RelaunchChromeBrowserWithNewCommandLineIfNeeded(); |
| 53 |
| 54 return return_code; |
48 } | 55 } |
OLD | NEW |