| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 791 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 802 ScheduleDirectoryForDeletion(temp_path.path().value().c_str()); | 802 ScheduleDirectoryForDeletion(temp_path.path().value().c_str()); |
| 803 } | 803 } |
| 804 } | 804 } |
| 805 | 805 |
| 806 *exit_code = InstallUtil::GetInstallReturnCode(status); | 806 *exit_code = InstallUtil::GetInstallReturnCode(status); |
| 807 if (*exit_code) { | 807 if (*exit_code) { |
| 808 LOG(WARNING) << "setup.exe patching failed."; | 808 LOG(WARNING) << "setup.exe patching failed."; |
| 809 installer_state->WriteInstallerResult(status, IDS_SETUP_PATCH_FAILED_BASE, | 809 installer_state->WriteInstallerResult(status, IDS_SETUP_PATCH_FAILED_BASE, |
| 810 NULL); | 810 NULL); |
| 811 } | 811 } |
| 812 // We will be exiting normally, so clear the stage indicator. |
| 813 installer_state->UpdateStage(installer::NO_STAGE); |
| 812 } else if (cmd_line.HasSwitch(installer::switches::kShowEula)) { | 814 } else if (cmd_line.HasSwitch(installer::switches::kShowEula)) { |
| 813 // Check if we need to show the EULA. If it is passed as a command line | 815 // Check if we need to show the EULA. If it is passed as a command line |
| 814 // then the dialog is shown and regardless of the outcome setup exits here. | 816 // then the dialog is shown and regardless of the outcome setup exits here. |
| 815 std::wstring inner_frame = | 817 std::wstring inner_frame = |
| 816 cmd_line.GetSwitchValueNative(installer::switches::kShowEula); | 818 cmd_line.GetSwitchValueNative(installer::switches::kShowEula); |
| 817 *exit_code = ShowEULADialog(inner_frame); | 819 *exit_code = ShowEULADialog(inner_frame); |
| 818 if (installer::EULA_REJECTED != *exit_code) | 820 if (installer::EULA_REJECTED != *exit_code) |
| 819 GoogleUpdateSettings::SetEULAConsent(*installer_state, true); | 821 GoogleUpdateSettings::SetEULAConsent(*installer_state, true); |
| 820 } else if (cmd_line.HasSwitch( | 822 } else if (cmd_line.HasSwitch( |
| 821 installer::switches::kRegisterChromeBrowser)) { | 823 installer::switches::kRegisterChromeBrowser)) { |
| (...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1218 if (!(installer_state.is_msi() && is_uninstall)) | 1220 if (!(installer_state.is_msi() && is_uninstall)) |
| 1219 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT | 1221 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT |
| 1220 // to pass through, since this is only returned on uninstall which is | 1222 // to pass through, since this is only returned on uninstall which is |
| 1221 // never invoked directly by Google Update. | 1223 // never invoked directly by Google Update. |
| 1222 return_code = InstallUtil::GetInstallReturnCode(install_status); | 1224 return_code = InstallUtil::GetInstallReturnCode(install_status); |
| 1223 | 1225 |
| 1224 VLOG(1) << "Installation complete, returning: " << return_code; | 1226 VLOG(1) << "Installation complete, returning: " << return_code; |
| 1225 | 1227 |
| 1226 return return_code; | 1228 return return_code; |
| 1227 } | 1229 } |
| OLD | NEW |