Consolidate ui::NativeEvent and base::NativeEvent

base/message_pump_observer.h

Index: base/message_pump_observer.h
diff --git a/base/message_pump_observer.h b/base/message_pump_observer.h
index d12f2211c4fc9f4e175d86fbbb45eef5a9e23064..a53482897bfe84ae62738569fa0a166b101de80e 100644
--- a/base/message_pump_observer.h
+++ b/base/message_pump_observer.h
@@ -4,19 +4,12 @@
 
 #ifndef BASE_MESSAGE_PUMP_OBSERVER_H
 #define BASE_MESSAGE_PUMP_OBSERVER_H
+#pragma once
 
-#if defined(USE_X11)
-typedef union _XEvent XEvent;
-#endif
+#include "base/event_types.h"
 
 namespace base {
 
-#if defined(OS_WIN)
-typedef MSG NativeEvent;
-#elif defined(USE_X11)
-typedef XEvent* NativeEvent;
-#endif
-
 enum EventStatus {
   EVENT_CONTINUE,    // The event should be dispatched as normal.
 #if defined(USE_X11)
@@ -39,11 +32,11 @@ class BASE_EXPORT MessagePumpObserver {
   // been handled, so the event is not processed any farther. If the
   // method returns EVENT_CONTINUE, the event dispatching proceeds as
   // normal.
-  virtual EventStatus WillProcessEvent(const NativeEvent& event) = 0;
+  virtual EventStatus WillProcessEvent(const base::NativeEvent& event) = 0;

[msw, 2011/10/04 18:10:37]

The base namespace qualifier isn't needed here or in DidProcessEvent.

[oshima, 2011/10/04 19:42:48]

Done.

 
   // This method is called after processing a message. This method
   // will not be called if WillProcessEvent returns EVENT_HANDLED.
-  virtual void DidProcessEvent(const NativeEvent& event) = 0;
+  virtual void DidProcessEvent(const base::NativeEvent& event) = 0;
 
  protected:
   virtual ~MessagePumpObserver() {}