diff options
author | mustaq <mustaq@chromium.org> | 2015-10-08 09:17:19 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-10-08 16:18:11 +0000 |
commit | 496d6f3c798e91da129379025de6f7e034ecdc4a (patch) | |
tree | 18a83f327edcb9d9d7b4cd1d16124f97ce2249d9 /ui/events/blink | |
parent | dd99089262ac0ec899bbef81005ebe9a097321d0 (diff) | |
download | chromium_src-496d6f3c798e91da129379025de6f7e034ecdc4a.zip chromium_src-496d6f3c798e91da129379025de6f7e034ecdc4a.tar.gz chromium_src-496d6f3c798e91da129379025de6f7e034ecdc4a.tar.bz2 |
Removed PointerType from PointerIdManager.
This is a cleanup CL to aid mouse-to-PE work: nukes parallel definitions
of PointerType enums, switches to enum class to prevent implicit int
conversion, and removes inputTypeToName() duplication.
BUG=476571
Review URL: https://codereview.chromium.org/1368293005
Cr-Commit-Position: refs/heads/master@{#353070}
Diffstat (limited to 'ui/events/blink')
-rw-r--r-- | ui/events/blink/blink_event_util.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ui/events/blink/blink_event_util.cc b/ui/events/blink/blink_event_util.cc index b331017..4dca563 100644 --- a/ui/events/blink/blink_event_util.cc +++ b/ui/events/blink/blink_event_util.cc @@ -81,19 +81,19 @@ WebTouchPoint::PointerType ToWebTouchPointPointerType(const MotionEvent& event, size_t pointer_index) { switch (event.GetToolType(pointer_index)) { case MotionEvent::TOOL_TYPE_UNKNOWN: - return WebTouchPoint::PointerTypeUnknown; + return WebTouchPoint::PointerType::Unknown; case MotionEvent::TOOL_TYPE_FINGER: - return WebTouchPoint::PointerTypeTouch; + return WebTouchPoint::PointerType::Touch; case MotionEvent::TOOL_TYPE_STYLUS: - return WebTouchPoint::PointerTypePen; + return WebTouchPoint::PointerType::Pen; case MotionEvent::TOOL_TYPE_MOUSE: - return WebTouchPoint::PointerTypeMouse; + return WebTouchPoint::PointerType::Mouse; case MotionEvent::TOOL_TYPE_ERASER: - return WebTouchPoint::PointerTypeUnknown; + return WebTouchPoint::PointerType::Unknown; } NOTREACHED() << "Invalid MotionEvent::ToolType = " << event.GetToolType(pointer_index); - return WebTouchPoint::PointerTypeUnknown; + return WebTouchPoint::PointerType::Unknown; } WebTouchPoint CreateWebTouchPoint(const MotionEvent& event, |