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

views/widget/tooltip_manager_views.h

Index: views/widget/tooltip_manager_views.h
diff --git a/views/widget/tooltip_manager_views.h b/views/widget/tooltip_manager_views.h
index ced0ea26a66bac30bbc15d104a4938808dc81a16..c2d63cd71cfe92dd24444075d2f9d294202fad1a 100644
--- a/views/widget/tooltip_manager_views.h
+++ b/views/widget/tooltip_manager_views.h
@@ -45,13 +45,11 @@ class TooltipManagerViews : public TooltipManager,
 #if defined(USE_WAYLAND)
   virtual base::MessagePumpObserver::EventStatus WillProcessEvent(
       ui::WaylandEvent* event) OVERRIDE;
-#elif defined(USE_X11)
+#else
   // MessageLoopForUI::Observer
-  virtual base::MessagePumpObserver::EventStatus WillProcessXEvent(
-      XEvent* xevent) OVERRIDE;
-#elif defined(OS_WIN)
-  virtual void WillProcessMessage(const MSG& msg) OVERRIDE;
-  virtual void DidProcessMessage(const MSG& msg) OVERRIDE;
+  virtual base::EventStatus WillProcessEvent(
+      const base::NativeEvent& event) OVERRIDE;
+  virtual void DidProcessEvent(const base::NativeEvent& event) OVERRIDE;
 #endif
 
  private: