| 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 1155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1166 if (cmd_line.HasSwitch( | 1166 if (cmd_line.HasSwitch( |
| 1167 installer::switches::kRegisterChromeBrowserSuffix)) { | 1167 installer::switches::kRegisterChromeBrowserSuffix)) { |
| 1168 suffix = cmd_line.GetSwitchValueNative( | 1168 suffix = cmd_line.GetSwitchValueNative( |
| 1169 installer::switches::kRegisterChromeBrowserSuffix); | 1169 installer::switches::kRegisterChromeBrowserSuffix); |
| 1170 } | 1170 } |
| 1171 installer::InstallStatus tmp = installer::UNKNOWN_STATUS; | 1171 installer::InstallStatus tmp = installer::UNKNOWN_STATUS; |
| 1172 const Product* chrome_install = | 1172 const Product* chrome_install = |
| 1173 installer_state->FindProduct(BrowserDistribution::CHROME_BROWSER); | 1173 installer_state->FindProduct(BrowserDistribution::CHROME_BROWSER); |
| 1174 DCHECK(chrome_install); | 1174 DCHECK(chrome_install); |
| 1175 if (chrome_install) { | 1175 if (chrome_install) { |
| 1176 installer::DeleteChromeRegistrationKeys(chrome_install->distribution(), | 1176 installer::DeleteChromeRegistrationKeys(*installer_state, |
| 1177 HKEY_LOCAL_MACHINE, suffix, installer_state->target_path(), &tmp); | 1177 chrome_install->distribution(), HKEY_LOCAL_MACHINE, suffix, &tmp); |
| 1178 } | 1178 } |
| 1179 *exit_code = tmp; | 1179 *exit_code = tmp; |
| 1180 } else if (cmd_line.HasSwitch(installer::switches::kOnOsUpgrade)) { | 1180 } else if (cmd_line.HasSwitch(installer::switches::kOnOsUpgrade)) { |
| 1181 const Product* chrome_install = | 1181 const Product* chrome_install = |
| 1182 installer_state->FindProduct(BrowserDistribution::CHROME_BROWSER); | 1182 installer_state->FindProduct(BrowserDistribution::CHROME_BROWSER); |
| 1183 if (chrome_install) { | 1183 if (chrome_install) { |
| 1184 installer::HandleOsUpgradeForBrowser(*installer_state, | 1184 installer::HandleOsUpgradeForBrowser(*installer_state, |
| 1185 *chrome_install, | 1185 *chrome_install, |
| 1186 cmd_line.GetProgram()); | 1186 cmd_line.GetProgram()); |
| 1187 } | 1187 } |
| (...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1519 if (!(installer_state.is_msi() && is_uninstall)) | 1519 if (!(installer_state.is_msi() && is_uninstall)) |
| 1520 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT | 1520 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT |
| 1521 // to pass through, since this is only returned on uninstall which is | 1521 // to pass through, since this is only returned on uninstall which is |
| 1522 // never invoked directly by Google Update. | 1522 // never invoked directly by Google Update. |
| 1523 return_code = InstallUtil::GetInstallReturnCode(install_status); | 1523 return_code = InstallUtil::GetInstallReturnCode(install_status); |
| 1524 | 1524 |
| 1525 VLOG(1) << "Installation complete, returning: " << return_code; | 1525 VLOG(1) << "Installation complete, returning: " << return_code; |
| 1526 | 1526 |
| 1527 return return_code; | 1527 return return_code; |
| 1528 } | 1528 } |
| OLD | NEW |