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

chrome/browser/renderer_host/render_widget_host_view_views.cc

Index: chrome/browser/renderer_host/render_widget_host_view_views.cc
===================================================================
--- chrome/browser/renderer_host/render_widget_host_view_views.cc	(revision 74519)
+++ chrome/browser/renderer_host/render_widget_host_view_views.cc	(working copy)
@@ -59,7 +59,7 @@
 
 WebKit::WebTouchPoint::State TouchPointStateFromEvent(
     const views::TouchEvent* event) {
-  switch (event->type()) {
+  switch (event->GetType()) {
     case ui::ET_TOUCH_PRESSED:
       return WebKit::WebTouchPoint::StatePressed;
     case ui::ET_TOUCH_RELEASED:
@@ -75,7 +75,7 @@
 
 WebKit::WebInputEvent::Type TouchEventTypeFromEvent(
     const views::TouchEvent* event) {
-  switch (event->type()) {
+  switch (event->GetType()) {
     case ui::ET_TOUCH_PRESSED:
       return WebKit::WebInputEvent::TouchStart;
     case ui::ET_TOUCH_RELEASED:
@@ -503,7 +503,7 @@
   wmwe.button = WebKit::WebMouseEvent::ButtonNone;
 
   // TODO(sadrul): How do we determine if it's a horizontal scroll?
-  wmwe.deltaY = e.offset();
+  wmwe.deltaY = e.GetOffset();
   wmwe.wheelTicksY = wmwe.deltaY > 0 ? 1 : -1;
 
   GetRenderWidgetHost()->ForwardWheelEvent(wmwe);
@@ -529,12 +529,12 @@
 
   NativeWebKeyboardEvent wke;
   wke.type = WebKit::WebInputEvent::RawKeyDown;
-  wke.windowsKeyCode = e.key_code();
+  wke.windowsKeyCode = e.GetKeyCode();
   wke.setKeyIdentifierFromWindowsKeyCode();
 
   wke.text[0] = wke.unmodifiedText[0] =
     static_cast<unsigned short>(gdk_keyval_to_unicode(
-          ui::GdkKeyCodeForWindowsKeyCode(e.key_code(),
+          ui::GdkKeyCodeForWindowsKeyCode(e.GetKeyCode(),
               e.IsShiftDown() ^ e.IsCapsLockDown())));
 
   wke.modifiers = WebInputEventFlagsFromViewsEvent(e);
@@ -552,7 +552,7 @@
   NativeWebKeyboardEvent wke;
 
   wke.type = WebKit::WebInputEvent::KeyUp;
-  wke.windowsKeyCode = e.key_code();
+  wke.windowsKeyCode = e.GetKeyCode();
   wke.setKeyIdentifierFromWindowsKeyCode();
 
   ForwardKeyboardEvent(wke);
@@ -683,7 +683,7 @@
   WebKit::WebTouchPoint* point = NULL;
   TouchStatus status = TOUCH_STATUS_UNKNOWN;
 
-  switch (e.type()) {
+  switch (e.GetType()) {
     case ui::ET_TOUCH_PRESSED:
       // Add a new touch point.
       if (touch_event_.touchPointsLength <
@@ -717,7 +717,7 @@
       break;
     }
     default:
-      DLOG(WARNING) << "Unknown touch event " << e.type();
+      DLOG(WARNING) << "Unknown touch event " << e.GetType();
       break;
   }
 
@@ -755,7 +755,7 @@
   host_->ForwardTouchEvent(touch_event_);
 
   // If the touch was released, then remove it from the list of touch points.
-  if (e.type() == ui::ET_TOUCH_RELEASED) {
+  if (e.GetType() == ui::ET_TOUCH_RELEASED) {
     --touch_event_.touchPointsLength;
     for (int i = point - touch_event_.touchPoints;
          i < touch_event_.touchPointsLength;
@@ -764,7 +764,7 @@
     }
     if (touch_event_.touchPointsLength == 0)
       status = TOUCH_STATUS_END;
-  } else if (e.type() == ui::ET_TOUCH_CANCELLED) {
+  } else if (e.GetType() == ui::ET_TOUCH_CANCELLED) {
     status = TOUCH_STATUS_CANCEL;
   }