| Index: ui/views/color_chooser/color_chooser_view.cc
|
| diff --git a/ui/views/color_chooser/color_chooser_view.cc b/ui/views/color_chooser/color_chooser_view.cc
|
| index cb99d071829ec4c299a3f32df185f7e7e85c3d70..dc35ff1a74ea9124506668c6f66fe7cf2d3c4ade 100644
|
| --- a/ui/views/color_chooser/color_chooser_view.cc
|
| +++ b/ui/views/color_chooser/color_chooser_view.cc
|
| @@ -73,15 +73,15 @@ class LocatedEventHandlerView : public views::View {
|
| return true;
|
| }
|
|
|
| - virtual ui::GestureStatus OnGestureEvent(
|
| + virtual ui::EventResult OnGestureEvent(
|
| const ui::GestureEvent& event) OVERRIDE {
|
| if (event.type() == ui::ET_GESTURE_TAP ||
|
| event.type() == ui::ET_GESTURE_TAP_DOWN ||
|
| event.IsScrollGestureEvent()) {
|
| ProcessEventAtLocation(event.location());
|
| - return ui::GESTURE_STATUS_CONSUMED;
|
| + return ui::ER_CONSUMED;
|
| }
|
| - return ui::GESTURE_STATUS_UNKNOWN;
|
| + return ui::ER_UNHANDLED;
|
| }
|
|
|
| DISALLOW_COPY_AND_ASSIGN(LocatedEventHandlerView);
|
|
|