| 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 //Pickup file for readability review. |
| 6 |
| 5 #include <windows.h> | 7 #include <windows.h> |
| 6 #include <msi.h> | 8 #include <msi.h> |
| 7 #include <shellapi.h> | 9 #include <shellapi.h> |
| 8 #include <shlobj.h> | 10 #include <shlobj.h> |
| 9 | 11 |
| 10 #include "base/at_exit.h" | 12 #include "base/at_exit.h" |
| 11 #include "base/basictypes.h" | 13 #include "base/basictypes.h" |
| 12 #include "base/command_line.h" | 14 #include "base/command_line.h" |
| 13 #include "base/file_util.h" | 15 #include "base/file_util.h" |
| 14 #include "base/file_version_info.h" | 16 #include "base/file_version_info.h" |
| (...skipping 1493 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1508 if (!(installer_state.is_msi() && is_uninstall)) | 1510 if (!(installer_state.is_msi() && is_uninstall)) |
| 1509 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT | 1511 // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT |
| 1510 // to pass through, since this is only returned on uninstall which is | 1512 // to pass through, since this is only returned on uninstall which is |
| 1511 // never invoked directly by Google Update. | 1513 // never invoked directly by Google Update. |
| 1512 return_code = InstallUtil::GetInstallReturnCode(install_status); | 1514 return_code = InstallUtil::GetInstallReturnCode(install_status); |
| 1513 | 1515 |
| 1514 VLOG(1) << "Installation complete, returning: " << return_code; | 1516 VLOG(1) << "Installation complete, returning: " << return_code; |
| 1515 | 1517 |
| 1516 return return_code; | 1518 return return_code; |
| 1517 } | 1519 } |
| OLD | NEW |