diff options
| author | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-11 14:24:01 +0000 |
|---|---|---|
| committer | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-11 14:24:01 +0000 |
| commit | 22b67f3205794762e489b2ee1bbf0332f4322b80 (patch) | |
| tree | af333bc7b9a880bb9e6f2d82af951d10f7185d59 | |
| parent | 4e73ceb559645e181fba8e1228cefad4c853701e (diff) | |
| download | chromium_src-22b67f3205794762e489b2ee1bbf0332f4322b80.zip chromium_src-22b67f3205794762e489b2ee1bbf0332f4322b80.tar.gz chromium_src-22b67f3205794762e489b2ee1bbf0332f4322b80.tar.bz2 | |
Merge 146054 - 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
TBR=grt@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10736032
git-svn-id: svn://svn.chromium.org/chrome/branches/1180/src@146114 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | base/win/windows_version.cc | 4 | ||||
| -rw-r--r-- | base/win/windows_version.h | 3 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/flash_ui.cc | 5 |
3 files changed, 7 insertions, 5 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. diff --git a/chrome/browser/ui/webui/flash_ui.cc b/chrome/browser/ui/webui/flash_ui.cc index 6ab19ef..6045026 100644 --- a/chrome/browser/ui/webui/flash_ui.cc +++ b/chrome/browser/ui/webui/flash_ui.cc @@ -244,8 +244,9 @@ void FlashDOMHandler::MaybeRespondToPage() { #if defined(OS_WIN) base::win::OSInfo* os = base::win::OSInfo::GetInstance(); switch (os->version()) { - case base::win::VERSION_XP: - os_label += " XP or Server 2003 or XP Pro 64 bit"; + case base::win::VERSION_XP: os_label += " XP"; break; + case base::win::VERSION_SERVER_2003: + os_label += " Server 2003 or XP Pro 64 bit"; break; case base::win::VERSION_VISTA: os_label += " Vista or Server 2008"; break; case base::win::VERSION_WIN7: os_label += " 7 or Server 2008 R2"; break; |