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 1208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1219 installer::ChromeFrameReadyModeTempOptOut(original_state, | 1219 installer::ChromeFrameReadyModeTempOptOut(original_state, |
1220 *installer_state)); | 1220 *installer_state)); |
1221 } else if (cmd_line.HasSwitch( | 1221 } else if (cmd_line.HasSwitch( |
1222 installer::switches::kChromeFrameReadyModeEndTempOptOut)) { | 1222 installer::switches::kChromeFrameReadyModeEndTempOptOut)) { |
1223 *exit_code = InstallUtil::GetInstallReturnCode( | 1223 *exit_code = InstallUtil::GetInstallReturnCode( |
1224 installer::ChromeFrameReadyModeEndTempOptOut(original_state, | 1224 installer::ChromeFrameReadyModeEndTempOptOut(original_state, |
1225 *installer_state)); | 1225 *installer_state)); |
1226 } else if (cmd_line.HasSwitch(installer::switches::kChromeFrameQuickEnable)) { | 1226 } else if (cmd_line.HasSwitch(installer::switches::kChromeFrameQuickEnable)) { |
1227 *exit_code = installer::ChromeFrameQuickEnable(original_state, | 1227 *exit_code = installer::ChromeFrameQuickEnable(original_state, |
1228 installer_state); | 1228 installer_state); |
| 1229 } else if (cmd_line.HasSwitch(installer::switches::kOnOsUpgrade)) { |
| 1230 *exit_code = InstallUtil::GetInstallReturnCode( |
| 1231 installer::OnOsUpgrade(original_state, *installer_state, cmd_line)); |
1229 } else { | 1232 } else { |
1230 handled = false; | 1233 handled = false; |
1231 } | 1234 } |
1232 | 1235 |
1233 return handled; | 1236 return handled; |
1234 } | 1237 } |
1235 | 1238 |
1236 bool ShowRebootDialog() { | 1239 bool ShowRebootDialog() { |
1237 // Get a token for this process. | 1240 // Get a token for this process. |
1238 HANDLE token; | 1241 HANDLE token; |
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1499 if (!(installer_state.is_msi() && is_uninstall)) | 1502 if (!(installer_state.is_msi() && is_uninstall)) |
1500 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT | 1503 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT |
1501 // to pass through, since this is only returned on uninstall which is | 1504 // to pass through, since this is only returned on uninstall which is |
1502 // never invoked directly by Google Update. | 1505 // never invoked directly by Google Update. |
1503 return_code = InstallUtil::GetInstallReturnCode(install_status); | 1506 return_code = InstallUtil::GetInstallReturnCode(install_status); |
1504 | 1507 |
1505 VLOG(1) << "Installation complete, returning: " << return_code; | 1508 VLOG(1) << "Installation complete, returning: " << return_code; |
1506 | 1509 |
1507 return return_code; | 1510 return return_code; |
1508 } | 1511 } |
OLD | NEW |