From 8fe16d6423f526223016df11b2ae0630672efe8c Mon Sep 17 00:00:00 2001 From: "backer@chromium.org" Date: Thu, 10 Feb 2011 23:28:02 +0000 Subject: Revert 74518 - Refactor TOUCH_UI to match other refactor. A few files were missed in a previous refactor (http://codereview.chromium.org/6480001/). BUG=72040 TEST=none Review URL: http://codereview.chromium.org/6488006 TBR=backer@chromium.org Review URL: http://codereview.chromium.org/6488012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74520 0039d316-1c4b-4281-b951-d872f2087c98 --- views/view_unittest.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'views/view_unittest.cc') diff --git a/views/view_unittest.cc b/views/view_unittest.cc index 111554b..bee547d 100644 --- a/views/view_unittest.cc +++ b/views/view_unittest.cc @@ -415,7 +415,7 @@ bool MockGestureManager::ProcessTouchEventForGesture( dispatched_synthetic_event_ = false; return false; } - last_touch_event_ = event.type(); + last_touch_event_ = event.GetType(); last_view_ = source; previously_handled_flag_ = status != View::TOUCH_STATUS_UNKNOWN; dispatched_synthetic_event_ = true; @@ -426,15 +426,15 @@ MockGestureManager::MockGestureManager() { } View::TouchStatus TestView::OnTouchEvent(const TouchEvent& event) { - last_touch_event_type_ = event.type(); + last_touch_event_type_ = event.GetType(); location_.SetPoint(event.x(), event.y()); if (!in_touch_sequence_) { - if (event.type() == ui::ET_TOUCH_PRESSED) { + if (event.GetType() == ui::ET_TOUCH_PRESSED) { in_touch_sequence_ = true; return TOUCH_STATUS_START; } } else { - if (event.type() == ui::ET_TOUCH_RELEASED) { + if (event.GetType() == ui::ET_TOUCH_RELEASED) { in_touch_sequence_ = false; return TOUCH_STATUS_END; } -- cgit v1.1