Index: chrome/browser/resources/shared/js/cr/ui/card_slider.js |
diff --git a/chrome/browser/resources/shared/js/cr/ui/card_slider.js b/chrome/browser/resources/shared/js/cr/ui/card_slider.js |
index b98aa661157859e9ff9813a62f97a17cbd50dff2..1dc4bf6cf47a9df1f4170b76bb75e1278bcf0520 100644 |
--- a/chrome/browser/resources/shared/js/cr/ui/card_slider.js |
+++ b/chrome/browser/resources/shared/js/cr/ui/card_slider.js |
@@ -132,19 +132,22 @@ cr.define('cr.ui', function() { |
this.frame_.addEventListener('mousewheel', |
this.onMouseWheel_.bind(this)); |
- if (document.documentElement.getAttribute('touchui')) { |
- var TouchHandler = cr.ui.TouchHandler; |
- this.container_.addEventListener(TouchHandler.EventType.TOUCH_START, |
- this.onTouchStart_.bind(this)); |
- this.container_.addEventListener(TouchHandler.EventType.DRAG_START, |
- this.onDragStart_.bind(this)); |
- this.container_.addEventListener(TouchHandler.EventType.DRAG_MOVE, |
- this.onDragMove_.bind(this)); |
- this.container_.addEventListener(TouchHandler.EventType.DRAG_END, |
- this.onDragEnd_.bind(this)); |
- |
- this.touchHandler_.enable(/* opt_capture */ false); |
- } |
+ // Also support touch events in case a touch screen happens to be |
+ // available. Note that we could check cr.isTouchOptimized here, but |
+ // in general sites should just be listening for touch events without |
+ // trying to determine in advance if they may be supported (eg. a touch |
+ // screen can always be plugged in after a page has loaded). |
+ var TouchHandler = cr.ui.TouchHandler; |
+ this.container_.addEventListener(TouchHandler.EventType.TOUCH_START, |
+ this.onTouchStart_.bind(this)); |
+ this.container_.addEventListener(TouchHandler.EventType.DRAG_START, |
+ this.onDragStart_.bind(this)); |
+ this.container_.addEventListener(TouchHandler.EventType.DRAG_MOVE, |
+ this.onDragMove_.bind(this)); |
+ this.container_.addEventListener(TouchHandler.EventType.DRAG_END, |
+ this.onDragEnd_.bind(this)); |
+ |
+ this.touchHandler_.enable(/* opt_capture */ false); |
}, |
/** |