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

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

8 files changed, 36 insertions, 31 deletions

diff --git a/chrome/browser/chromeos/dom_ui/login/login_ui.cc b/chrome/browser/chromeos/dom_ui/login/login_ui.cc
index 9cc6b5a..ff9a314 100644
--- a/chrome/browser/chromeos/dom_ui/login/login_ui.cc
+++ b/chrome/browser/chromeos/dom_ui/login/login_ui.cc
@@ -14,6 +14,7 @@
 #include "chrome/browser/chromeos/dom_ui/login/authenticator_facade_cros.h"
 #include "chrome/browser/chromeos/dom_ui/login/login_ui.h"
 #include "chrome/browser/chromeos/dom_ui/login/login_ui_helpers.h"
+#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
@@ -157,7 +158,7 @@ LoginUI::LoginUI(TabContents* contents)
   LoginUIHTMLSource* html_source =
       new LoginUIHTMLSource(MessageLoop::current());
 
-  contents->profile->GetChromeURLDataManager()->AddDataSource(html_source);
+  contents->profile()->GetChromeURLDataManager()->AddDataSource(html_source);
 }
 
 }  // namespace chromeos
diff --git a/chrome/browser/dom_ui/keyboard_ui.cc b/chrome/browser/dom_ui/keyboard_ui.cc
index ea770e4..a85b92d 100644
--- a/chrome/browser/dom_ui/keyboard_ui.cc
+++ b/chrome/browser/dom_ui/keyboard_ui.cc
@@ -10,6 +10,7 @@
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/url_constants.h"
 #include "grit/browser_resources.h"
 #include "ui/base/resource/resource_bundle.h"
