| Index: ash/system/tray/tray_views.cc
|
| diff --git a/ash/system/tray/tray_views.cc b/ash/system/tray/tray_views.cc
|
| index 8d9148e9e7d8191adc9c5d5b9cc1a68241c42f12..26924b020d588577d30e13439f04e90c76b92bb8 100644
|
| --- a/ash/system/tray/tray_views.cc
|
| +++ b/ash/system/tray/tray_views.cc
|
| @@ -148,13 +148,13 @@ void ActionableView::OnPaintFocusBorder(gfx::Canvas* canvas) {
|
| DrawBorder(canvas, GetLocalBounds());
|
| }
|
|
|
| -ui::GestureStatus ActionableView::OnGestureEvent(
|
| +ui::EventResult ActionableView::OnGestureEvent(
|
| const ui::GestureEvent& event) {
|
| if (event.type() == ui::ET_GESTURE_TAP) {
|
| - return PerformAction(event) ? ui::GESTURE_STATUS_CONSUMED :
|
| - ui::GESTURE_STATUS_UNKNOWN;
|
| + return PerformAction(event) ? ui::ER_CONSUMED :
|
| + ui::ER_UNHANDLED;
|
| }
|
| - return ui::GESTURE_STATUS_UNKNOWN;
|
| + return ui::ER_UNHANDLED;
|
| }
|
|
|
| void ActionableView::GetAccessibleState(ui::AccessibleViewState* state) {
|
|
|