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 "chrome/installer/util/installer_state.h" | 5 #include "chrome/installer/util/installer_state.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <functional> | 8 #include <functional> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 643 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
654 installer::kChromeNewExe, | 654 installer::kChromeNewExe, |
655 installer::kChromeOldExe, | 655 installer::kChromeOldExe, |
656 }; | 656 }; |
657 | 657 |
658 for (int i = 0; i < arraysize(kChromeFilenames); ++i) { | 658 for (int i = 0; i < arraysize(kChromeFilenames); ++i) { |
659 base::FilePath chrome_exe(target_path().Append(kChromeFilenames[i])); | 659 base::FilePath chrome_exe(target_path().Append(kChromeFilenames[i])); |
660 scoped_ptr<FileVersionInfo> file_version_info( | 660 scoped_ptr<FileVersionInfo> file_version_info( |
661 FileVersionInfo::CreateFileVersionInfo(chrome_exe)); | 661 FileVersionInfo::CreateFileVersionInfo(chrome_exe)); |
662 if (file_version_info) { | 662 if (file_version_info) { |
663 base::string16 version_string = file_version_info->file_version(); | 663 base::string16 version_string = file_version_info->file_version(); |
664 if (!version_string.empty() && IsStringASCII(version_string)) | 664 if (!version_string.empty() && base::IsStringASCII(version_string)) |
665 existing_versions->insert(base::UTF16ToASCII(version_string)); | 665 existing_versions->insert(base::UTF16ToASCII(version_string)); |
666 } | 666 } |
667 } | 667 } |
668 } | 668 } |
669 | 669 |
670 void InstallerState::RemoveOldVersionDirectories( | 670 void InstallerState::RemoveOldVersionDirectories( |
671 const Version& new_version, | 671 const Version& new_version, |
672 Version* existing_version, | 672 Version* existing_version, |
673 const base::FilePath& temp_path) const { | 673 const base::FilePath& temp_path) const { |
674 Version version; | 674 Version version; |
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
823 } | 823 } |
824 if (!install_list->Do()) | 824 if (!install_list->Do()) |
825 LOG(ERROR) << "Failed to record installer error information in registry."; | 825 LOG(ERROR) << "Failed to record installer error information in registry."; |
826 } | 826 } |
827 | 827 |
828 bool InstallerState::RequiresActiveSetup() const { | 828 bool InstallerState::RequiresActiveSetup() const { |
829 return system_install() && FindProduct(BrowserDistribution::CHROME_BROWSER); | 829 return system_install() && FindProduct(BrowserDistribution::CHROME_BROWSER); |
830 } | 830 } |
831 | 831 |
832 } // namespace installer | 832 } // namespace installer |
OLD | NEW |