| 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 // See the corresponding header file for description of the functions in this | 5 // See the corresponding header file for description of the functions in this |
| 6 // file. | 6 // file. |
| 7 | 7 |
| 8 #include "chrome/installer/util/install_util.h" | 8 #include "chrome/installer/util/install_util.h" |
| 9 | 9 |
| 10 #include <shellapi.h> | 10 #include <shellapi.h> |
| (...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 568 } | 568 } |
| 569 | 569 |
| 570 // static | 570 // static |
| 571 int InstallUtil::GetInstallReturnCode(installer::InstallStatus status) { | 571 int InstallUtil::GetInstallReturnCode(installer::InstallStatus status) { |
| 572 switch (status) { | 572 switch (status) { |
| 573 case installer::FIRST_INSTALL_SUCCESS: | 573 case installer::FIRST_INSTALL_SUCCESS: |
| 574 case installer::INSTALL_REPAIRED: | 574 case installer::INSTALL_REPAIRED: |
| 575 case installer::NEW_VERSION_UPDATED: | 575 case installer::NEW_VERSION_UPDATED: |
| 576 case installer::IN_USE_UPDATED: | 576 case installer::IN_USE_UPDATED: |
| 577 case installer::UNUSED_BINARIES_UNINSTALLED: | 577 case installer::UNUSED_BINARIES_UNINSTALLED: |
| 578 case installer::OLD_VERSION_DOWNGRADE: |
| 579 case installer::IN_USE_DOWNGRADE: |
| 578 return 0; | 580 return 0; |
| 579 default: | 581 default: |
| 580 return status; | 582 return status; |
| 581 } | 583 } |
| 582 } | 584 } |
| 583 | 585 |
| 584 // static | 586 // static |
| 585 void InstallUtil::ComposeCommandLine(const base::string16& program, | 587 void InstallUtil::ComposeCommandLine(const base::string16& program, |
| 586 const base::string16& arguments, | 588 const base::string16& arguments, |
| 587 base::CommandLine* command_line) { | 589 base::CommandLine* command_line) { |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 676 | 678 |
| 677 // Open the program and see if it references the expected file. | 679 // Open the program and see if it references the expected file. |
| 678 base::File file; | 680 base::File file; |
| 679 BY_HANDLE_FILE_INFORMATION info = {}; | 681 BY_HANDLE_FILE_INFORMATION info = {}; |
| 680 | 682 |
| 681 return (OpenForInfo(path, &file, comparison_type_) && GetInfo(file, &info) && | 683 return (OpenForInfo(path, &file, comparison_type_) && GetInfo(file, &info) && |
| 682 info.dwVolumeSerialNumber == file_info_.dwVolumeSerialNumber && | 684 info.dwVolumeSerialNumber == file_info_.dwVolumeSerialNumber && |
| 683 info.nFileIndexHigh == file_info_.nFileIndexHigh && | 685 info.nFileIndexHigh == file_info_.nFileIndexHigh && |
| 684 info.nFileIndexLow == file_info_.nFileIndexLow); | 686 info.nFileIndexLow == file_info_.nFileIndexLow); |
| 685 } | 687 } |
| OLD | NEW |