OLD | NEW |
1 // Copyright (c) 2011 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 "build/build_config.h" | 5 #include "build/build_config.h" |
6 #include "chrome/browser/first_run/upgrade_util.h" | 6 #include "chrome/browser/first_run/upgrade_util.h" |
7 | 7 |
8 // The entry point for all invocations of Chromium, browser and renderer. On | 8 // 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 | 9 // 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 | 10 // order to make it easy to update the app from GoogleUpdate. We don't need |
11 // that extra layer with on linux. | 11 // that extra layer with on linux. |
12 | 12 |
13 extern "C" { | 13 extern "C" { |
14 int ChromeMain(int argc, const char** argv); | 14 int ChromeMain(int argc, const char** argv); |
15 } | 15 } |
16 | 16 |
17 int main(int argc, const char** argv) { | 17 int main(int argc, const char** argv) { |
18 int return_code = ChromeMain(argc, argv); | 18 int return_code = ChromeMain(argc, argv); |
19 | 19 |
20 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | 20 #if defined(OS_LINUX) |
21 // Launch a new instance if we're shutting down because we detected an | 21 // Launch a new instance if we're shutting down because we detected an |
22 // upgrade in the persistent mode. | 22 // upgrade in the persistent mode. |
23 upgrade_util::RelaunchChromeBrowserWithNewCommandLineIfNeeded(); | 23 upgrade_util::RelaunchChromeBrowserWithNewCommandLineIfNeeded(); |
24 #endif | 24 #endif |
25 | 25 |
26 return return_code; | 26 return return_code; |
27 } | 27 } |
OLD | NEW |