Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / ui / views / controls / menu / menu_controller.h

diff --git a/src/ui/views/controls/menu/menu_controller.h b/src/ui/views/controls/menu/menu_controller.h
index a834459..fd2aed7 100644 (file)
--- a/src/ui/views/controls/menu/menu_controller.h
+++ b/src/ui/views/controls/menu/menu_controller.h
@@ -112,9 +112,7 @@ class VIEWS_EXPORT MenuController : public base::MessagePumpDispatcher,
   void OnMouseReleased(SubmenuView* source, const ui::MouseEvent& event);
   void OnMouseMoved(SubmenuView* source, const ui::MouseEvent& event);
   void OnMouseEntered(SubmenuView* source, const ui::MouseEvent& event);
-#if defined(USE_AURA)
   bool OnMouseWheel(SubmenuView* source, const ui::MouseWheelEvent& event);
-#endif
   void OnGestureEvent(SubmenuView* source, ui::GestureEvent* event);
 
   bool GetDropFormats(
@@ -255,7 +253,7 @@ class VIEWS_EXPORT MenuController : public base::MessagePumpDispatcher,
 
   // Dispatcher method. This returns true if the menu was canceled, or
   // if the message is such that the menu should be closed.
-  virtual bool Dispatch(const base::NativeEvent& event) OVERRIDE;
+  virtual uint32_t Dispatch(const base::NativeEvent& event) OVERRIDE;
 
   // Key processing. The return value of this is returned from Dispatch.
   // In other words, if this returns false (which happens if escape was