CSS Media Query now reports touch-support accurately for Windows.

content/browser/web_contents/web_contents_impl.cc

Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index cee3043ec6c0f9d39b64d34c1fbab5f98f3d9b5f..0136d5f62e87ba5bde0d0aa28ce1b6f7f95eb2ca 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -15,6 +15,7 @@
 #include "base/sys_info.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
+#include "base/win/windows_version.h"
 #include "content/browser/browser_plugin/old/old_browser_plugin_host.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/debugger/devtools_manager_impl.h"
@@ -531,6 +532,11 @@ WebPreferences WebContentsImpl::GetWebkitPrefs(RenderViewHost* rvh,
   prefs.device_supports_touch |=
       ui::TouchFactory::GetInstance()->IsTouchDevicePresent();
 #endif
+#if defined(OS_WIN)
+  if (base::win::GetVersion() >= base::win::VERSION_WIN7)
+    // Docs: http://msdn.microsoft.com/en-us/library/dd371581(VS.85).aspx

[girard, 2012/08/20 21:15:18]

Q: Is it reasonable to leave a documentation link in the code?  This page
contains a lot of info on the return value(s), such as how to detect a
multi-touch, or pen vs touch, etc.

[sky, 2012/08/20 22:53:49]

Yes.

+    prefs.device_supports_touch = (::GetSystemMetrics(SM_DIGITIZER) > 0);

[girard, 2012/08/20 21:15:18]

Q: Would it be better to move this out to base::win::IsTouchSupported()?

[sky, 2012/08/20 22:53:49]

That sounds better to me.

[girard, 2012/08/23 15:57:23]

Done.

+#endif
 #if defined(OS_ANDROID)
   prefs.device_supports_mouse = false;
 #endif