diff --git a/chrome/browser/renderer_host/render_widget_host_view_views.cc b/chrome/browser/renderer_host/render_widget_host_view_views.cc
index 8e43afd..5e90c81 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_views.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_views.cc
@@ -59,7 +59,7 @@ int WebInputEventFlagsFromViewsEvent(const views::Event& event) {
 
 WebKit::WebTouchPoint::State TouchPointStateFromEvent(
     const views::TouchEvent* event) {
-  switch (event->GetType()) {
+  switch (event->type()) {
     case ui::ET_TOUCH_PRESSED:
       return WebKit::WebTouchPoint::StatePressed;
     case ui::ET_TOUCH_RELEASED:
@@ -75,7 +75,7 @@ WebKit::WebTouchPoint::State TouchPointStateFromEvent(
 
 WebKit::WebInputEvent::Type TouchEventTypeFromEvent(
     const views::TouchEvent* event) {
-  switch (event->GetType()) {
+  switch (event->type()) {
     case ui::ET_TOUCH_PRESSED:
       return WebKit::WebInputEvent::TouchStart;
     case ui::ET_TOUCH_RELEASED:
@@ -502,7 +502,7 @@ bool RenderWidgetHostViewViews::OnMouseWheel(const views::MouseWheelEvent& e) {
   wmwe.button = WebKit::WebMouseEvent::ButtonNone;
 
   // TODO(sadrul): How do we determine if it's a horizontal scroll?
-  wmwe.deltaY = e.GetOffset();
+  wmwe.deltaY = e.offset();
   wmwe.wheelTicksY = wmwe.deltaY > 0 ? 1 : -1;
 
   GetRenderWidgetHost()->ForwardWheelEvent(wmwe);
@@ -528,12 +528,12 @@ bool RenderWidgetHostViewViews::OnKeyPressed(const views::KeyEvent &e) {
 
   NativeWebKeyboardEvent wke;
   wke.type = WebKit::WebInputEvent::RawKeyDown;
-  wke.windowsKeyCode = e.GetKeyCode();
+  wke.windowsKeyCode = e.key_code();
   wke.setKeyIdentifierFromWindowsKeyCode();
 
   wke.text[0] = wke.unmodifiedText[0] =
     static_cast<unsigned short>(gdk_keyval_to_unicode(
-          ui::GdkKeyCodeForWindowsKeyCode(e.GetKeyCode(),
+          ui::GdkKeyCodeForWindowsKeyCode(e.key_code(),
               e.IsShiftDown() ^ e.IsCapsLockDown())));
 
   wke.modifiers = WebInputEventFlagsFromViewsEvent(e);
@@ -551,7 +551,7 @@ bool RenderWidgetHostViewViews::OnKeyReleased(const views::KeyEvent &e) {
   NativeWebKeyboardEvent wke;
 
   wke.type = WebKit::WebInputEvent::KeyUp;
-  wke.windowsKeyCode = e.GetKeyCode();
+  wke.windowsKeyCode = e.key_code();
   wke.setKeyIdentifierFromWindowsKeyCode();
 
   ForwardKeyboardEvent(wke);
@@ -682,7 +682,7 @@ views::View::TouchStatus RenderWidgetHostViewViews::OnTouchEvent(
   WebKit::WebTouchPoint* point = NULL;
   TouchStatus status = TOUCH_STATUS_UNKNOWN;
 
-  switch (e.GetType()) {
+  switch (e.type()) {
     case ui::ET_TOUCH_PRESSED:
       // Add a new touch point.
       if (touch_event_.touchPointsLength <
@@ -716,7 +716,7 @@ views::View::TouchStatus RenderWidgetHostViewViews::OnTouchEvent(
       break;
     }
     default:
-      DLOG(WARNING) << "Unknown touch event " << e.GetType();
+      DLOG(WARNING) << "Unknown touch event " << e.type();
       break;
   }
 
@@ -754,7 +754,7 @@ views::View::TouchStatus RenderWidgetHostViewViews::OnTouchEvent(
   host_->ForwardTouchEvent(touch_event_);
 
   // If the touch was released, then remove it from the list of touch points.
-  if (e.GetType() == ui::ET_TOUCH_RELEASED) {
+  if (e.type() == ui::ET_TOUCH_RELEASED) {
     --touch_event_.touchPointsLength;
     for (int i = point - touch_event_.touchPoints;
          i < touch_event_.touchPointsLength;
@@ -763,7 +763,7 @@ views::View::TouchStatus RenderWidgetHostViewViews::OnTouchEvent(
     }
     if (touch_event_.touchPointsLength == 0)
       status = TOUCH_STATUS_END;
-  } else if (e.GetType() == ui::ET_TOUCH_CANCELLED) {
+  } else if (e.type() == ui::ET_TOUCH_CANCELLED) {
     status = TOUCH_STATUS_CANCEL;
   }
 
diff --git a/chrome/browser/ui/views/dropdown_bar_host_gtk.cc b/chrome/browser/ui/views/dropdown_bar_host_gtk.cc
index bf97697..00a03f1c 100644
--- a/chrome/browser/ui/views/dropdown_bar_host_gtk.cc
+++ b/chrome/browser/ui/views/dropdown_bar_host_gtk.cc
@@ -37,12 +37,12 @@ NativeWebKeyboardEvent DropdownBarHost::GetKeyboardEvent(
   // Refactor and eliminate the dup code.
   NativeWebKeyboardEvent wke;
   wke.type = WebKit::WebInputEvent::KeyDown;
-  wke.windowsKeyCode = key_event.GetKeyCode();
+  wke.windowsKeyCode = key_event.key_code();
   wke.setKeyIdentifierFromWindowsKeyCode();
 
   wke.text[0] = wke.unmodifiedText[0] =
     static_cast<unsigned short>(gdk_keyval_to_unicode(
-          ui::GdkKeyCodeForWindowsKeyCode(key_event.GetKeyCode(),
+          ui::GdkKeyCodeForWindowsKeyCode(key_event.key_code(),
               key_event.IsShiftDown() ^ key_event.IsCapsLockDown())));
   return wke;
 #else
diff --git a/views/focus/accelerator_handler_touch.cc b/views/focus/accelerator_handler_touch.cc
index 65cc2e7..9b588c1 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.GetFlags() & (ui::EF_RIGHT_BUTTON_DOWN |
+        int button_flags = mouseev.flags() & (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.GetType() == ui::ET_MOUSE_DRAGGED) {
+          if (mouseev.type() == 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.GetType() == ui::ET_MOUSE_DRAGGED) {
+        if (mouseev.type() == ui::ET_MOUSE_DRAGGED) {
           return root->OnMouseDragged(mouseev);
         } else {
           root->OnMouseMoved(mouseev);
diff --git a/views/native_types.h b/views/native_types.h
index abea52e..d61ca96 100644
--- a/views/native_types.h
+++ b/views/native_types.h
@@ -8,18 +8,21 @@
 
 #include "ui/gfx/native_widget_types.h"
 
+#if defined(TOUCH_UI)
+typedef union _XEvent XEvent;
+#elif defined(OS_LINUX)
+typedef union _GdkEvent GdkEvent;
+#endif
+
 namespace views {
 
 #if defined(OS_WIN)
 typedef MSG NativeEvent;
 #endif
-#if defined(OS_LINUX)
-typedef union _GdkEvent GdkEvent;
-typedef GdkEvent* NativeEvent;
-#endif
 #if defined(TOUCH_UI)
-typedef union _XEvent XEvent;
 typedef XEvent* NativeEvent;
+#elif defined(OS_LINUX)
+typedef GdkEvent* NativeEvent;
 #endif
 
 }  // namespace views
diff --git a/views/touchui/gesture_manager.cc b/views/touchui/gesture_manager.cc
index bc4fdd5..2d6c7d0 100644
--- a/views/touchui/gesture_manager.cc
+++ b/views/touchui/gesture_manager.cc
@@ -30,26 +30,26 @@ bool GestureManager::ProcessTouchEventForGesture(const TouchEvent& event,
   // appear in a subsequent CL. This interim version permits verifying that the
   // event distribution code works by turning all touch inputs into
   // mouse approximations.
-  if (event.GetType() == ui::ET_TOUCH_PRESSED) {
+  if (event.type() == ui::ET_TOUCH_PRESSED) {
     DVLOG(1) << "GestureManager::ProcessTouchEventForGesture: TouchPressed";
     MouseEvent mouse_event(ui::ET_MOUSE_PRESSED, event.x(), event.y(),
-                           event.GetFlags());
+                           event.flags());
     source->OnMousePressed(mouse_event);
     return true;
   }
 
-  if (event.GetType() == ui::ET_TOUCH_RELEASED) {
+  if (event.type() == ui::ET_TOUCH_RELEASED) {
     DVLOG(1) << "GestureManager::ProcessTouchEventForGesture: TouchReleased";
     MouseEvent mouse_event(ui::ET_MOUSE_RELEASED, event.x(), event.y(),
-                           event.GetFlags());
+                           event.flags());
     source->OnMouseReleased(mouse_event, false);
     return true;
   }
 
-  if (event.GetType() == ui::ET_TOUCH_MOVED) {
+  if (event.type() == ui::ET_TOUCH_MOVED) {
     DVLOG(1) << "GestureManager::ProcessTouchEventForGesture: TouchMotion";
     MouseEvent mouse_event(ui::ET_MOUSE_DRAGGED, event.x(), event.y(),
-                           event.GetFlags());
+                           event.flags());
     source->OnMouseDragged(mouse_event);
     return true;
   }
diff --git a/views/view_unittest.cc b/views/view_unittest.cc
index bee547d..111554b 100644
--- a/views/view_unittest.cc
+++ b/views/view_unittest.cc
@@ -415,7 +415,7 @@ bool MockGestureManager::ProcessTouchEventForGesture(
     dispatched_synthetic_event_ = false;
     return false;
   }
-  last_touch_event_ =  event.GetType();
+  last_touch_event_ =  event.type();
   last_view_ = source;
   previously_handled_flag_ = status != View::TOUCH_STATUS_UNKNOWN;
   dispatched_synthetic_event_ = true;
@@ -426,15 +426,15 @@ MockGestureManager::MockGestureManager() {
 }
 
 View::TouchStatus TestView::OnTouchEvent(const TouchEvent& event) {
-  last_touch_event_type_ = event.GetType();
+  last_touch_event_type_ = event.type();
   location_.SetPoint(event.x(), event.y());
   if (!in_touch_sequence_) {
-    if (event.GetType() == ui::ET_TOUCH_PRESSED) {
+    if (event.type() == ui::ET_TOUCH_PRESSED) {
       in_touch_sequence_ = true;
       return TOUCH_STATUS_START;
     }
   } else {
-    if (event.GetType() == ui::ET_TOUCH_RELEASED) {
+    if (event.type() == ui::ET_TOUCH_RELEASED) {
       in_touch_sequence_ = false;
       return TOUCH_STATUS_END;
     }