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

base/message_pump_x.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 BASE_MESSAGE_PUMP_X_H
 #define BASE_MESSAGE_PUMP_X_H
 
 #include "base/message_pump.h"
 #include "base/message_pump_glib.h"
+#include "base/message_pump_observer.h"
 
 #include <bitset>
 
 #include <glib.h>
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
 #endif
 
-typedef union _XEvent XEvent;
 typedef struct _XDisplay Display;
 
 namespace base {
 
 // The documentation for this class is in message_pump_glib.h
-class BASE_EXPORT MessagePumpObserver {
- public:
-   enum EventStatus {
-     EVENT_CONTINUE,    // The event should be dispatched as normal.
-     EVENT_HANDLED      // The event should not be processed any farther.
-   };
-
-  // This method is called before processing an XEvent. If the method returns
-  // EVENT_HANDLED, it indicates the event has already been handled, so the
-  // event is not processed any farther. If the method returns EVENT_CONTINUE,
-  // the event dispatching proceeds as normal.
-  virtual EventStatus WillProcessXEvent(XEvent* xevent);
-
- protected:
-  virtual ~MessagePumpObserver() {}
-};
-
-// The documentation for this class is in message_pump_glib.h
 //
 // The nested loop is exited by either posting a quit, or returning EVENT_QUIT
 // from Dispatch.
 class MessagePumpDispatcher {
  public:
   enum DispatchStatus {
     EVENT_IGNORED,    // The event was not processed.
     EVENT_PROCESSED,  // The event has been processed.
     EVENT_QUIT        // The event was processed and the message-loop should
                       // terminate.
@@ skipping 37 matching lines @@
   bool ShouldCaptureXEvent(XEvent* event);
 
   // Dispatches the XEvent and returns true if we should exit the current loop
   // of message processing.
   bool ProcessXEvent(XEvent* event);
 
   // Sends the event to the observers. If an observer returns true, then it does
   // not send the event to any other observers and returns true. Returns false
   // if no observer returns true.
   bool WillProcessXEvent(XEvent* xevent);
+  void DidProcessXEvent(XEvent* xevent);
 #if defined(TOOLKIT_USES_GTK)
   // Some XEvent's can't be directly read from X event queue and will go
   // through GDK's dispatching process and may get discarded. This function
   // sets up a filter to intercept those XEvent's we are interested in
   // and dispatches them so that they won't get lost.
   static GdkFilterReturn GdkEventFilter(GdkXEvent* gxevent,
                                         GdkEvent* gevent,
                                         gpointer data);
 
   static void EventDispatcherX(GdkEvent* event, gpointer data);
@@ skipping 41 matching lines @@
   GSource* x_source_;
 
   DISALLOW_COPY_AND_ASSIGN(MessagePumpX);
 };
 
 typedef MessagePumpX MessagePumpForUI;
 
 }  // namespace base
 
 #endif  // BASE_MESSAGE_PUMP_X_H