| 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 "base/at_exit.h" | 10 #include "base/at_exit.h" |
| (...skipping 1014 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1025 | 1025 |
| 1026 for (Products::const_iterator it = products.begin(); | 1026 for (Products::const_iterator it = products.begin(); |
| 1027 install_status != installer::UNINSTALL_CANCELLED && it < products.end(); | 1027 install_status != installer::UNINSTALL_CANCELLED && it < products.end(); |
| 1028 ++it) { | 1028 ++it) { |
| 1029 prod_status = UninstallProduct(original_state, installer_state, | 1029 prod_status = UninstallProduct(original_state, installer_state, |
| 1030 cmd_line, remove_all, force, **it); | 1030 cmd_line, remove_all, force, **it); |
| 1031 if (prod_status != installer::UNINSTALL_SUCCESSFUL) | 1031 if (prod_status != installer::UNINSTALL_SUCCESSFUL) |
| 1032 install_status = prod_status; | 1032 install_status = prod_status; |
| 1033 } | 1033 } |
| 1034 | 1034 |
| 1035 installer::CleanUpInstallationDirectoryAfterUninstall( |
| 1036 original_state, installer_state, cmd_line, &install_status); |
| 1037 |
| 1035 // Tell Google Update that an uninstall has taken place. | 1038 // Tell Google Update that an uninstall has taken place. |
| 1036 // Ignore the return value: success or failure of Google Update | 1039 // Ignore the return value: success or failure of Google Update |
| 1037 // has no bearing on the success or failure of Chrome's uninstallation. | 1040 // has no bearing on the success or failure of Chrome's uninstallation. |
| 1038 google_update::UninstallGoogleUpdate(installer_state.system_install()); | 1041 google_update::UninstallGoogleUpdate(installer_state.system_install()); |
| 1039 | 1042 |
| 1040 return install_status; | 1043 return install_status; |
| 1041 } | 1044 } |
| 1042 | 1045 |
| 1043 installer::InstallStatus ShowEULADialog(const string16& inner_frame) { | 1046 installer::InstallStatus ShowEULADialog(const string16& inner_frame) { |
| 1044 VLOG(1) << "About to show EULA"; | 1047 VLOG(1) << "About to show EULA"; |
| (...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1664 if (!(installer_state.is_msi() && is_uninstall)) | 1667 if (!(installer_state.is_msi() && is_uninstall)) |
| 1665 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT | 1668 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT |
| 1666 // to pass through, since this is only returned on uninstall which is | 1669 // to pass through, since this is only returned on uninstall which is |
| 1667 // never invoked directly by Google Update. | 1670 // never invoked directly by Google Update. |
| 1668 return_code = InstallUtil::GetInstallReturnCode(install_status); | 1671 return_code = InstallUtil::GetInstallReturnCode(install_status); |
| 1669 | 1672 |
| 1670 VLOG(1) << "Installation complete, returning: " << return_code; | 1673 VLOG(1) << "Installation complete, returning: " << return_code; |
| 1671 | 1674 |
| 1672 return return_code; | 1675 return return_code; |
| 1673 } | 1676 } |
| OLD | NEW |