Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5550)

Unified Diff: chrome/browser/automation/ui_controls_gtk.cc

Issue 8021009: Consolidate message observer API for win and aura (and touch). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/automation/ui_controls_gtk.cc
diff --git a/chrome/browser/automation/ui_controls_gtk.cc b/chrome/browser/automation/ui_controls_gtk.cc
index 6c7c5f715703c2a3bb275e205022d5ba2b67370c..db52ea26b83cffb7f6d5dd506200fd133bc636a3 100644
--- a/chrome/browser/automation/ui_controls_gtk.cc
+++ b/chrome/browser/automation/ui_controls_gtk.cc
@@ -41,7 +41,16 @@ class EventWaiter : public MessageLoopForUI::Observer {
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)) {
@@ -59,6 +68,7 @@ class EventWaiter : public MessageLoopForUI::Observer {
virtual void DidProcessEvent(GdkEvent* event) {
// No-op.
}
+#endif
private:
// We pass ownership of task_ to MessageLoop when the current event is

Powered by Google App Engine
This is Rietveld 408576698