diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-14 20:07:12 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-14 20:07:12 +0000 |
| commit | 1ce7a71f486279fcd7186783058d82167d885b19 (patch) | |
| tree | 8265c72bb51bda461cb45e8f1a52694463049619 /chrome/renderer/localized_error.cc | |
| parent | 87ad26d05ee0e7b31211e6e9b0c06d6dd62c086a (diff) | |
| download | chromium_src-1ce7a71f486279fcd7186783058d82167d885b19.zip chromium_src-1ce7a71f486279fcd7186783058d82167d885b19.tar.gz chromium_src-1ce7a71f486279fcd7186783058d82167d885b19.tar.bz2 | |
Use base::win::GetVersion for Windows run-time version checks in preference to
base::SysInfo::OperatingSystemVersionNumbers. The latter is just a
harder-to-use wrapper around the former.
BUG=86062
TEST=none
Review URL: http://codereview.chromium.org/7150018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89055 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/localized_error.cc')
| -rw-r--r-- | chrome/renderer/localized_error.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/chrome/renderer/localized_error.cc b/chrome/renderer/localized_error.cc index ac63d49..3476505 100644 --- a/chrome/renderer/localized_error.cc +++ b/chrome/renderer/localized_error.cc @@ -8,7 +8,6 @@ #include "base/logging.h" #include "base/string16.h" #include "base/string_number_conversions.h" -#include "base/sys_info.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/extensions/extension_set.h" @@ -21,6 +20,10 @@ #include "ui/base/l10n/l10n_util.h" #include "webkit/glue/webkit_glue.h" +#if defined(OS_WIN) +#include "base/win/windows_version.h" +#endif + using WebKit::WebURLError; namespace { @@ -442,14 +445,12 @@ void LocalizedError::GetStrings(const WebKit::WebURLError& error, IDS_ERRORPAGES_SUMMARY_INTERNET_DISCONNECTED_PLATFORM; #if defined(OS_WIN) // Different versions of Windows have different instructions. - int32 major_version, minor_version, bugfix_version; - base::SysInfo::OperatingSystemVersionNumbers( - &major_version, &minor_version, &bugfix_version); - if (major_version < 6) { + base::win::Version windows_version = base::win::GetVersion(); + if (windows_version < base::win::VERSION_VISTA) { // XP, XP64, and Server 2003. platform_string_id = IDS_ERRORPAGES_SUMMARY_INTERNET_DISCONNECTED_PLATFORM_XP; - } else if (major_version == 6 && minor_version == 0) { + } else if (windows_version == base::win::VERSION_VISTA) { // Vista platform_string_id = IDS_ERRORPAGES_SUMMARY_INTERNET_DISCONNECTED_PLATFORM_VISTA; |