6 files changed, 11 insertions, 11 deletions
diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc
index ee41789..a4801b1 100644
--- a/views/controls/menu/menu_controller.cc
+++ b/views/controls/menu/menu_controller.cc
@@ -866,8 +866,8 @@ bool MenuController::Dispatch(GdkEvent* event) {
 }
 
 #if defined(TOUCH_UI)
-base::MessagePumpGlibXDispatcher::DispatchStatus MenuController::Dispatch(
-    XEvent* xev) {
+base::MessagePumpGlibXDispatcher::DispatchStatus
+    MenuController::DispatchX(XEvent* xev) {
   if (!DispatchXEvent(xev))
     return EVENT_IGNORED;
 
diff --git a/views/controls/menu/menu_controller.h b/views/controls/menu/menu_controller.h
index b28cad7..2da3a4b 100644
--- a/views/controls/menu/menu_controller.h
+++ b/views/controls/menu/menu_controller.h
@@ -209,7 +209,7 @@ class MenuController : public MessageLoopForUI::Dispatcher {
 #endif
 
 #if defined(TOUCH_UI)
-  virtual MessagePumpGlibXDispatcher::DispatchStatus Dispatch(XEvent* xevent);
+  virtual MessagePumpGlibXDispatcher::DispatchStatus DispatchX(XEvent* xevent);
 #endif
 
   // Key processing. The return value of this is returned from Dispatch.
diff --git a/views/controls/menu/nested_dispatcher_gtk.cc b/views/controls/menu/nested_dispatcher_gtk.cc
index 890385c..9cdc1a6 100644
--- a/views/controls/menu/nested_dispatcher_gtk.cc
+++ b/views/controls/menu/nested_dispatcher_gtk.cc
@@ -46,9 +46,9 @@ bool NestedDispatcherGtk::Dispatch(GdkEvent* event) {
 }
 
 #if defined(TOUCH_UI)
-base::MessagePumpGlibXDispatcher::DispatchStatus NestedDispatcherGtk::Dispatch(
-    XEvent* xevent) {
-  return creator_->Dispatch(xevent);
+base::MessagePumpGlibXDispatcher::DispatchStatus
+    NestedDispatcherGtk::DispatchX(XEvent* xevent) {
+  return creator_->DispatchX(xevent);
 }
 #endif
 
diff --git a/views/controls/menu/nested_dispatcher_gtk.h b/views/controls/menu/nested_dispatcher_gtk.h
index c8a6563..342ea26 100644
--- a/views/controls/menu/nested_dispatcher_gtk.h
+++ b/views/controls/menu/nested_dispatcher_gtk.h
@@ -41,8 +41,8 @@ class NestedDispatcherGtk : public MessageLoopForUI::Dispatcher {
   virtual bool Dispatch(GdkEvent* event);
 
 #if defined(TOUCH_UI)
-  virtual base::MessagePumpGlibXDispatcher::DispatchStatus Dispatch(
-      XEvent* xevent);
+  virtual base::MessagePumpGlibXDispatcher::DispatchStatus
+      DispatchX(XEvent* xevent);
 #endif
 
   // Creator of the nested loop.
diff --git a/views/focus/accelerator_handler.h b/views/focus/accelerator_handler.h
index 9774922..96eb55d 100644
--- a/views/focus/accelerator_handler.h
+++ b/views/focus/accelerator_handler.h
@@ -43,7 +43,7 @@ class AcceleratorHandler : public MessageLoopForUI::Dispatcher {
 #else
   virtual bool Dispatch(GdkEvent* event);
 #if defined(TOUCH_UI)
-  virtual MessagePumpGlibXDispatcher::DispatchStatus Dispatch(XEvent* xev);
+  virtual MessagePumpGlibXDispatcher::DispatchStatus DispatchX(XEvent* xev);
 #endif
 #endif
 
diff --git a/views/focus/accelerator_handler_touch.cc b/views/focus/accelerator_handler_touch.cc
index 9b588c1..ec3b750 100644
--- a/views/focus/accelerator_handler_touch.cc
+++ b/views/focus/accelerator_handler_touch.cc
@@ -220,8 +220,8 @@ bool AcceleratorHandler::Dispatch(GdkEvent* event) {
   return true;
 }
 
-base::MessagePumpGlibXDispatcher::DispatchStatus AcceleratorHandler::Dispatch(
-    XEvent* xev) {
+base::MessagePumpGlibXDispatcher::DispatchStatus
+    AcceleratorHandler::DispatchX(XEvent* xev) {
   return DispatchXEvent(xev) ?
       base::MessagePumpGlibXDispatcher::EVENT_PROCESSED :
       base::MessagePumpGlibXDispatcher::EVENT_IGNORED;