| Index: chrome/app/chrome_exe_main_gtk.cc
|
| ===================================================================
|
| --- chrome/app/chrome_exe_main_gtk.cc (revision 45984)
|
| +++ chrome/app/chrome_exe_main_gtk.cc (working copy)
|
| @@ -4,6 +4,7 @@
|
|
|
| #include "base/at_exit.h"
|
| #include "base/process_util.h"
|
| +#include "chrome/browser/first_run.h"
|
|
|
| // The entry point for all invocations of Chromium, browser and renderer. On
|
| // windows, this does nothing but load chrome.dll and invoke its entry point in
|
| @@ -44,5 +45,11 @@
|
| // keep it.
|
| // base::AtExitManager exit_manager;
|
|
|
| - return ChromeMain(argc, argv);
|
| + int return_code = ChromeMain(argc, argv);
|
| +
|
| + // Launch a new instance if we're shutting down because we detected an
|
| + // upgrade in the persistent mode.
|
| + Upgrade::RelaunchChromeBrowserWithNewCommandLineIfNeeded();
|
| +
|
| + return return_code;
|
| }
|
|
|