| Index: content/browser/renderer_host/render_widget_host_view_aura.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| index bc73c9c5dad50c75bb054cf319cee16bf900ea2d..47aa13f9f1ccda4ce79c8cdfe0f10883a00a61cc 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| @@ -1297,14 +1297,14 @@ ui::TouchStatus RenderWidgetHostViewAura::OnTouchEvent(
|
| return ui::TOUCH_STATUS_UNKNOWN;
|
| }
|
|
|
| -ui::GestureStatus RenderWidgetHostViewAura::OnGestureEvent(
|
| +ui::EventResult RenderWidgetHostViewAura::OnGestureEvent(
|
| ui::GestureEvent* event) {
|
| TRACE_EVENT0("browser", "RenderWidgetHostViewAura::OnGestureEvent");
|
| // Pinch gestures are currently disabled by default. See crbug.com/128477.
|
| if ((event->type() == ui::ET_GESTURE_PINCH_BEGIN ||
|
| event->type() == ui::ET_GESTURE_PINCH_UPDATE ||
|
| event->type() == ui::ET_GESTURE_PINCH_END) && !ShouldSendPinchGesture()) {
|
| - return ui::GESTURE_STATUS_CONSUMED;
|
| + return ui::ER_CONSUMED;
|
| }
|
|
|
| RenderViewHostDelegate* delegate = NULL;
|
| @@ -1345,7 +1345,7 @@ ui::GestureStatus RenderWidgetHostViewAura::OnGestureEvent(
|
| // (e.g. generates synthetic mouse events). So CONSUMED should be returned
|
| // from here to avoid any duplicate synthetic mouse-events being generated
|
| // from aura.
|
| - return ui::GESTURE_STATUS_CONSUMED;
|
| + return ui::ER_CONSUMED;
|
| }
|
|
|
| bool RenderWidgetHostViewAura::CanFocus() {
|
|
|