diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 20:53:18 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-25 20:53:18 +0000 |
| commit | 6e001bbb455a9555b95df2f8098ef105d022978b (patch) | |
| tree | 9853dd57ceacc4e0714c645fc238edd750d966e6 /content/browser/gpu | |
| parent | 2195b63a6464c9c9bea81e00ba0ba0e625b966cd (diff) | |
| download | chromium_src-6e001bbb455a9555b95df2f8098ef105d022978b.zip chromium_src-6e001bbb455a9555b95df2f8098ef105d022978b.tar.gz chromium_src-6e001bbb455a9555b95df2f8098ef105d022978b.tar.bz2 | |
Fix OperatingSystemName and OperatingSystemVersion on Mac
Prior to this change the posix implementations are used, so the return values are "Darwin" and the Darwin version.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/7065041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86698 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/gpu')
| -rw-r--r-- | content/browser/gpu/gpu_blacklist.cc | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/content/browser/gpu/gpu_blacklist.cc b/content/browser/gpu/gpu_blacklist.cc index b7650a5..612c48b 100644 --- a/content/browser/gpu/gpu_blacklist.cc +++ b/content/browser/gpu/gpu_blacklist.cc @@ -660,23 +660,10 @@ GpuFeatureFlags GpuBlacklist::DetermineGpuFeatureFlags( os = GetOsType(); scoped_ptr<Version> my_os_version; if (os_version == NULL) { - std::string version_string; -#if defined(OS_MACOSX) - // Seems like base::SysInfo::OperatingSystemVersion() returns the wrong - // version in MacOsx. - int32 version_major, version_minor, version_bugfix; - base::SysInfo::OperatingSystemVersionNumbers( - &version_major, &version_minor, &version_bugfix); - version_string = base::StringPrintf("%d.%d.%d", - version_major, - version_minor, - version_bugfix); -#else - version_string = base::SysInfo::OperatingSystemVersion(); + std::string version_string = base::SysInfo::OperatingSystemVersion(); size_t pos = version_string.find_first_not_of("0123456789."); if (pos != std::string::npos) version_string = version_string.substr(0, pos); -#endif my_os_version.reset(Version::GetVersionFromString(version_string)); os_version = my_os_version.get(); } |