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

Unified Diff: Source/core/platform/win/SystemInfo.cpp

Issue 13901012: Remove OS(WINCE) as blink and chromium does not support WinCe. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 8 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
Index: Source/core/platform/win/SystemInfo.cpp
diff --git a/Source/core/platform/win/SystemInfo.cpp b/Source/core/platform/win/SystemInfo.cpp
index c9edca08f196498f7275fcc257f75d9a6ca7a32f..44398e5574da7e2691795d3d9841388a54cbf729 100644
--- a/Source/core/platform/win/SystemInfo.cpp
+++ b/Source/core/platform/win/SystemInfo.cpp
@@ -39,23 +39,13 @@ WindowsVersion windowsVersion(int* major, int* minor)
if (!initialized) {
initialized = true;
-#if OS(WINCE)
- OSVERSIONINFO versionInfo;
-#else
OSVERSIONINFOEX versionInfo;
-#endif
ZeroMemory(&versionInfo, sizeof(versionInfo));
versionInfo.dwOSVersionInfoSize = sizeof(versionInfo);
GetVersionEx(reinterpret_cast<OSVERSIONINFO*>(&versionInfo));
majorVersion = versionInfo.dwMajorVersion;
minorVersion = versionInfo.dwMinorVersion;
-#if OS(WINCE)
- if (majorVersion >= 1 && majorVersion <= 7)
- version = static_cast<WindowsVersion>(WindowsCE1 + (majorVersion - 1));
- else
- version = (majorVersion < 1) ? WindowsCE1 : WindowsCE7;
-#else
if (versionInfo.dwPlatformId == VER_PLATFORM_WIN32s)
version = Windows3_1;
else if (versionInfo.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) {
@@ -77,7 +67,6 @@ WindowsVersion windowsVersion(int* major, int* minor)
} else
version = (majorVersion == 4) ? WindowsNT4 : WindowsNT3;
}
-#endif
}
if (major)
@@ -114,7 +103,6 @@ static String osVersionForUAString()
return familyName + String::number(major) + '.' + String::number(minor);
}
-#if !OS(WINCE)
static bool isWOW64()
{
static bool initialized = false;
@@ -158,18 +146,15 @@ static WORD processorArchitecture()
return architecture;
}
-#endif
static String architectureTokenForUAString()
{
-#if !OS(WINCE)
if (isWOW64())
return "; WOW64";
if (processorArchitecture() == PROCESSOR_ARCHITECTURE_AMD64)
return "; Win64; x64";
if (processorArchitecture() == PROCESSOR_ARCHITECTURE_IA64)
return "; Win64; IA64";
-#endif
return String();
}

Powered by Google App Engine
This is Rietveld 408576698