OLD | NEW |
1 // Copyright (c) 2012 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 <windows.h> | 5 #include <windows.h> |
6 #include <msi.h> | 6 #include <msi.h> |
7 #include <shellapi.h> | 7 #include <shellapi.h> |
8 #include <shlobj.h> | 8 #include <shlobj.h> |
9 | 9 |
10 #include <string> | 10 #include <string> |
(...skipping 706 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
717 prefs.GetBool( | 717 prefs.GetBool( |
718 installer::master_preferences::kDoNotLaunchChrome, | 718 installer::master_preferences::kDoNotLaunchChrome, |
719 &do_not_launch_chrome); | 719 &do_not_launch_chrome); |
720 if (!system_install && !do_not_launch_chrome) | 720 if (!system_install && !do_not_launch_chrome) |
721 chrome_install->LaunchChrome(installer_state.target_path()); | 721 chrome_install->LaunchChrome(installer_state.target_path()); |
722 } | 722 } |
723 } else if ((install_status == installer::NEW_VERSION_UPDATED) || | 723 } else if ((install_status == installer::NEW_VERSION_UPDATED) || |
724 (install_status == installer::IN_USE_UPDATED)) { | 724 (install_status == installer::IN_USE_UPDATED)) { |
725 const Product* chrome = installer_state.FindProduct( | 725 const Product* chrome = installer_state.FindProduct( |
726 BrowserDistribution::CHROME_BROWSER); | 726 BrowserDistribution::CHROME_BROWSER); |
727 if (chrome != NULL) | 727 if (chrome != NULL) { |
728 installer::RemoveChromeLegacyRegistryKeys(chrome->distribution()); | 728 installer::RemoveChromeLegacyRegistryKeys(chrome->distribution(), |
| 729 chrome_exe); |
| 730 } |
729 } | 731 } |
730 } | 732 } |
731 } | 733 } |
732 | 734 |
733 // There might be an experiment (for upgrade usually) that needs to happen. | 735 // There might be an experiment (for upgrade usually) that needs to happen. |
734 // An experiment's outcome can include chrome's uninstallation. If that is | 736 // An experiment's outcome can include chrome's uninstallation. If that is |
735 // the case we would not do that directly at this point but in another | 737 // the case we would not do that directly at this point but in another |
736 // instance of setup.exe | 738 // instance of setup.exe |
737 // | 739 // |
738 // There is another way to reach this same function if this is a system | 740 // There is another way to reach this same function if this is a system |
(...skipping 645 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1384 if (!(installer_state.is_msi() && is_uninstall)) | 1386 if (!(installer_state.is_msi() && is_uninstall)) |
1385 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT | 1387 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT |
1386 // to pass through, since this is only returned on uninstall which is | 1388 // to pass through, since this is only returned on uninstall which is |
1387 // never invoked directly by Google Update. | 1389 // never invoked directly by Google Update. |
1388 return_code = InstallUtil::GetInstallReturnCode(install_status); | 1390 return_code = InstallUtil::GetInstallReturnCode(install_status); |
1389 | 1391 |
1390 VLOG(1) << "Installation complete, returning: " << return_code; | 1392 VLOG(1) << "Installation complete, returning: " << return_code; |
1391 | 1393 |
1392 return return_code; | 1394 return return_code; |
1393 } | 1395 } |
OLD | NEW |