diff options
| author | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-11 04:07:40 +0000 |
|---|---|---|
| committer | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-11 04:07:40 +0000 |
| commit | 2616ea052c4aa3aca7b4be53d01f79fcbc9bb0c6 (patch) | |
| tree | 3456d2244521b5f916c0fe091c0a7d3639b3a5c2 /base/win | |
| parent | 9269181a4b62b41d2acfd3cb84d790aaa3e7e12f (diff) | |
| download | chromium_src-2616ea052c4aa3aca7b4be53d01f79fcbc9bb0c6.zip chromium_src-2616ea052c4aa3aca7b4be53d01f79fcbc9bb0c6.tar.gz chromium_src-2616ea052c4aa3aca7b4be53d01f79fcbc9bb0c6.tar.bz2 | |
Bring back VERSION_SERVER_2003 to distinguish Server 2003 and XP Pro x64 from regular XP.
BUG=135388
TEST=run chrome on Server 2003 SP2 x86.
TBR=estade@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10701125
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146054 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/win')
| -rw-r--r-- | base/win/windows_version.cc | 4 | ||||
| -rw-r--r-- | base/win/windows_version.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/base/win/windows_version.cc b/base/win/windows_version.cc index a434bde..f0c94e2 100644 --- a/base/win/windows_version.cc +++ b/base/win/windows_version.cc @@ -37,8 +37,8 @@ OSInfo::OSInfo() version_number_.minor = version_info.dwMinorVersion; version_number_.build = version_info.dwBuildNumber; if ((version_number_.major == 5) && (version_number_.minor > 0)) { - // Treat XP Pro x64, Server 2003, Home Server, and Server 2003 R2 as XP. - version_ = VERSION_XP; + // Treat XP Pro x64, Home Server, and Server 2003 R2 as Server 2003. + version_ = (version_number_.minor == 1) ? VERSION_XP : VERSION_SERVER_2003; } else if (version_number_.major == 6) { switch (version_number_.minor) { case 0: diff --git a/base/win/windows_version.h b/base/win/windows_version.h index 20eb365..c17ba14 100644 --- a/base/win/windows_version.h +++ b/base/win/windows_version.h @@ -20,7 +20,8 @@ namespace win { // "if (base::win::GetVersion() >= base::win::VERSION_VISTA) ...". enum Version { VERSION_PRE_XP = 0, // Not supported. - VERSION_XP, // Also includes XP Pro x64, Server 2003, and S2003 R2. + VERSION_XP, + VERSION_SERVER_2003, // Also includes XP Pro x64 and Server 2003 R2. VERSION_VISTA, // Also includes Windows Server 2008. VERSION_WIN7, // Also includes Windows Server 2008 R2. VERSION_WIN8, // Also includes Windows Server 2012. |