diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-07 02:24:21 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-07 02:24:21 +0000 |
| commit | 7f2d5d50525558e6637945ac9a6377ece01ae8f9 (patch) | |
| tree | 286603d3b7933099a0fed18b23d8bdf09c32a4b7 /views/controls/menu | |
| parent | 03e17d2717545c6df09d0d1dcd69e765412f4f5c (diff) | |
| download | chromium_src-7f2d5d50525558e6637945ac9a6377ece01ae8f9.zip chromium_src-7f2d5d50525558e6637945ac9a6377ece01ae8f9.tar.gz chromium_src-7f2d5d50525558e6637945ac9a6377ece01ae8f9.tar.bz2 | |
aura-views: Make views_aura_desktop compile and run on linux.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7739016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99901 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/menu')
| -rw-r--r-- | views/controls/menu/menu_controller.cc | 6 | ||||
| -rw-r--r-- | views/controls/menu/menu_controller.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc index acad114..1255610 100644 --- a/views/controls/menu/menu_controller.cc +++ b/views/controls/menu/menu_controller.cc @@ -877,6 +877,12 @@ base::MessagePumpDispatcher::DispatchStatus base::MessagePumpDispatcher::EVENT_QUIT : base::MessagePumpDispatcher::EVENT_PROCESSED; } +#elif defined(USE_AURA) +base::MessagePumpDispatcher::DispatchStatus + MenuController::Dispatch(XEvent* xev) { + NOTREACHED(); + return EVENT_PROCESSED; +} #elif defined(TOUCH_UI) base::MessagePumpDispatcher::DispatchStatus MenuController::Dispatch(XEvent* xev) { diff --git a/views/controls/menu/menu_controller.h b/views/controls/menu/menu_controller.h index 91f4d79..0064f98 100644 --- a/views/controls/menu/menu_controller.h +++ b/views/controls/menu/menu_controller.h @@ -222,7 +222,7 @@ class VIEWS_EXPORT MenuController : public MessageLoop::Dispatcher { #elif defined(USE_WAYLAND) virtual base::MessagePumpDispatcher::DispatchStatus Dispatch( ui::WaylandEvent* event); -#elif defined(TOUCH_UI) +#elif defined(TOUCH_UI) || defined(USE_AURA) virtual base::MessagePumpDispatcher::DispatchStatus Dispatch(XEvent* xevent); #else virtual bool Dispatch(GdkEvent* event); |