diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-30 01:23:32 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-30 01:23:32 +0000 |
| commit | 1979689363e58c9917d751d5134287d8616528e5 (patch) | |
| tree | 6342d081e86670f1a05b07933888278d6e355759 /chrome/app/chrome_exe_main_gtk.cc | |
| parent | 27d3571b99a7e69bedb8ac0282b981325906edc2 (diff) | |
| download | chromium_src-1979689363e58c9917d751d5134287d8616528e5.zip chromium_src-1979689363e58c9917d751d5134287d8616528e5.tar.gz chromium_src-1979689363e58c9917d751d5134287d8616528e5.tar.bz2 | |
Revert r46023: "Detect new instance of the browser when running in the background in persistent"
Broke the build.
Review URL: http://codereview.chromium.org/1718024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46025 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_exe_main_gtk.cc')
| -rw-r--r-- | chrome/app/chrome_exe_main_gtk.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/chrome/app/chrome_exe_main_gtk.cc b/chrome/app/chrome_exe_main_gtk.cc index 8b612c7..0ed9e15 100644 --- a/chrome/app/chrome_exe_main_gtk.cc +++ b/chrome/app/chrome_exe_main_gtk.cc @@ -4,7 +4,6 @@ #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 @@ -45,11 +44,5 @@ int main(int argc, const char** argv) { // keep it. // base::AtExitManager exit_manager; - 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; + return ChromeMain(argc, argv); } |