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

Unified Diff: chrome_elf/thunk_getter.cc

Issue 891813003: Add support for correct Windows 10 version enumeration. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: better comments 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 | « chrome/test/mini_installer/variable_expander.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_elf/thunk_getter.cc
diff --git a/chrome_elf/thunk_getter.cc b/chrome_elf/thunk_getter.cc
index 8421e5eecf140fbdb6491004e199ceedb34f5cc6..649fb0ca518c963e8f4d4299acca3a75dea8e964 100644
--- a/chrome_elf/thunk_getter.cc
+++ b/chrome_elf/thunk_getter.cc
@@ -20,6 +20,7 @@ enum Version {
VERSION_WIN7, // Also includes Windows Server 2008 R2.
VERSION_WIN8, // Also includes Windows Server 2012.
VERSION_WIN8_1,
+ VERSION_WIN10,
VERSION_WIN_LAST, // Indicates error condition.
};
@@ -85,6 +86,8 @@ class OSInfo {
version_ = VERSION_WIN8_1;
break;
}
+ } else if (version_number_.major == 10) {
+ version_ = VERSION_WIN10;
} else if (version_number_.major > 6) {
version_ = VERSION_WIN_LAST;
} else {
« no previous file with comments | « chrome/test/mini_installer/variable_expander.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698