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

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

Issue 5110011: A non-GTK version of menus for touchui. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: fix compile for chromeos Created 10 years, 1 month 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: 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 ba7a7b22deee86852a3c6e4bd5c0a54ccef92431..856b0a8fe81978d9dc34e7a8291e793620ed3f4f 100644
--- a/views/controls/menu/nested_dispatcher_gtk.cc
+++ b/views/controls/menu/nested_dispatcher_gtk.cc
@@ -4,10 +4,6 @@
#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,
@@ -34,21 +30,10 @@ 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

Powered by Google App Engine
This is Rietveld 408576698