summaryrefslogtreecommitdiffstats
path: root/views/touchui/gesture_manager.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-10 04:56:36 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-10 04:56:36 +0000
commit8d577a70f6e6d2e47f0ac32f8606e489a7a77998 (patch)
tree48eae3f525e0323362db629efa2589e70a5a4e49 /views/touchui/gesture_manager.cc
parent8fb0ecf45b286845fd2004a157a294d7e3ca7a39 (diff)
downloadchromium_src-8d577a70f6e6d2e47f0ac32f8606e489a7a77998.zip
chromium_src-8d577a70f6e6d2e47f0ac32f8606e489a7a77998.tar.gz
chromium_src-8d577a70f6e6d2e47f0ac32f8606e489a7a77998.tar.bz2
Migrate Event API methods to Google Style.
Re-landing, moving the bits Mac uses to ui/base/events.h BUG=72040 TEST=none TBR=sky Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=74377 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74408 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/touchui/gesture_manager.cc')
-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 46ee0da..bc4fdd5 100644
--- a/views/touchui/gesture_manager.cc
+++ b/views/touchui/gesture_manager.cc
@@ -30,25 +30,25 @@ 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.GetType() == Event::ET_TOUCH_PRESSED) {
+ if (event.GetType() == ui::ET_TOUCH_PRESSED) {
DVLOG(1) << "GestureManager::ProcessTouchEventForGesture: TouchPressed";
- MouseEvent mouse_event(Event::ET_MOUSE_PRESSED, event.x(), event.y(),
+ MouseEvent mouse_event(ui::ET_MOUSE_PRESSED, event.x(), event.y(),
event.GetFlags());
source->OnMousePressed(mouse_event);
return true;
}
- if (event.GetType() == Event::ET_TOUCH_RELEASED) {
+ if (event.GetType() == ui::ET_TOUCH_RELEASED) {
DVLOG(1) << "GestureManager::ProcessTouchEventForGesture: TouchReleased";
- MouseEvent mouse_event(Event::ET_MOUSE_RELEASED, event.x(), event.y(),
+ MouseEvent mouse_event(ui::ET_MOUSE_RELEASED, event.x(), event.y(),
event.GetFlags());
source->OnMouseReleased(mouse_event, false);
return true;
}
- if (event.GetType() == Event::ET_TOUCH_MOVED) {
+ if (event.GetType() == ui::ET_TOUCH_MOVED) {
DVLOG(1) << "GestureManager::ProcessTouchEventForGesture: TouchMotion";
- MouseEvent mouse_event(Event::ET_MOUSE_DRAGGED, event.x(), event.y(),
+ MouseEvent mouse_event(ui::ET_MOUSE_DRAGGED, event.x(), event.y(),
event.GetFlags());
source->OnMouseDragged(mouse_event);
return true;