Fix mouse-wheel scrolling and shifted/capslocked keyevents for touchui.

BUG=None
TEST=Mouse wheel should work in a webpage, and shift+a should show up as 'A' in a textfield. Caps-lock should also work.

Review URL: http://codereview.chromium.org/4341001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66977 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 6 deletions

diff --git a/views/focus/accelerator_handler_touch.cc b/views/focus/accelerator_handler_touch.cc
index a07b977..aa971d5 100644
--- a/views/focus/accelerator_handler_touch.cc
+++ b/views/focus/accelerator_handler_touch.cc
@@ -132,13 +132,19 @@ bool DispatchXEvent(XEvent* xev) {
 
       case ButtonPress:
       case ButtonRelease: {
-        MouseEvent mouseev(xev);
-        if (xev->type == ButtonPress) {
-          return root->OnMousePressed(mouseev);
+        if (xev->xbutton.button == 4 || xev->xbutton.button == 5) {
+          // Scrolling the wheel triggers button press/release events.
+          MouseWheelEvent wheelev(xev);
+          return root->ProcessMouseWheelEvent(wheelev);
         } else {
-          root->OnMouseReleased(mouseev, false);
-          return true;  // Assume the event has been processed to make sure we
-                        // don't process it twice.
+          MouseEvent mouseev(xev);
+          if (xev->type == ButtonPress) {
+            return root->OnMousePressed(mouseev);
+          } else {
+            root->OnMouseReleased(mouseev, false);
+            return true;  // Assume the event has been processed to make sure we
+                          // don't process it twice.
+          }
         }
       }