Revert 74518 - Refactor TOUCH_UI to match other refactor....

views/focus/accelerator_handler_touch.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/focus/accelerator_handler.h"
 
 #include <bitset>
 #include <gtk/gtk.h>
 #if defined(HAVE_XINPUT2)
 #include <X11/extensions/XInput2.h>
@@ skipping 81 matching lines @@
       XIDeviceEvent* xievent = static_cast<XIDeviceEvent*>(cookie->data);
       if (xievent->detail == 4 || xievent->detail == 5) {
         MouseWheelEvent wheelev(xev);
         return root->ProcessMouseWheelEvent(wheelev);
       }
 
       MouseEvent mouseev(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;
 
         switch (cookie->evtype) {
           case XI_ButtonPress:
             start_timer = false;
             break;
           case XI_ButtonRelease:
             // For a release, start the timer if this was only button pressed
             // that is being released.
@@ skipping 10 matching lines @@
       }
 
       // Dispatch the event.
       switch (cookie->evtype) {
         case XI_ButtonPress:
           return root->OnMousePressed(mouseev);
         case XI_ButtonRelease:
           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);
             return true;
           }
         }
       }
     }
   }
 
@@ skipping 37 matching lines @@
           } else {
             root->OnMouseReleased(mouseev, false);
             return true;  // Assume the event has been processed to make sure we
                           // don't process it twice.
           }
         }
       }
 
       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);
           return true;
         }
       }
 
 #if defined(HAVE_XINPUT2)
       case GenericEvent: {
         return DispatchX2Event(root, xev);
@@ skipping 19 matching lines @@
 }
 
 base::MessagePumpGlibXDispatcher::DispatchStatus AcceleratorHandler::Dispatch(
     XEvent* xev) {
   return DispatchXEvent(xev) ?
       base::MessagePumpGlibXDispatcher::EVENT_PROCESSED :
       base::MessagePumpGlibXDispatcher::EVENT_IGNORED;
 }
 
 }  // namespace views