[merge from 6.7] #8240 Chrome 17 on a desktop was detected as a touch device

svn changeset:22983/svn branch:6.8

1 files changed, 11 insertions, 1 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/BrowserInfo.java b/src/com/vaadin/terminal/gwt/client/BrowserInfo.java
index fd80b917df..844b4f2e96 100644
--- a/src/com/vaadin/terminal/gwt/client/BrowserInfo.java
+++ b/src/com/vaadin/terminal/gwt/client/BrowserInfo.java
@@ -66,13 +66,23 @@ public class BrowserInfo {
                 browserDetails.setIEMode(documentMode);
             }
         }
-        touchDevice = detectTouchDevice();
+        
+        if (browserDetails.isChrome()) {
+        	touchDevice = detectChromeTouchDevice();
+        } else {
+        	touchDevice = detectTouchDevice();
+        }
     }
 
     private native boolean detectTouchDevice()
     /*-{
         try { document.createEvent("TouchEvent");return true;} catch(e){return false;};
     }-*/;
+    
+    private native boolean detectChromeTouchDevice()
+    /*-{
+        return ("ontouchstart" in window);
+    }-*/;
 
     private native int getIEDocumentMode()
     /*-{