diff options
| author | Will Harris <wfh@chromium.org> | 2016-03-25 14:18:00 -0700 |
|---|---|---|
| committer | Will Harris <wfh@chromium.org> | 2016-03-25 21:21:16 +0000 |
| commit | 8bca746447cee0a2c738afda436ea7d23c63fa56 (patch) | |
| tree | 6cb0ed3e0248e9c7a3013a6da28eecb34240a895 | |
| parent | cc8372d64190559998347bb7f4bebd68fc59850c (diff) | |
| download | chromium_src-8bca746447cee0a2c738afda436ea7d23c63fa56.zip chromium_src-8bca746447cee0a2c738afda436ea7d23c63fa56.tar.gz chromium_src-8bca746447cee0a2c738afda436ea7d23c63fa56.tar.bz2 | |
Merge M49: 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}
(cherry picked from commit c2ebe562761c4deecfbdef0db95d662131e469b4)
Review URL: https://codereview.chromium.org/1833223002 .
Cr-Commit-Position: refs/branch-heads/2623@{#654}
Cr-Branched-From: 92d77538a86529ca35f9220bd3cd512cbea1f086-refs/heads/master@{#369907}
| -rw-r--r-- | base/win/windows_version.cc | 3 |
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 |