| Index: ui/views/widget/desktop_aura/desktop_activation_client.cc
|
| diff --git a/ui/views/widget/desktop_aura/desktop_activation_client.cc b/ui/views/widget/desktop_aura/desktop_activation_client.cc
|
| index d2123a37f5bec62271ba219ef794328718b27be8..0581e1b9614f9cee85dbac35c5b1b6af01e55fb6 100644
|
| --- a/ui/views/widget/desktop_aura/desktop_activation_client.cc
|
| +++ b/ui/views/widget/desktop_aura/desktop_activation_client.cc
|
| @@ -168,12 +168,10 @@ ui::EventResult DesktopActivationClient::OnMouseEvent(ui::MouseEvent* event) {
|
| return ui::ER_UNHANDLED;
|
| }
|
|
|
| -ui::EventResult DesktopActivationClient::OnScrollEvent(ui::ScrollEvent* event) {
|
| - return ui::ER_UNHANDLED;
|
| +void DesktopActivationClient::OnScrollEvent(ui::ScrollEvent* event) {
|
| }
|
|
|
| -ui::EventResult DesktopActivationClient::OnTouchEvent(ui::TouchEvent* event) {
|
| - return ui::ER_UNHANDLED;
|
| +void DesktopActivationClient::OnTouchEvent(ui::TouchEvent* event) {
|
| }
|
|
|
| void DesktopActivationClient::OnGestureEvent(ui::GestureEvent* event) {
|
|
|