OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "base/sys_info.h" |
6 | 6 |
7 #include <windows.h> | 7 #include <windows.h> |
8 #include <stddef.h> | 8 #include <stddef.h> |
9 #include <stdint.h> | 9 #include <stdint.h> |
10 | 10 |
11 #include <limits> | 11 #include <limits> |
12 #include <memory> | |
Nico
2016/04/04 17:14:56
unused
dcheng
2016/04/04 17:43:39
Done. While it is nice to clean these up, I don't
| |
12 | 13 |
13 #include "base/files/file_path.h" | 14 #include "base/files/file_path.h" |
14 #include "base/logging.h" | 15 #include "base/logging.h" |
15 #include "base/memory/scoped_ptr.h" | |
16 #include "base/strings/stringprintf.h" | 16 #include "base/strings/stringprintf.h" |
17 #include "base/threading/thread_restrictions.h" | 17 #include "base/threading/thread_restrictions.h" |
18 #include "base/win/windows_version.h" | 18 #include "base/win/windows_version.h" |
19 | 19 |
20 namespace { | 20 namespace { |
21 | 21 |
22 int64_t AmountOfMemory(DWORDLONG MEMORYSTATUSEX::*memory_field) { | 22 int64_t AmountOfMemory(DWORDLONG MEMORYSTATUSEX::*memory_field) { |
23 MEMORYSTATUSEX memory_info; | 23 MEMORYSTATUSEX memory_info; |
24 memory_info.dwLength = sizeof(memory_info); | 24 memory_info.dwLength = sizeof(memory_info); |
25 if (!GlobalMemoryStatusEx(&memory_info)) { | 25 if (!GlobalMemoryStatusEx(&memory_info)) { |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
120 void SysInfo::OperatingSystemVersionNumbers(int32_t* major_version, | 120 void SysInfo::OperatingSystemVersionNumbers(int32_t* major_version, |
121 int32_t* minor_version, | 121 int32_t* minor_version, |
122 int32_t* bugfix_version) { | 122 int32_t* bugfix_version) { |
123 win::OSInfo* os_info = win::OSInfo::GetInstance(); | 123 win::OSInfo* os_info = win::OSInfo::GetInstance(); |
124 *major_version = os_info->version_number().major; | 124 *major_version = os_info->version_number().major; |
125 *minor_version = os_info->version_number().minor; | 125 *minor_version = os_info->version_number().minor; |
126 *bugfix_version = 0; | 126 *bugfix_version = 0; |
127 } | 127 } |
128 | 128 |
129 } // namespace base | 129 } // namespace base |
OLD | NEW |