Remove touch optimized layout on ChromeOS
BUG=138281
TEST=No touch optimized ui in about flags, nor does it get set when a touch screen is plugged in.
Review URL: https://chromiumcodereview.appspot.com/10832252
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151694 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index d5a09dcb..32ff95d 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -83,6 +83,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
@@ -523,6 +527,10 @@
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
