| Index: ui/views/corewm/compound_event_filter.h
|
| diff --git a/ui/views/corewm/compound_event_filter.h b/ui/views/corewm/compound_event_filter.h
|
| index a995fb6ac3d74823e77da3e037846a539627afb8..223b0b6264d0ef90b128649174ab7a5fc6f296b4 100644
|
| --- a/ui/views/corewm/compound_event_filter.h
|
| +++ b/ui/views/corewm/compound_event_filter.h
|
| @@ -65,7 +65,7 @@ class VIEWS_EXPORT CompoundEventFilter : public ui::EventHandler {
|
| // Dispatches event to additional filters.
|
| ui::EventResult FilterKeyEvent(ui::KeyEvent* event);
|
| ui::EventResult FilterMouseEvent(ui::MouseEvent* event);
|
| - ui::EventResult FilterTouchEvent(ui::TouchEvent* event);
|
| + void FilterTouchEvent(ui::TouchEvent* event);
|
|
|
| // Sets the visibility of the cursor if the event is not synthesized and
|
| // 1) it's hiding (show=false) when the cursor is currently shown, or
|
| @@ -80,8 +80,8 @@ class VIEWS_EXPORT CompoundEventFilter : public ui::EventHandler {
|
| // Overridden from ui::EventHandler:
|
| virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
|
| 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 void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
|
| + virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
|
| virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
|
|
|
| // Additional pre-target event handlers.
|
|
|