From 73fd880f0fc45d25af70260ff54f240e248ff4be Mon Sep 17 00:00:00 2001 From: "backer@chromium.org" Date: Fri, 11 Feb 2011 05:59:47 +0000 Subject: 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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74568 0039d316-1c4b-4281-b951-d872f2087c98 --- views/focus/accelerator_handler_touch.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'views/focus') diff --git a/views/focus/accelerator_handler_touch.cc b/views/focus/accelerator_handler_touch.cc index 65cc2e7..9b588c1 100644 --- a/views/focus/accelerator_handler_touch.cc +++ b/views/focus/accelerator_handler_touch.cc @@ -99,7 +99,7 @@ bool DispatchX2Event(RootView* root, XEvent* xev) { if (!touch_event) { // Show the cursor, and decide whether or not the cursor should be // automatically hidden after a certain time of inactivity. - int button_flags = mouseev.GetFlags() & (ui::EF_RIGHT_BUTTON_DOWN | + int button_flags = mouseev.flags() & (ui::EF_RIGHT_BUTTON_DOWN | ui::EF_MIDDLE_BUTTON_DOWN | ui::EF_LEFT_BUTTON_DOWN); bool start_timer = false; @@ -130,7 +130,7 @@ bool DispatchX2Event(RootView* root, XEvent* xev) { root->OnMouseReleased(mouseev, false); return true; case XI_Motion: { - if (mouseev.GetType() == ui::ET_MOUSE_DRAGGED) { + if (mouseev.type() == ui::ET_MOUSE_DRAGGED) { return root->OnMouseDragged(mouseev); } else { root->OnMouseMoved(mouseev); @@ -188,7 +188,7 @@ bool DispatchXEvent(XEvent* xev) { case MotionNotify: { MouseEvent mouseev(xev); - if (mouseev.GetType() == ui::ET_MOUSE_DRAGGED) { + if (mouseev.type() == ui::ET_MOUSE_DRAGGED) { return root->OnMouseDragged(mouseev); } else { root->OnMouseMoved(mouseev); -- cgit v1.1