Merge 40701 - Overinstall mismatch, Launch the existing chrome instead...

chrome/installer/util/browser_distribution.cc

 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // This file defines a class that contains various method related to branding.
 // It provides only default implementations of these methods. Usually to add
 // specific branding, we will need to extend this class with a custom
 // implementation.
 
 #include "chrome/installer/util/browser_distribution.h"
@@ skipping 77 matching lines @@
       installer_util::GetLocalizedString(IDS_PRODUCT_DESCRIPTION_BASE);
   return app_description;
 }
 
 int BrowserDistribution::GetInstallReturnCode(
     installer_util::InstallStatus status) {
   switch (status) {
     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:
       return status;
   }
 }
 
 std::string BrowserDistribution::GetSafeBrowsingName() {
   return "chromium";
 }
@@ skipping 36 matching lines @@
 
 void BrowserDistribution::LaunchUserExperiment(
     installer_util::InstallStatus status, const installer::Version& version,
     bool system_install) {
 }
 
 
 void BrowserDistribution::InactiveUserToastExperiment(int flavor,
                                                       bool system_install) {
 }