diff options
| -rw-r--r-- | base/base.gypi | 1 | ||||
| -rw-r--r-- | base/sys_info_ios.mm | 68 | ||||
| -rw-r--r-- | base/sys_info_mac.cc | 5 |
3 files changed, 71 insertions, 3 deletions
diff --git a/base/base.gypi b/base/base.gypi index de1ebc7..c13ae5e 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -357,6 +357,7 @@ 'sys_info_android.cc', 'sys_info_chromeos.cc', 'sys_info_freebsd.cc', + 'sys_info_ios.mm', 'sys_info_linux.cc', 'sys_info_mac.cc', 'sys_info_openbsd.cc', diff --git a/base/sys_info_ios.mm b/base/sys_info_ios.mm new file mode 100644 index 0000000..48c7bd9 --- /dev/null +++ b/base/sys_info_ios.mm @@ -0,0 +1,68 @@ +// Copyright (c) 2012 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" + +#import <UIKit/UIKit.h> +#include <mach/mach.h> + +#include "base/logging.h" +#include "base/mac/scoped_nsautorelease_pool.h" +#include "base/sys_string_conversions.h" + +namespace base { + +// static +std::string SysInfo::OperatingSystemName() { + base::mac::ScopedNSAutoreleasePool pool; + // Examples of returned value: 'iPhone OS' on iPad 5.1.1 + // and iPhone 5.1.1. + return SysNSStringToUTF8([[UIDevice currentDevice] systemName]); +} + +// static +std::string SysInfo::OperatingSystemVersion() { + base::mac::ScopedNSAutoreleasePool pool; + return SysNSStringToUTF8([[UIDevice currentDevice] systemVersion]); +} + +// static +void SysInfo::OperatingSystemVersionNumbers(int32* major_version, + int32* minor_version, + int32* bugfix_version) { + base::mac::ScopedNSAutoreleasePool pool; + NSString* version = [[UIDevice currentDevice] systemVersion]; + NSArray* version_info = [version componentsSeparatedByString:@"."]; + NSUInteger length = [version_info count]; + + *major_version = [[version_info objectAtIndex:0] intValue]; + + if (length >= 2) + *minor_version = [[version_info objectAtIndex:1] intValue]; + else + *minor_version = 0; + + if (length >= 3) + *bugfix_version = [[version_info objectAtIndex:2] intValue]; + else + *bugfix_version = 0; +} + +// static +int64 SysInfo::AmountOfPhysicalMemory() { + struct host_basic_info hostinfo; + mach_msg_type_number_t count = HOST_BASIC_INFO_COUNT; + int result = host_info(mach_host_self(), + HOST_BASIC_INFO, + reinterpret_cast<host_info_t>(&hostinfo), + &count); + if (result != KERN_SUCCESS) { + NOTREACHED(); + return 0; + } + DCHECK_EQ(HOST_BASIC_INFO_COUNT, count); + return static_cast<int64>(hostinfo.max_mem); +} + +} // namespace base diff --git a/base/sys_info_mac.cc b/base/sys_info_mac.cc index d8210a2..1a1d23c 100644 --- a/base/sys_info_mac.cc +++ b/base/sys_info_mac.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -46,12 +46,11 @@ int64 SysInfo::AmountOfPhysicalMemory() { HOST_BASIC_INFO, reinterpret_cast<host_info_t>(&hostinfo), &count); - DCHECK_EQ(HOST_BASIC_INFO_COUNT, count); if (result != KERN_SUCCESS) { NOTREACHED(); return 0; } - + DCHECK_EQ(HOST_BASIC_INFO_COUNT, count); return static_cast<int64>(hostinfo.max_mem); } |