summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorwfh <wfh@chromium.org>2016-03-25 12:33:15 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-25 19:41:04 +0000
commitc2ebe562761c4deecfbdef0db95d662131e469b4 (patch)
treeab1a15039ac0d25df155d1dabdd74769e0ba25be /base
parent92d0fffc36695c099005bf05862145a89d918f28 (diff)
downloadchromium_src-c2ebe562761c4deecfbdef0db95d662131e469b4.zip
chromium_src-c2ebe562761c4deecfbdef0db95d662131e469b4.tar.gz
chromium_src-c2ebe562761c4deecfbdef0db95d662131e469b4.tar.bz2
Return VERSION_PRE_XP if OS version is pre-XP.
This restores previous behavior before crrev.com/1784623003 BUG=597980 TEST=base_unittests on XP running in NT4 compat mode. Review URL: https://codereview.chromium.org/1832143002 Cr-Commit-Position: refs/heads/master@{#383332}
Diffstat (limited to 'base')
-rw-r--r--base/win/windows_version.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/base/win/windows_version.cc b/base/win/windows_version.cc
index d2f766e..eb3f499 100644
--- a/base/win/windows_version.cc
+++ b/base/win/windows_version.cc
@@ -53,8 +53,7 @@ Version MajorMinorBuildToVersion(int major, int minor, int build) {
return VERSION_WIN_LAST;
}
- NOTREACHED();
- return VERSION_WIN_LAST;
+ return VERSION_PRE_XP;
}
// Retrieve a version from kernel32. This is useful because when running in