| Index: ash/launcher/launcher_button.cc
|
| diff --git a/ash/launcher/launcher_button.cc b/ash/launcher/launcher_button.cc
|
| index dfbeb4c9b0577dc5a9b8b99283a8433ac067085b..d9a2583e66aea34d46202a76ca82e49c570c39f9 100644
|
| --- a/ash/launcher/launcher_button.cc
|
| +++ b/ash/launcher/launcher_button.cc
|
| @@ -258,7 +258,7 @@ void LauncherButton::OnMouseExited(const ui::MouseEvent& event) {
|
| host_->MouseExitedButton(this);
|
| }
|
|
|
| -ui::GestureStatus LauncherButton::OnGestureEvent(
|
| +ui::EventResult LauncherButton::OnGestureEvent(
|
| const ui::GestureEvent& event) {
|
| switch (event.type()) {
|
| case ui::ET_GESTURE_TAP_DOWN:
|
| @@ -269,13 +269,13 @@ ui::GestureStatus LauncherButton::OnGestureEvent(
|
| return CustomButton::OnGestureEvent(event);
|
| case ui::ET_GESTURE_SCROLL_BEGIN:
|
| host_->PointerPressedOnButton(this, LauncherButtonHost::TOUCH, event);
|
| - return ui::GESTURE_STATUS_CONSUMED;
|
| + return ui::ER_CONSUMED;
|
| case ui::ET_GESTURE_SCROLL_UPDATE:
|
| host_->PointerDraggedOnButton(this, LauncherButtonHost::TOUCH, event);
|
| - return ui::GESTURE_STATUS_CONSUMED;
|
| + return ui::ER_CONSUMED;
|
| case ui::ET_GESTURE_SCROLL_END:
|
| host_->PointerReleasedOnButton(this, LauncherButtonHost::TOUCH, false);
|
| - return ui::GESTURE_STATUS_CONSUMED;
|
| + return ui::ER_CONSUMED;
|
| default:
|
| return CustomButton::OnGestureEvent(event);
|
| }
|
|
|