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

Unified Diff: views/controls/menu/nested_dispatcher_gtk.cc

Issue 3801011: touchui: Directly process key and mouse events. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: nit Created 10 years, 2 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
« no previous file with comments | « views/controls/menu/nested_dispatcher_gtk.h ('k') | views/event.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/menu/nested_dispatcher_gtk.cc
diff --git a/views/controls/menu/nested_dispatcher_gtk.cc b/views/controls/menu/nested_dispatcher_gtk.cc
index 856b0a8fe81978d9dc34e7a8291e793620ed3f4f..ba7a7b22deee86852a3c6e4bd5c0a54ccef92431 100644
--- a/views/controls/menu/nested_dispatcher_gtk.cc
+++ b/views/controls/menu/nested_dispatcher_gtk.cc
@@ -4,6 +4,10 @@
#include "views/controls/menu/nested_dispatcher_gtk.h"
+#if defined(TOUCH_UI)
+#include "views/focus/accelerator_handler.h"
+#endif
+
namespace views {
NestedDispatcherGtk::NestedDispatcherGtk(MessageLoopForUI::Dispatcher* creator,
@@ -30,10 +34,21 @@ void NestedDispatcherGtk::CreatorDestroyed() {
bool NestedDispatcherGtk::Dispatch(GdkEvent* event) {
if (creator_ != NULL) {
+#if defined(TOUCH_UI)
+ return static_cast<base::MessagePumpForUI::Dispatcher*>
+ (creator_)->Dispatch(event);
+#else
return creator_->Dispatch(event);
+#endif
} else {
return false;
}
}
+#if defined(TOUCH_UI)
+bool NestedDispatcherGtk::Dispatch(XEvent* xevent) {
+ return creator_ ? creator_->Dispatch(xevent) : false;
+}
+#endif
+
} // namespace views
« no previous file with comments | « views/controls/menu/nested_dispatcher_gtk.h ('k') | views/event.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698