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

views/widget/tooltip_manager_views.cc

 // 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.
 
 #include "views/widget/tooltip_manager_views.h"
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
 #include <X11/extensions/XInput2.h>
 #endif
@@ skipping 96 matching lines @@
 }
 
 #if defined(USE_WAYLAND)
 base::MessagePumpObserver::EventStatus TooltipManagerViews::WillProcessEvent(
       ui::WaylandEvent* event) {
   if (event->type == ui::WAYLAND_MOTION)
     OnMouseMoved(event->motion.x, event->motion.y);
   return base::MessagePumpObserver::EVENT_CONTINUE;
 }
 #elif defined(USE_X11)
-base::MessagePumpObserver::EventStatus TooltipManagerViews::WillProcessXEvent(
-    XEvent* xevent) {
-  XGenericEventCookie* cookie = &xevent->xcookie;
+base::EventStatus TooltipManagerViews::WillProcessEvent(
+    const base::NativeEvent& event) {
+  XGenericEventCookie* cookie = &event->xcookie;
   if (cookie->evtype == XI_Motion) {
-    XIDeviceEvent* xievent = static_cast<XIDeviceEvent*>(cookie->data);
+    const XIDeviceEvent* xievent = static_cast<XIDeviceEvent*>(cookie->data);
     OnMouseMoved(static_cast<int>(xievent->event_x),
                  static_cast<int>(xievent->event_y));
   }
-  return base::MessagePumpObserver::EVENT_CONTINUE;
+  return base::EVENT_CONTINUE;
 }
+void TooltipManagerViews::DidProcessEvent(const base::NativeEvent& event) {

[msw, 2011/09/27 03:51:42]

Add a blank line between these functions.

[oshima, 2011/09/27 16:39:39]

Done.

+}
+
 #elif defined(OS_WIN)
-void TooltipManagerViews::WillProcessMessage(const MSG& msg) {
+base::EventStatus TooltipManagerViews::WillProcessEvent(
+    const base::NativeEvent& event) {
   if (msg.message == WM_MOUSEMOVE)
     OnMouseMoved(GET_X_LPARAM(msg.lParam), GET_Y_LPARAM(msg.lParam));
+  return base::EVENT_CONTINUE;
 }
 
-void TooltipManagerViews::DidProcessMessage(const MSG& msg) {
+void TooltipManagerViews::DidProcessEvent(const base::NativeEvent& event) {
 }
 #endif
 
 void TooltipManagerViews::TooltipTimerFired() {
   if (tooltip_widget_->IsVisible()) {
     UpdateIfRequired(curr_mouse_pos_.x(), curr_mouse_pos_.y(), false);
   } else {
     tooltip_view_ = GetViewForTooltip(curr_mouse_pos_.x(), curr_mouse_pos_.y(),
         false);
     Update();
@@ skipping 73 matching lines @@
   if (tooltip_timer_.IsRunning())
     tooltip_timer_.Reset();
   curr_mouse_pos_.SetPoint(x, y);
 
   // If tooltip is visible, we may want to hide it. If it is not, we are ok.
   if (tooltip_widget_->IsVisible())
     UpdateIfRequired(curr_mouse_pos_.x(), curr_mouse_pos_.y(), false);
 }
 
 }  // namespace views