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

views/widget/native_widget_gtk.cc

Index: views/widget/native_widget_gtk.cc
diff --git a/views/widget/native_widget_gtk.cc b/views/widget/native_widget_gtk.cc
index a8d38113546be1cc18e7bebe30d66cc6c4103e27..4b9540f5eaeca5371509995c2d51f18d5619c7e9 100644
--- a/views/widget/native_widget_gtk.cc
+++ b/views/widget/native_widget_gtk.cc
@@ -260,7 +260,15 @@ class NativeWidgetGtk::DropObserver : public MessageLoopForUI::Observer {
   static DropObserver* GetInstance() {
     return Singleton<DropObserver>::get();
   }
+#if defined(TOUCH_UI)
+  virtual base::EventStatus WillProcessEvent(
+      const base::NativeEvent& event) OVERRIDE {
+    return base::EVENT_CONTINUE;
+  }
 
+  virtual void DidProcessEvent(const base::NativeEvent& event) OVERRIDE {
+  }
+#else
   virtual void WillProcessEvent(GdkEvent* event) {

[Ben Goodger (Google), 2011/09/30 20:50:51]

Why are these two branches incompatible? Does GdkEvent* never map to
base::NativeEvent?

[oshima, 2011/09/30 21:17:22]

aura/touch has different signature (returns base::EventStatus) and NativeEvent
is XEvent* on X11/Liinux.
Mapping Gdk to NativeEvent would be tricky because TOUCH build needs NativeEvent
to be XEvent too, which
has TOOLKIT_USES_GTK=1. Once we migrate to aura, this code will be all gone.

     if (event->type == GDK_DROP_START) {
       NativeWidgetGtk* widget = GetNativeWidgetGtkForEvent(event);
@@ -271,6 +279,7 @@ class NativeWidgetGtk::DropObserver : public MessageLoopForUI::Observer {
 
   virtual void DidProcessEvent(GdkEvent* event) {
   }
+#endif
 
  private:
   NativeWidgetGtk* GetNativeWidgetGtkForEvent(GdkEvent* event) {