| OLD | NEW |
|---|
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/sys_info.h" | 5 #include </Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks/ApplicationSe
rvices.framework/Frameworks/CoreGraphics.framework/Headers/CGDirectDisplay.h> |
| 6 | 6 #include </Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks/ApplicationSe
rvices.framework/Frameworks/CoreGraphics.framework/Headers/CGDisplayConfiguratio
n.h> |
| 7 #include <ApplicationServices/ApplicationServices.h> | 7 #include </Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks/ApplicationSe
rvices.framework/Frameworks/CoreGraphics.framework/Headers/CGError.h> |
| 8 #include <CoreServices/CoreServices.h> | 8 #include </Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks/CoreServices.
framework/Frameworks/CarbonCore.framework/Headers/Gestalt.h> |
| 9 #include </Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks/CoreServices.
framework/Headers/../Frameworks/CarbonCore.framework/Headers/MacTypes.h> |
| 10 #include <mach/host_info.h> |
| 11 #include <mach/kern_return.h> |
| 9 #include <mach/mach_host.h> | 12 #include <mach/mach_host.h> |
| 10 #include <mach/mach_init.h> | 13 #include <mach/mach_init.h> |
| 14 #include <mach/message.h> |
| 11 | 15 |
| 16 #include "base/basictypes.h" |
| 12 #include "base/logging.h" | 17 #include "base/logging.h" |
| 18 #include "base/sys_info.h" |
| 13 | 19 |
| 14 namespace base { | 20 namespace base { |
| 15 | 21 |
| 16 // static | 22 // static |
| 17 void SysInfo::OperatingSystemVersionNumbers(int32 *major_version, | 23 void SysInfo::OperatingSystemVersionNumbers(int32 *major_version, |
| 18 int32 *minor_version, | 24 int32 *minor_version, |
| 19 int32 *bugfix_version) { | 25 int32 *bugfix_version) { |
| 20 Gestalt(gestaltSystemVersionMajor, | 26 Gestalt(gestaltSystemVersionMajor, |
| 21 reinterpret_cast<SInt32*>(major_version)); | 27 reinterpret_cast<SInt32*>(major_version)); |
| 22 Gestalt(gestaltSystemVersionMinor, | 28 Gestalt(gestaltSystemVersionMinor, |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 // The primary display in a mirrored set will be counted, but those that | 86 // The primary display in a mirrored set will be counted, but those that |
| 81 // mirror it will not be. | 87 // mirror it will not be. |
| 82 ++display_count; | 88 ++display_count; |
| 83 } | 89 } |
| 84 } | 90 } |
| 85 | 91 |
| 86 return display_count; | 92 return display_count; |
| 87 } | 93 } |
| 88 | 94 |
| 89 } // namespace base | 95 } // namespace base |
| OLD | NEW |
|---|
Chromium Code Reviews
