| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #ifndef BASE_WIN_WINDOWS_VERSION_H_ | 5 #ifndef BASE_WIN_WINDOWS_VERSION_H_ |
| 6 #define BASE_WIN_WINDOWS_VERSION_H_ | 6 #define BASE_WIN_WINDOWS_VERSION_H_ |
| 7 | 7 |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 | 49 |
| 50 // A singleton that can be used to query various pieces of information about the | 50 // A singleton that can be used to query various pieces of information about the |
| 51 // OS and process state. Note that this doesn't use the base Singleton class, so | 51 // OS and process state. Note that this doesn't use the base Singleton class, so |
| 52 // it can be used without an AtExitManager. | 52 // it can be used without an AtExitManager. |
| 53 class BASE_EXPORT OSInfo { | 53 class BASE_EXPORT OSInfo { |
| 54 public: | 54 public: |
| 55 struct VersionNumber { | 55 struct VersionNumber { |
| 56 int major; | 56 int major; |
| 57 int minor; | 57 int minor; |
| 58 int build; | 58 int build; |
| 59 int patch; |
| 59 }; | 60 }; |
| 60 | 61 |
| 61 struct ServicePack { | 62 struct ServicePack { |
| 62 int major; | 63 int major; |
| 63 int minor; | 64 int minor; |
| 64 }; | 65 }; |
| 65 | 66 |
| 66 // The processor architecture this copy of Windows natively uses. For | 67 // The processor architecture this copy of Windows natively uses. For |
| 67 // example, given an x64-capable processor, we have three possibilities: | 68 // example, given an x64-capable processor, we have three possibilities: |
| 68 // 32-bit Chrome running on 32-bit Windows: X86_ARCHITECTURE | 69 // 32-bit Chrome running on 32-bit Windows: X86_ARCHITECTURE |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 }; | 131 }; |
| 131 | 132 |
| 132 // Because this is by far the most commonly-requested value from the above | 133 // Because this is by far the most commonly-requested value from the above |
| 133 // singleton, we add a global-scope accessor here as syntactic sugar. | 134 // singleton, we add a global-scope accessor here as syntactic sugar. |
| 134 BASE_EXPORT Version GetVersion(); | 135 BASE_EXPORT Version GetVersion(); |
| 135 | 136 |
| 136 } // namespace win | 137 } // namespace win |
| 137 } // namespace base | 138 } // namespace base |
| 138 | 139 |
| 139 #endif // BASE_WIN_WINDOWS_VERSION_H_ | 140 #endif // BASE_WIN_WINDOWS_VERSION_H_ |
| OLD | NEW |