diff options
| author | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-10 23:28:02 +0000 |
|---|---|---|
| committer | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-10 23:28:02 +0000 |
| commit | 8fe16d6423f526223016df11b2ae0630672efe8c (patch) | |
| tree | b038628ef7edae4c69347b539fe1f1c6eb64b10e /views/focus | |
| parent | 68fd32277f83c43013c24070f1c0bdaa3d42e764 (diff) | |
| download | chromium_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/focus')
| -rw-r--r-- | views/focus/accelerator_handler_touch.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/views/focus/accelerator_handler_touch.cc b/views/focus/accelerator_handler_touch.cc index 9b588c1..65cc2e7 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.flags() & (ui::EF_RIGHT_BUTTON_DOWN | + int button_flags = mouseev.GetFlags() & (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.type() == ui::ET_MOUSE_DRAGGED) { + if (mouseev.GetType() == 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.type() == ui::ET_MOUSE_DRAGGED) { + if (mouseev.GetType() == ui::ET_MOUSE_DRAGGED) { return root->OnMouseDragged(mouseev); } else { root->OnMouseMoved(mouseev); |