diff options
| author | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-24 16:37:13 +0000 |
|---|---|---|
| committer | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-24 16:37:13 +0000 |
| commit | 71aa16c5feea0cdfb7bb306c414d0dd8e7f167ae (patch) | |
| tree | 1b27e2cc4021b3241c1ecc736306a3aa47085713 /webkit | |
| parent | e537805e0f3c0d1559ec1db9d9d4d6d03642498f (diff) | |
| download | chromium_src-71aa16c5feea0cdfb7bb306c414d0dd8e7f167ae.zip chromium_src-71aa16c5feea0cdfb7bb306c414d0dd8e7f167ae.tar.gz chromium_src-71aa16c5feea0cdfb7bb306c414d0dd8e7f167ae.tar.bz2 | |
Recommit r10259 after successful try server run.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10265 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webkit_glue.cc | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc index c98c987..cd099b3 100644 --- a/webkit/glue/webkit_glue.cc +++ b/webkit/glue/webkit_glue.cc @@ -37,6 +37,7 @@ MSVC_POP_WARNING(); #include "base/file_version_info.h" #include "base/singleton.h" #include "base/string_util.h" +#include "base/sys_info.h" #include "skia/include/SkBitmap.h" #include "webkit/glue/event_conversion.h" #include "webkit/glue/glue_util.h" @@ -336,20 +337,9 @@ void BuildUserAgent(bool mimic_safari, std::string* result) { int32 os_major_version = 0; int32 os_minor_version = 0; int32 os_bugfix_version = 0; -#if defined(OS_WIN) - OSVERSIONINFO info = {0}; - info.dwOSVersionInfoSize = sizeof(info); - GetVersionEx(&info); - os_major_version = info.dwMajorVersion; - os_minor_version = info.dwMinorVersion; -#elif defined(OS_MACOSX) - Gestalt(gestaltSystemVersionMajor, - reinterpret_cast<SInt32*>(&os_major_version)); - Gestalt(gestaltSystemVersionMinor, - reinterpret_cast<SInt32*>(&os_minor_version)); - Gestalt(gestaltSystemVersionBugFix, - reinterpret_cast<SInt32*>(&os_bugfix_version)); -#endif + base::SysInfo::OperatingSystemVersionNumbers(&os_major_version, + &os_minor_version, + &os_bugfix_version); // Get the product name and version, and replace Safari's Version/X string // with it. This is done to expose our product name in a manner that is |