Chromium Code Reviews| Index: ash/wm/system_gesture_event_filter.cc |
| diff --git a/ash/wm/system_gesture_event_filter.cc b/ash/wm/system_gesture_event_filter.cc |
| index 6810eaeb54b4b3934a1d9b7410b3d265c1389186..c2a2b5a7ba7b9ebd4bfc188e8de4f41da369b387 100644 |
| --- a/ash/wm/system_gesture_event_filter.cc |
| +++ b/ash/wm/system_gesture_event_filter.cc |
| @@ -56,7 +56,7 @@ SystemGestureEventFilter::~SystemGestureEventFilter() { |
| } |
| void SystemGestureEventFilter::OnMouseEvent(ui::MouseEvent* event) { |
| -#if defined(OS_CHROMEOS) |
| +#if defined(OS_CHROMEOS) && !defined(USE_MESSAGEPUMP_LINUX) |
|
sadrul
2013/04/09 18:50:24
defined(USE_X11)
rjkroege
2013/04/09 19:50:10
logic for U_MPL here: it will be easier to find th
|
| if (event->type() == ui::ET_MOUSE_PRESSED && event->native_event() && |
| ui::TouchFactory::GetInstance()->IsTouchDevicePresent() && |
| Shell::GetInstance()->delegate()) { |