| Index: ui/views/view.h
|
| diff --git a/ui/views/view.h b/ui/views/view.h
|
| index 1b29fd01eed9c4465bab20f0509a0d79c7736a55..6ac619c5f19a459b6f5c5cab3cd1c026d4d8ad4a 100644
|
| --- a/ui/views/view.h
|
| +++ b/ui/views/view.h
|
| @@ -579,7 +579,7 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
|
|
|
| // This method is invoked for each GestureEvent created by GestureRecognizer.
|
| // Default implementation does nothing. Override as needed.
|
| - // If a View returns ui::GESTURE_STATUS_CONSUMED from OnGestureEvent, then
|
| + // If a View returns ui::ER_CONSUMED from OnGestureEvent, then
|
| // subsequent gestures will be dispatched to the same View, until the gesture
|
| // ends (i.e. all touch-points are released).
|
| // Scroll gesture events are handled slightly differently: if a View starts
|
| @@ -590,7 +590,7 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
|
| // scroll-gesture events will be sent to this View. However all the other
|
| // gesture-events (e.g. ET_GESTURE_END, ET_GESTURE_PINCH_BEGIN etc.) will
|
| // continue to be dispatched to the first View.
|
| - virtual ui::GestureStatus OnGestureEvent(const ui::GestureEvent& event);
|
| + virtual ui::EventResult OnGestureEvent(const ui::GestureEvent& event);
|
|
|
| // Set the MouseHandler for a drag session.
|
| //
|
| @@ -1286,7 +1286,7 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
|
|
|
| // RootView will invoke this with incoming GestureEvents. This will invoke
|
| // OnGestureEvent and return the result.
|
| - ui::GestureStatus ProcessGestureEvent(const ui::GestureEvent& event);
|
| + ui::EventResult ProcessGestureEvent(const ui::GestureEvent& event);
|
|
|
| // Accelerators --------------------------------------------------------------
|
|
|
|
|