diff options
| author | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-07 19:34:45 +0000 |
|---|---|---|
| committer | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-07 19:34:45 +0000 |
| commit | 5667f1bdc8d290f469f9c5eae7bb4ec7563f85ac (patch) | |
| tree | b3b4d32437596c5462b1907e6c68f2db2d15b8a0 /chrome/installer/util/install_util.cc | |
| parent | 186bf92abfcce5136acb040c301959ff6ca96028 (diff) | |
| download | chromium_src-5667f1bdc8d290f469f9c5eae7bb4ec7563f85ac.zip chromium_src-5667f1bdc8d290f469f9c5eae7bb4ec7563f85ac.tar.gz chromium_src-5667f1bdc8d290f469f9c5eae7bb4ec7563f85ac.tar.bz2 | |
Revert 80819 due to failed tests
TBR=pkasting@chromium.org
Review URL: http://codereview.chromium.org/6816024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80824 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util/install_util.cc')
| -rw-r--r-- | chrome/installer/util/install_util.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/chrome/installer/util/install_util.cc b/chrome/installer/util/install_util.cc index d1110de..999d84a 100644 --- a/chrome/installer/util/install_util.cc +++ b/chrome/installer/util/install_util.cc @@ -19,7 +19,6 @@ #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/string_util.h" -#include "base/sys_info.h" #include "base/values.h" #include "base/version.h" #include "base/win/registry.h" @@ -137,13 +136,15 @@ Version* InstallUtil::GetChromeVersion(BrowserDistribution* dist, } bool InstallUtil::IsOSSupported() { - // We do not support Win2K or older, or XP without service pack 2. - VLOG(1) << base::SysInfo::OperatingSystemName() << ' ' - << base::SysInfo::OperatingSystemVersion(); + int major, minor; base::win::Version version = base::win::GetVersion(); + base::win::GetServicePackLevel(&major, &minor); + + // We do not support Win2K or older, or XP without service pack 2. + VLOG(1) << "Windows Version: " << version + << ", Service Pack: " << major << "." << minor; return (version > base::win::VERSION_XP) || - ((version == base::win::VERSION_XP) && - (base::win::OSInfo::GetInstance()->service_pack().major >= 2)); + (version == base::win::VERSION_XP && major >= 2); } void InstallUtil::WriteInstallerResult(bool system_install, |