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

base/message_pump_x.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 "base/message_pump_x.h"
 
 #include <X11/extensions/XInput2.h>
 
 #include "base/basictypes.h"
 #include "base/message_loop.h"
@@ skipping 162 matching lines @@
 
 bool MessagePumpX::ProcessXEvent(XEvent* xev) {
   bool should_quit = false;
 
   bool have_cookie = false;
   if (xev->type == GenericEvent &&
       XGetEventData(xev->xgeneric.display, &xev->xcookie)) {
     have_cookie = true;
   }
 
-  if (WillProcessXEvent(xev) == MessagePumpObserver::EVENT_CONTINUE) {
+  if (WillProcessXEvent(xev) == EVENT_CONTINUE) {
     MessagePumpDispatcher::DispatchStatus status =
         GetDispatcher()->Dispatch(xev);
 
     if (status == MessagePumpDispatcher::EVENT_QUIT) {
       should_quit = true;
       Quit();
     } else if (status == MessagePumpDispatcher::EVENT_IGNORED) {
       VLOG(1) << "Event (" << xev->type << ") not handled.";
     }
+    DidProcessXEvent(xev);
   }
 
   if (have_cookie) {
     XFreeEventData(xev->xgeneric.display, &xev->xcookie);
   }
 
   return should_quit;
 }
 
 bool MessagePumpX::RunOnce(GMainContext* context, bool block) {
@@ skipping 41 matching lines @@
   retvalue = g_main_context_iteration(context, block);
 #endif
 
   return retvalue;
 }
 
 bool MessagePumpX::WillProcessXEvent(XEvent* xevent) {
   ObserverListBase<MessagePumpObserver>::Iterator it(observers());
   MessagePumpObserver* obs;
   while ((obs = it.GetNext()) != NULL) {
-    if (obs->WillProcessXEvent(xevent))
+    if (obs->WillProcessEvent(xevent))
       return true;
   }
   return false;
 }
 
+void MessagePumpX::DidProcessXEvent(XEvent* xevent) {
+  ObserverListBase<MessagePumpObserver>::Iterator it(observers());
+  MessagePumpObserver* obs;
+  while ((obs = it.GetNext()) != NULL) {
+    obs->DidProcessEvent(xevent);
+  }
+}
+
 #if defined(TOOLKIT_USES_GTK)
 GdkFilterReturn MessagePumpX::GdkEventFilter(GdkXEvent* gxevent,
                                              GdkEvent* gevent,
                                              gpointer data) {
   MessagePumpX* pump = static_cast<MessagePumpX*>(data);
   XEvent* xev = static_cast<XEvent*>(gxevent);
 
   if (pump->ShouldCaptureXEvent(xev) && pump->GetDispatcher()) {
     pump->ProcessXEvent(xev);
     return GDK_FILTER_REMOVE;
@@ skipping 38 matching lines @@
   capture_x_events_[MotionNotify] = true;
   capture_gdk_events_[GDK_MOTION_NOTIFY] = true;
 
   capture_x_events_[GenericEvent] = true;
 }
 
 COMPILE_ASSERT(XLASTEvent >= LASTEvent, XLASTEvent_too_small);
 
 #endif  // defined(TOOLKIT_USES_GTK)
 
-MessagePumpObserver::EventStatus
-    MessagePumpObserver::WillProcessXEvent(XEvent* xev) {
-  return EVENT_CONTINUE;
-}
-
 }  // namespace base