diff options
author | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-24 16:14:37 +0000 |
---|---|---|
committer | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-24 16:14:37 +0000 |
commit | 611cc2f8f49fa5468cf3dc2f56052f5d95196a01 (patch) | |
tree | 5ed57a62e1e3d032f63b46515a74ec78b05ada78 /base/sys_info_mac.cc | |
parent | 8af455ad2a4bc2bfed9fbe3561697b42f6acf9c9 (diff) | |
download | chromium_src-611cc2f8f49fa5468cf3dc2f56052f5d95196a01.zip chromium_src-611cc2f8f49fa5468cf3dc2f56052f5d95196a01.tar.gz chromium_src-611cc2f8f49fa5468cf3dc2f56052f5d95196a01.tar.bz2 |
Revert r10259 & subsequent fixes.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10262 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/sys_info_mac.cc')
-rw-r--r-- | base/sys_info_mac.cc | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/base/sys_info_mac.cc b/base/sys_info_mac.cc deleted file mode 100644 index cd93ce9..0000000 --- a/base/sys_info_mac.cc +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "base/sys_info.h" - -#include <CoreServices/CoreServices.h> - -namespace base { - -// static -void SysInfo::OperatingSystemVersionNumbers(int32 *major_version, - int32 *minor_version, - int32 *bugfix_version) { - static bool is_initialized = false; - static int32 major_version_cached = 0; - static int32 minor_version_cached = 0; - static int32 bugfix_version_cached = 0; - - if (!is_initialized) { - // Gestalt can't be called in the sandbox, so we cache its return value. - Gestalt(gestaltSystemVersionMajor, - reinterpret_cast<SInt32*>(&major_version_cached)); - Gestalt(gestaltSystemVersionMinor, - reinterpret_cast<SInt32*>(&minor_version_cached)); - Gestalt(gestaltSystemVersionBugFix, - reinterpret_cast<SInt32*>(&bugfix_version_cached)); - is_initialized = true; - } - - *major_version = major_version_cached; - *minor_version = minor_version_cached; - *bugfix_version = bugfix_version_cached; -} - -// static -void SysInfo::CacheSysInfo() { - // Due to startup time concerns [premature optimization?] we only cache values - // from functions we know to be called in the renderer & fail when the sandbox - // is enabled. - NumberOfProcessors(); - int32 dummy; - OperatingSystemVersionNumbers(&dummy, &dummy, &dummy); -} - -} // namespace base |