| 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
|
|
|