5 files changed, 8 insertions, 11 deletions
diff --git a/ui/views/corewm/compound_event_filter.cc b/ui/views/corewm/compound_event_filter.cc
index 87c4981..fe83efd 100644
--- a/ui/views/corewm/compound_event_filter.cc
+++ b/ui/views/corewm/compound_event_filter.cc
@@ -242,15 +242,13 @@ ui::EventResult CompoundEventFilter::OnTouchEvent(ui::TouchEvent* event) {
   return result;
 }
 
-ui::EventResult CompoundEventFilter::OnGestureEvent(ui::GestureEvent* event) {
-  int result = ui::ER_UNHANDLED;
+void CompoundEventFilter::OnGestureEvent(ui::GestureEvent* event) {
   if (handlers_.might_have_observers()) {
     ObserverListBase<ui::EventHandler>::Iterator it(handlers_);
     ui::EventHandler* handler;
-    while (!(result & ui::ER_CONSUMED) && (handler = it.GetNext()) != NULL)
-      result |= handler->OnGestureEvent(event);
+    while (!event->stopped_propagation() && (handler = it.GetNext()) != NULL)
+      handler->OnGestureEvent(event);
   }
-  return static_cast<ui::EventResult>(result);
 }
 
 }  // namespace corewm
diff --git a/ui/views/corewm/compound_event_filter.h b/ui/views/corewm/compound_event_filter.h
index 9999569..a995fb6 100644
--- a/ui/views/corewm/compound_event_filter.h
+++ b/ui/views/corewm/compound_event_filter.h
@@ -82,7 +82,7 @@ class VIEWS_EXPORT CompoundEventFilter : public ui::EventHandler {
   virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
   virtual ui::EventResult OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
   virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
-  virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
+  virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
 
   // Additional pre-target event handlers.
   ObserverList<ui::EventHandler, true> handlers_;
diff --git a/ui/views/corewm/compound_event_filter_unittest.cc b/ui/views/corewm/compound_event_filter_unittest.cc
index 677d267..f8af783 100644
--- a/ui/views/corewm/compound_event_filter_unittest.cc
+++ b/ui/views/corewm/compound_event_filter_unittest.cc
@@ -64,8 +64,8 @@ class ConsumeGestureEventFilter : public ui::EventHandler {
 
  private:
   // Overridden from ui::EventHandler:
-  virtual ui::EventResult OnGestureEvent(ui::GestureEvent* e) OVERRIDE {
-    return ui::ER_CONSUMED;
+  virtual void OnGestureEvent(ui::GestureEvent* e) OVERRIDE {
+    e->StopPropagation();
   }
 
   DISALLOW_COPY_AND_ASSIGN(ConsumeGestureEventFilter);
diff --git a/ui/views/corewm/focus_controller.cc b/ui/views/corewm/focus_controller.cc
index 2d89a34..90b4863 100644
--- a/ui/views/corewm/focus_controller.cc
+++ b/ui/views/corewm/focus_controller.cc
@@ -167,12 +167,11 @@ ui::EventResult FocusController::OnTouchEvent(ui::TouchEvent* event) {
   return ui::ER_UNHANDLED;
 }
 
-ui::EventResult FocusController::OnGestureEvent(ui::GestureEvent* event) {
+void FocusController::OnGestureEvent(ui::GestureEvent* event) {
   if (event->type() == ui::ET_GESTURE_BEGIN &&
       event->details().touch_points() == 1) {
     WindowFocusedFromInputEvent(static_cast<aura::Window*>(event->target()));
   }
-  return ui::ER_UNHANDLED;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/ui/views/corewm/focus_controller.h b/ui/views/corewm/focus_controller.h
index aebcb1d..12e3d4c 100644
--- a/ui/views/corewm/focus_controller.h
+++ b/ui/views/corewm/focus_controller.h
@@ -71,7 +71,7 @@ class VIEWS_EXPORT FocusController : public aura::client::ActivationClient,
   virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
   virtual ui::EventResult OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
   virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
-  virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
+  virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
 
   // Overridden from aura::WindowObserver:
   virtual void OnWindowVisibilityChanging(aura::Window* window,