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

views/widget/tooltip_manager_views.h

 // Copyright (c) 2011 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.
 
 #ifndef VIEWS_WIDGET_TOOLTIP_MANAGER_VIEWS_H_
 #define VIEWS_WIDGET_TOOLTIP_MANAGER_VIEWS_H_
 #pragma once
 
 #include "base/message_loop.h"
 #include "base/timer.h"
@@ skipping 27 matching lines @@
 
   // TooltipManager.
   virtual void UpdateTooltip() OVERRIDE;
   virtual void TooltipTextChanged(View* view) OVERRIDE;
   virtual void ShowKeyboardTooltip(View* view) OVERRIDE;
   virtual void HideKeyboardTooltip() OVERRIDE;
 
 #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:
   void TooltipTimerFired();
   View* GetViewForTooltip(int x, int y, bool for_keyboard);
 
   // Updates the tooltip if required (if there is any change in the tooltip
   // text or the view.
   void UpdateIfRequired(int x, int y, bool for_keyboard);
 
@@ skipping 20 matching lines @@
 
   gfx::Point curr_mouse_pos_;
   base::RepeatingTimer<TooltipManagerViews> tooltip_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(TooltipManagerViews);
 };
 
 }  // namespace views
 
 #endif // VIEWS_WIDGET_TOOLTIP_MANAGER_VIEWS_H_