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

chrome/browser/renderer_host/render_widget_host_view_views.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 "chrome/browser/renderer_host/render_widget_host_view_views.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 41 matching lines @@
   if (event.IsAltDown())
     modifiers |= WebKit::WebInputEvent::AltKey;
   if (event.IsCapsLockDown())
     modifiers |= WebKit::WebInputEvent::CapsLockOn;
 
   return modifiers;
 }
 
 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:
       return WebKit::WebTouchPoint::StateReleased;
     case ui::ET_TOUCH_MOVED:
       return WebKit::WebTouchPoint::StateMoved;
     case ui::ET_TOUCH_CANCELLED:
       return WebKit::WebTouchPoint::StateCancelled;
     default:
       return WebKit::WebTouchPoint::StateUndefined;
   }
 }
 
 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:
       return WebKit::WebInputEvent::TouchEnd;
     case ui::ET_TOUCH_MOVED:
       return WebKit::WebInputEvent::TouchMove;
     case ui::ET_TOUCH_CANCELLED:
       return WebKit::WebInputEvent::TouchCancel;
     default:
       return WebKit::WebInputEvent::Undefined;
@@ skipping 407 matching lines @@
 }
 
 bool RenderWidgetHostViewViews::OnMouseWheel(const views::MouseWheelEvent& e) {
   WebMouseWheelEvent wmwe;
   InitializeWebMouseEventFromViewsEvent(e, GetMirroredPosition(), &wmwe);
 
   wmwe.type = WebKit::WebInputEvent::MouseWheel;
   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);
   return true;
 }
 
 bool RenderWidgetHostViewViews::OnKeyPressed(const views::KeyEvent &e) {
   // Send key event to input method.
   // TODO host_view->im_context_->ProcessKeyEvent(event);
 
   // This is how it works:
   // (1) If a RawKeyDown event is an accelerator for a reserved command (see
   //     Browser::IsReservedCommand), then the command is executed. Otherwise,
   //     the event is first sent off to the renderer. The renderer is also
   //     notified whether the event would trigger an accelerator in the browser.
   // (2) A Char event is then sent to the renderer.
   // (3) If the renderer does not process the event in step (1), and the event
   //     triggers an accelerator, then it will ignore the event in step (2). The
   //     renderer also sends back notification to the browser for both steps (1)
   //     and (2) about whether the events were processed or not. If the event
   //     for (1) is not processed by the renderer, then it is processed by the
   //     browser, and (2) is ignored.
 
   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);
   ForwardKeyboardEvent(wke);
 
   // send the keypress event
   wke.type = WebKit::WebInputEvent::Char;
   ForwardKeyboardEvent(wke);
 
   return TRUE;
 }
 
 bool RenderWidgetHostViewViews::OnKeyReleased(const views::KeyEvent &e) {
   // TODO(bryeung): deal with input methods
   NativeWebKeyboardEvent wke;
 
   wke.type = WebKit::WebInputEvent::KeyUp;
-  wke.windowsKeyCode = e.key_code();
+  wke.windowsKeyCode = e.GetKeyCode();
   wke.setKeyIdentifierFromWindowsKeyCode();
 
   ForwardKeyboardEvent(wke);
 
   return TRUE;
 }
 
 void RenderWidgetHostViewViews::DidGainFocus() {
 #if 0
   // TODO(anicolao): - is this needed/replicable?
@@ skipping 110 matching lines @@
 #endif
   host_->ForwardKeyboardEvent(event);
 }
 
 views::View::TouchStatus RenderWidgetHostViewViews::OnTouchEvent(
     const views::TouchEvent& e) {
   // Update the list of touch points first.
   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 <
           WebTouchEvent::touchPointsLengthCap) {
         point = &touch_event_.touchPoints[touch_event_.touchPointsLength++];
         point->id = e.identity();
 
         if (touch_event_.touchPointsLength == 1) {
           // A new touch sequence has started.
           status = TOUCH_STATUS_START;
@@ skipping 13 matching lines @@
       for (int i = 0; i < touch_event_.touchPointsLength; ++i) {
         point = touch_event_.touchPoints + i;
         if (point->id == e.identity()) {
           break;
         }
         point = NULL;
       }
       break;
     }
     default:
-      DLOG(WARNING) << "Unknown touch event " << e.type();
+      DLOG(WARNING) << "Unknown touch event " << e.GetType();
       break;
   }
 
   if (!point)
     return TOUCH_STATUS_UNKNOWN;
 
   if (status != TOUCH_STATUS_START)
     status = TOUCH_STATUS_CONTINUE;
 
   // Update the location and state of the point.
@@ skipping 17 matching lines @@
   }
 
   // Update the type of the touch event.
   touch_event_.type = TouchEventTypeFromEvent(&e);
   touch_event_.timeStampSeconds = base::Time::Now().ToDoubleT();
 
   // The event and all the touches have been updated. Dispatch.
   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;
          ++i) {
       touch_event_.touchPoints[i] = touch_event_.touchPoints[i + 1];
     }
     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;
   }
 
   return status;
 }
 
 std::string RenderWidgetHostViewViews::GetClassName() const {
   return kViewClassName;
 }
 
 // static
 RenderWidgetHostView*
     RenderWidgetHostView::GetRenderWidgetHostViewFromNativeView(
         gfx::NativeView widget) {
   gpointer user_data = g_object_get_data(G_OBJECT(widget),
                                          kRenderWidgetHostViewKey);
   return reinterpret_cast<RenderWidgetHostView*>(user_data);
 }