| 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 fb23fce9fd322d64991c57b31c978c914a1a8c20..99ae5eef384df6e1f398f9a0d40a4c8db580a8b5 100644
|
| --- a/ui/views/color_chooser/color_chooser_view.cc
|
| +++ b/ui/views/color_chooser/color_chooser_view.cc
|
| @@ -73,14 +73,13 @@ class LocatedEventHandlerView : public views::View {
|
| return true;
|
| }
|
|
|
| - virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE {
|
| + virtual void OnGestureEvent(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::ER_CONSUMED;
|
| + event->SetHandled();
|
| }
|
| - return ui::ER_UNHANDLED;
|
| }
|
|
|
| DISALLOW_COPY_AND_ASSIGN(LocatedEventHandlerView);
|
|
|