summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgwilson@chromium.org <gwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-21 23:23:30 +0000
committergwilson@chromium.org <gwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-21 23:23:30 +0000
commit9ba8f00d1634c332b8b1049f03671cd4352a169f (patch)
tree4533abe2be05ac2f4cb2551387edb87a3c4016f1
parentefad4caae47ab20639adecbad77314ad5efc9e49 (diff)
downloadchromium_src-9ba8f00d1634c332b8b1049f03671cd4352a169f.zip
chromium_src-9ba8f00d1634c332b8b1049f03671cd4352a169f.tar.gz
chromium_src-9ba8f00d1634c332b8b1049f03671cd4352a169f.tar.bz2
Merge 45236 - Modifies Installation return codes to not return success (0) if an existing version was launched. Omaha needs to know the correct error result if it is to show the right error message to the user.
R=cpu BUG=40607 TEST=Overinstall trunk/dev channel over a systemlevel stable install, you should see error code 3 Review URL: http://codereview.chromium.org/1747001 R=laforge Review URL: http://codereview.chromium.org/1705002 git-svn-id: svn://svn.chromium.org/chrome/branches/375/src@45259 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/installer/util/browser_distribution.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome/installer/util/browser_distribution.cc b/chrome/installer/util/browser_distribution.cc
index 7eed257..afce15f 100644
--- a/chrome/installer/util/browser_distribution.cc
+++ b/chrome/installer/util/browser_distribution.cc
@@ -95,7 +95,6 @@ int BrowserDistribution::GetInstallReturnCode(
case installer_util::FIRST_INSTALL_SUCCESS:
case installer_util::INSTALL_REPAIRED:
case installer_util::NEW_VERSION_UPDATED:
- case installer_util::EXISTING_VERSION_LAUNCHED:
case installer_util::IN_USE_UPDATED:
return 0;
default: