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

chrome/browser/automation/ui_controls_gtk.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 "chrome/browser/automation/ui_controls.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
 #include "base/logging.h"
@@ skipping 23 matching lines @@
   EventWaiter(Task* task, GdkEventType type, int count)
       : task_(task),
         type_(type),
         count_(count) {
     MessageLoopForUI::current()->AddObserver(this);
   }
 
   virtual ~EventWaiter() {
     MessageLoopForUI::current()->RemoveObserver(this);
   }
+#if defined(TOUCH_UI)
+  // MessageLoop::Observer implementation:
+  virtual base::EventStatus WillProcessEvent(const base::NativeEvent& event) {
+    NOTIMPLEMENTED();
+    return base::EVENT_CONTINUE;
+  }
 
+  virtual void DidProcessEvent(const base::NativeEvent& event) {
+  }
+#else
   // MessageLoop::Observer implementation:
   virtual void WillProcessEvent(GdkEvent* event) {
     if ((event->type == type_) && (--count_ == 0)) {
       // At the time we're invoked the event has not actually been processed.
       // Use PostTask to make sure the event has been processed before
       // notifying.
       // NOTE: if processing a message results in running a nested message
       // loop, then DidProcessEvent isn't immediately sent. As such, we do
       // the processing in WillProcessEvent rather than DidProcessEvent.
       MessageLoop::current()->PostTask(FROM_HERE, task_);
       delete this;
     }
   }
 
   virtual void DidProcessEvent(GdkEvent* event) {
     // No-op.
   }
+#endif
 
  private:
   // We pass ownership of task_ to MessageLoop when the current event is
   // received.
   Task* task_;
   GdkEventType type_;
   // The number of events of this type to wait for.
   int count_;
 };
 
@@ skipping 227 matching lines @@
                                int state,
                                Task* task) {
   gfx::Rect bounds = gtk_util::GetWidgetScreenBounds(widget);
   SendMouseMoveNotifyWhenDone(bounds.x() + bounds.width() / 2,
                               bounds.y() + bounds.height() / 2,
                               new ClickTask(button, state, task));
 }
 #endif
 
 }  // namespace ui_controls