diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-14 18:18:38 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-14 18:18:38 +0000 |
| commit | ba64e2bae9b1d00777a81231148e0f69909a840c (patch) | |
| tree | 8d8168983abb8635bfd5e9471169febbc397d3f4 /content/renderer/renderer_main.cc | |
| parent | 7bf10b0e47e51d9c6d0a5f39a9d0bfad1d78eef4 (diff) | |
| download | chromium_src-ba64e2bae9b1d00777a81231148e0f69909a840c.zip chromium_src-ba64e2bae9b1d00777a81231148e0f69909a840c.tar.gz chromium_src-ba64e2bae9b1d00777a81231148e0f69909a840c.tar.bz2 | |
Improve and unify Mac OS X run-time version checks.
Don't use base::SysInfo::OperatingSystemVersionNumbers, because it calls
Gestalt, which has a few bad properties. Introduce new functions that perform
specific version checks.
BUG=85972
TEST=base_unittests MacUtilTest.IsOSEllipsis
Review URL: http://codereview.chromium.org/7144007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89028 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/renderer_main.cc')
| -rw-r--r-- | content/renderer/renderer_main.cc | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc index 9ce70b5..2c1937b 100644 --- a/content/renderer/renderer_main.cc +++ b/content/renderer/renderer_main.cc @@ -2,11 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#if defined(OS_MACOSX) -#include <signal.h> -#include <unistd.h> -#endif // OS_MACOSX - #include "base/command_line.h" #include "base/debug/trace_event.h" #include "base/i18n/rtl.h" @@ -33,9 +28,11 @@ #include "ui/base/ui_base_switches.h" #if defined(OS_MACOSX) -#include <Carbon/Carbon.h> // TISCreateInputSourceList +#include <Carbon/Carbon.h> +#include <signal.h> +#include <unistd.h> -#include "base/sys_info.h" +#include "base/mac/mac_util.h" #include "third_party/mach_override/mach_override.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #endif // OS_MACOSX @@ -52,14 +49,10 @@ CFArrayRef ChromeTISCreateInputSourceList( } void InstallFrameworkHacks() { - int32 os_major, os_minor, os_bugfix; - base::SysInfo::OperatingSystemVersionNumbers( - &os_major, &os_minor, &os_bugfix); - // See http://crbug.com/31225 // TODO: Don't do this on newer OS X revisions that have a fix for // http://openradar.appspot.com/radar?id=1156410 - if (os_major == 10 && os_minor >= 6) { + if (base::mac::IsOSSnowLeopardOrLater()) { // Chinese Handwriting was introduced in 10.6. Since doing this override // regresses page cycler memory usage on 10.5, don't do the unnecessary // override there. |