Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(238)

Unified Diff: base/win/windows_version.cc

Issue 895853003: Update from https://crrev.com/314320 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/win/windows_version.h ('k') | build/all.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/win/windows_version.cc
diff --git a/base/win/windows_version.cc b/base/win/windows_version.cc
index a99cd1840acb91ddc072a27e46f04c8eafc553a3..fc2def39194e3b7d31e9e3f8a9a55f2136685715 100644
--- a/base/win/windows_version.cc
+++ b/base/win/windows_version.cc
@@ -64,6 +64,8 @@ OSInfo::OSInfo()
version_ = VERSION_WIN8_1;
break;
}
+ } else if (version_number_.major == 10) {
+ version_ = VERSION_WIN10;
} else if (version_number_.major > 6) {
NOTREACHED();
version_ = VERSION_WIN_LAST;
@@ -84,7 +86,7 @@ OSInfo::OSInfo()
GetProductInfoPtr get_product_info;
DWORD os_type;
- if (version_info.dwMajorVersion == 6) {
+ if (version_info.dwMajorVersion == 6 || version_info.dwMajorVersion == 10) {
// Only present on Vista+.
get_product_info = reinterpret_cast<GetProductInfoPtr>(
::GetProcAddress(::GetModuleHandle(L"kernel32.dll"), "GetProductInfo"));
« no previous file with comments | « base/win/windows_version.h ('k') | build/all.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698