| Index: ash/launcher/launcher_view.cc
|
| diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc
|
| index 4c87029df6e96ca9da55dea069b9d1f55f0911a0..7141bf95d91985d2fa3c1994b8c5b7922b27fdfb 100644
|
| --- a/ash/launcher/launcher_view.cc
|
| +++ b/ash/launcher/launcher_view.cc
|
| @@ -748,9 +748,9 @@ gfx::Size LauncherView::GetPreferredSize() {
|
| last_button_bounds.bottom() + leading_inset());
|
| }
|
|
|
| -ui::GestureStatus LauncherView::OnGestureEvent(const ui::GestureEvent& event) {
|
| +ui::EventResult LauncherView::OnGestureEvent(const ui::GestureEvent& event) {
|
| return gesture_handler_.ProcessGestureEvent(event) ?
|
| - ui::GESTURE_STATUS_CONSUMED : ui::GESTURE_STATUS_UNKNOWN;
|
| + ui::ER_CONSUMED : ui::ER_UNHANDLED;
|
| }
|
|
|
| void LauncherView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
|
|
|