| Index: ui/views/widget/desktop_aura/desktop_activation_client.h
|
| diff --git a/ui/views/widget/desktop_aura/desktop_activation_client.h b/ui/views/widget/desktop_aura/desktop_activation_client.h
|
| index f397ee0013eff2eabf60ad640f654a26c94b5ec0..b4d57591fa76b96917b7671bef927c6c6e05b64b 100644
|
| --- a/ui/views/widget/desktop_aura/desktop_activation_client.h
|
| +++ b/ui/views/widget/desktop_aura/desktop_activation_client.h
|
| @@ -62,8 +62,8 @@ class VIEWS_EXPORT DesktopActivationClient
|
| // 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;
|
|
|
| private:
|
|
|