Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(103)

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 10912063: events: Get rid of GestureStatus in favour of EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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() {
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_aura.h ('k') | content/browser/web_contents/web_contents_view_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698