Consolidate message observer API for win and aura (and touch).

views/mouse_watcher.cc

Index: views/mouse_watcher.cc
diff --git a/views/mouse_watcher.cc b/views/mouse_watcher.cc
index df5adeb4eecfa99829a1a01b9cf04397a515f0a9..969e4f50162392cabd0b99d045682827229555f6 100644
--- a/views/mouse_watcher.cc
+++ b/views/mouse_watcher.cc
@@ -35,7 +35,8 @@ class MouseWatcher::Observer : public MessageLoopForUI::Observer {
 
   // MessageLoop::Observer implementation:
 #if defined(OS_WIN)
-  void WillProcessMessage(const MSG& msg) OVERRIDE {
+  base::EventStatus WillProcessEvent(const MSG& msg) OVERRIDE {
+    return base::EVENT_CONTINUE;
   }
 
   void DidProcessMessage(const MSG& msg) OVERRIDE {
@@ -61,7 +62,7 @@ class MouseWatcher::Observer : public MessageLoopForUI::Observer {
   }
 }
 #elif defined(USE_WAYLAND)
-  MessageLoopForUI::Observer::EventStatus WillProcessEvent(
+  virtual MessageLoopForUI::Observer::EventStatus WillProcessEvent(
       ui::WaylandEvent* event) OVERRIDE {
     switch (event->type) {
       case ui::WAYLAND_MOTION:
@@ -76,11 +77,19 @@ class MouseWatcher::Observer : public MessageLoopForUI::Observer {
     }
     return EVENT_CONTINUE;
   }
+#elif defined(TOUCH_UI) || defined(USE_AURA)
+  virtual base::EventStatus WillProcessEvent(
+      const base::NativeEvent& event) OVERRIDE {
+    return base::EVENT_CONTINUE;
+  }
+  virtual void DidProcessEvent(const base::NativeEvent& event) OVERRIDE {
+    NOTIMPLEMENTED();
+  }
 #elif defined(TOOLKIT_USES_GTK)
-  void WillProcessEvent(GdkEvent* event) OVERRIDE {
+  virtual void WillProcessEvent(GdkEvent* event) OVERRIDE {
   }
 
-  void DidProcessEvent(GdkEvent* event) OVERRIDE {
+  virtual void DidProcessEvent(GdkEvent* event) OVERRIDE {
     switch (event->type) {
       case GDK_MOTION_NOTIFY:
         HandleGlobalMouseMoveEvent(false);
@@ -92,11 +101,6 @@ class MouseWatcher::Observer : public MessageLoopForUI::Observer {
         break;
     }
   }
-#else
-  EventStatus WillProcessXEvent(XEvent* event) OVERRIDE {
-    // TODO(davemoore) Implement.
-    return EVENT_CONTINUE;
-  }
 #endif
 
  private: