diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-18 19:08:01 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-18 19:08:01 +0000 |
| commit | 2839e0061402c2f6d9d409e67850e9e708defa8d (patch) | |
| tree | ed7090ef4e9bdcfa295b64aea49be5180d11b5d7 /views/view_unittest.cc | |
| parent | da7abbb92e3cb6774f91ab37571bca6aaaa7b41a (diff) | |
| download | chromium_src-2839e0061402c2f6d9d409e67850e9e708defa8d.zip chromium_src-2839e0061402c2f6d9d409e67850e9e708defa8d.tar.gz chromium_src-2839e0061402c2f6d9d409e67850e9e708defa8d.tar.bz2 | |
touch: Return an enum from OnTouchEvent.
The enum returned from OnTouchEvent reflects the current status of the touch-sequence. This can be used by the RootView to determine when the touch-event-handler should be reset.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6347002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71677 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/view_unittest.cc')
| -rw-r--r-- | views/view_unittest.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/views/view_unittest.cc b/views/view_unittest.cc index cf6fd88..87f9e6a 100644 --- a/views/view_unittest.cc +++ b/views/view_unittest.cc @@ -154,7 +154,7 @@ class TestView : public View { virtual bool OnMouseDragged(const MouseEvent& event); virtual void OnMouseReleased(const MouseEvent& event, bool canceled); #if defined(TOUCH_UI) - virtual bool OnTouchEvent(const TouchEvent& event); + virtual TouchStatus OnTouchEvent(const TouchEvent& event); #endif virtual void Paint(gfx::Canvas* canvas); virtual bool AcceleratorPressed(const Accelerator& accelerator); @@ -429,10 +429,11 @@ bool MockGestureManager::ProcessTouchEventForGesture( MockGestureManager::MockGestureManager() { } -bool TestView::OnTouchEvent(const TouchEvent& event) { +View::TouchStatus TestView::OnTouchEvent(const TouchEvent& event) { last_touch_event_type_ = event.GetType(); location_.SetPoint(event.x(), event.y()); - return last_touch_event_was_handled_; + return last_touch_event_was_handled_ ? TOUCH_STATUS_CONTINUE : + TOUCH_STATUS_UNKNOWN; } TEST_F(ViewTest, TouchEvent) { |