diff options
| author | pkotwicz <pkotwicz@chromium.org> | 2014-12-11 12:58:32 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-11 20:58:58 +0000 |
| commit | 88c4aa0061b3bc4a178041e29096351491522dce (patch) | |
| tree | cdf67c6742f452968f82dcbd6042291851989887 /ash/wm | |
| parent | 4c76f5e220d381f1437b050abd3cf38bb18cde93 (diff) | |
| download | chromium_src-88c4aa0061b3bc4a178041e29096351491522dce.zip chromium_src-88c4aa0061b3bc4a178041e29096351491522dce.tar.gz chromium_src-88c4aa0061b3bc4a178041e29096351491522dce.tar.bz2 | |
[Reland] Remove check for native events in SystemGestureEventFilter::OnMouseEvent()
BUG=401590
TEST=None
TBR=sadrul
Review URL: https://codereview.chromium.org/797713002
Cr-Commit-Position: refs/heads/master@{#307969}
Diffstat (limited to 'ash/wm')
| -rw-r--r-- | ash/wm/system_gesture_event_filter.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/ash/wm/system_gesture_event_filter.cc b/ash/wm/system_gesture_event_filter.cc index 44970b4..f0bfb22 100644 --- a/ash/wm/system_gesture_event_filter.cc +++ b/ash/wm/system_gesture_event_filter.cc @@ -11,13 +11,10 @@ #include "ash/wm/gestures/long_press_affordance_handler.h" #include "ash/wm/gestures/overview_gesture_handler.h" #include "ash/wm/gestures/shelf_gesture_handler.h" +#include "ui/base/touch/touch_device.h" #include "ui/events/event.h" #include "ui/events/event_constants.h" -#if defined(OS_CHROMEOS) && defined(USE_X11) -#include "ui/events/devices/x11/touch_factory_x11.h" -#endif - namespace ash { SystemGestureEventFilter::SystemGestureEventFilter() @@ -30,10 +27,8 @@ SystemGestureEventFilter::~SystemGestureEventFilter() { } void SystemGestureEventFilter::OnMouseEvent(ui::MouseEvent* event) { -#if defined(OS_CHROMEOS) && defined(USE_X11) - if (event->type() == ui::ET_MOUSE_PRESSED && event->HasNativeEvent() && - ui::TouchFactory::GetInstance()->IsTouchDevicePresent() && - Shell::GetInstance()->delegate()) { +#if defined(OS_CHROMEOS) + if (event->type() == ui::ET_MOUSE_PRESSED && ui::IsTouchDevicePresent()) { Shell::GetInstance()->metrics()->RecordUserMetricsAction(UMA_MOUSE_DOWN); } #endif |