| 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 c70cbd09bbadece534bc5c460a622594275429d3..93371d0964594293a6d0320b85f2e50cae3a4511 100644
|
| --- a/content/browser/web_contents/web_contents_impl.cc
|
| +++ b/content/browser/web_contents/web_contents_impl.cc
|
| @@ -82,6 +82,10 @@
|
| #include "ui/surface/io_surface_support_mac.h"
|
| #endif
|
|
|
| +#if defined(USE_AURA) && defined(USE_X11)
|
| +#include "ui/base/touch/touch_factory.h"
|
| +#endif // defined (USE_AURA) && defined(USE_X11)
|
| +
|
| // Cross-Site Navigations
|
| //
|
| // If a WebContentsImpl is told to navigate to a different web site (as
|
| @@ -532,6 +536,10 @@ WebPreferences WebContentsImpl::GetWebkitPrefs(RenderViewHost* rvh,
|
| command_line.HasSwitch(switches::kEnableCssVariables);
|
| prefs.device_supports_touch =
|
| ui::GetDisplayLayout() == ui::LAYOUT_TOUCH;
|
| +#if defined(USE_AURA) && defined(USE_X11)
|
| + prefs.device_supports_touch |=
|
| + ui::TouchFactory::GetInstance()->IsTouchDevicePresent();
|
| +#endif
|
| #if defined(OS_ANDROID)
|
| prefs.device_supports_mouse = false;
|
| #endif
|
|
|