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

views/mouse_watcher.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/mouse_watcher.h"
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/task.h"
 #include "ui/gfx/screen.h"
@@ skipping 17 matching lines @@
         ALLOW_THIS_IN_INITIALIZER_LIST(notify_listener_factory_(this)) {
     MessageLoopForUI::current()->AddObserver(this);
   }
 
   ~Observer() {
     MessageLoopForUI::current()->RemoveObserver(this);
   }
 
   // MessageLoop::Observer implementation:
 #if defined(OS_WIN)
-  void WillProcessMessage(const MSG& msg) OVERRIDE {
+  virtual base::EventStatus WillProcessEvent(
+      const base::NativeEvent& event) OVERRIDE {
+    return base::EVENT_CONTINUE;
   }
 
-  void DidProcessMessage(const MSG& msg) OVERRIDE {
+  virtual void DidProcessEvent(const base::NativeEvent& event) OVERRIDE {
     // We spy on three different Windows messages here to see if the mouse has
     // moved out of the bounds of the view. The messages are:
     //
     // WM_MOUSEMOVE:
     //   For when the mouse moves from the view into the rest of the browser UI,
     //   i.e. within the bounds of the same windows HWND.
     // WM_MOUSELEAVE:
     //   For when the mouse moves out of the bounds of the view's HWND.
     // WM_NCMOUSELEAVE:
     //   For notification when the mouse leaves the _non-client_ area.
     //
-  switch (msg.message) {
+  switch (event.message) {
     case WM_MOUSEMOVE:
       HandleGlobalMouseMoveEvent(false);
       break;
     case WM_MOUSELEAVE:
     case WM_NCMOUSELEAVE:
       HandleGlobalMouseMoveEvent(true);
       break;
   }
 }
 #elif defined(USE_WAYLAND)
-  MessageLoopForUI::Observer::EventStatus WillProcessEvent(
+  virtual MessageLoopForUI::Observer::EventStatus WillProcessEvent(
       ui::WaylandEvent* event) OVERRIDE {
     switch (event->type) {
       case ui::WAYLAND_MOTION:
         HandleGlobalMouseMoveEvent(false);
         break;
       case ui::WAYLAND_POINTER_FOCUS:
         if (!event->pointer_focus.state)
           HandleGlobalMouseMoveEvent(true);
         break;
       default:
         break;
     }
     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);
         break;
       case GDK_LEAVE_NOTIFY:
         HandleGlobalMouseMoveEvent(true);
         break;
       default:
         break;
     }
   }
-#else
-  EventStatus WillProcessXEvent(XEvent* event) OVERRIDE {
-    // TODO(davemoore) Implement.
-    return EVENT_CONTINUE;
-  }
 #endif
 
  private:
   View* view() const { return mouse_watcher_->host_; }
 
   // Returns whether or not the cursor is currently in the view's "zone" which
   // is defined as a slightly larger region than the view.
   bool IsCursorInViewZone() {
     gfx::Rect bounds = view()->GetLocalBounds();
     gfx::Point view_topleft(bounds.origin());
@@ skipping 77 matching lines @@
 void MouseWatcher::Stop() {
   observer_.reset(NULL);
 }
 
 void MouseWatcher::NotifyListener() {
   observer_.reset(NULL);
   listener_->MouseMovedOutOfView();
 }
 
 }  // namespace views