summaryrefslogtreecommitdiffstats
path: root/views/touchui
diff options
context:
space:
mode:
authorbacker@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-10 23:28:02 +0000
committerbacker@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-10 23:28:02 +0000
commit8fe16d6423f526223016df11b2ae0630672efe8c (patch)
treeb038628ef7edae4c69347b539fe1f1c6eb64b10e /views/touchui
parent68fd32277f83c43013c24070f1c0bdaa3d42e764 (diff)
downloadchromium_src-8fe16d6423f526223016df11b2ae0630672efe8c.zip
chromium_src-8fe16d6423f526223016df11b2ae0630672efe8c.tar.gz
chromium_src-8fe16d6423f526223016df11b2ae0630672efe8c.tar.bz2
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
Diffstat (limited to 'views/touchui')
-rw-r--r--views/touchui/gesture_manager.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/views/touchui/gesture_manager.cc b/views/touchui/gesture_manager.cc
index 2d6c7d0..bc4fdd5 100644
--- a/views/touchui/gesture_manager.cc
+++ b/views/touchui/gesture_manager.cc
@@ -30,26 +30,26 @@ bool GestureManager::ProcessTouchEventForGesture(const TouchEvent& event,
// appear in a subsequent CL. This interim version permits verifying that the
// event distribution code works by turning all touch inputs into
// mouse approximations.
- if (event.type() == ui::ET_TOUCH_PRESSED) {
+ if (event.GetType() == ui::ET_TOUCH_PRESSED) {
DVLOG(1) << "GestureManager::ProcessTouchEventForGesture: TouchPressed";
MouseEvent mouse_event(ui::ET_MOUSE_PRESSED, event.x(), event.y(),
- event.flags());
+ event.GetFlags());
source->OnMousePressed(mouse_event);
return true;
}
- if (event.type() == ui::ET_TOUCH_RELEASED) {
+ if (event.GetType() == ui::ET_TOUCH_RELEASED) {
DVLOG(1) << "GestureManager::ProcessTouchEventForGesture: TouchReleased";
MouseEvent mouse_event(ui::ET_MOUSE_RELEASED, event.x(), event.y(),
- event.flags());
+ event.GetFlags());
source->OnMouseReleased(mouse_event, false);
return true;
}
- if (event.type() == ui::ET_TOUCH_MOVED) {
+ if (event.GetType() == ui::ET_TOUCH_MOVED) {
DVLOG(1) << "GestureManager::ProcessTouchEventForGesture: TouchMotion";
MouseEvent mouse_event(ui::ET_MOUSE_DRAGGED, event.x(), event.y(),
- event.flags());
+ event.GetFlags());
source->OnMouseDragged(mouse_event);
return true;
}