Index: content/renderer/input/input_handler_proxy.cc |
diff --git a/content/renderer/input/input_handler_proxy.cc b/content/renderer/input/input_handler_proxy.cc |
index 789cb58f26f08cc2904bd29e5deb6f54e3a16c45..bef31ec093988da2673e57e5166be2bca85bd375 100644 |
--- a/content/renderer/input/input_handler_proxy.cc |
+++ b/content/renderer/input/input_handler_proxy.cc |
@@ -115,6 +115,13 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleInputEvent( |
// thread, so punt it to the main thread. http://crbug.com/236639 |
return DID_NOT_HANDLE; |
} |
+#if !defined(OS_MACOSX) |
+ if (wheel_event.modifiers & WebInputEvent::ControlKey) { |
+ // Ctrl + mousewheel changes zoom on every platform except for Mac, |
+ // see WebContentsImpl::HandleWheelEvent. |
+ return DID_NOT_HANDLE; |
+ } |
+#endif |
cc::InputHandler::ScrollStatus scroll_status = input_handler_->ScrollBegin( |
gfx::Point(wheel_event.x, wheel_event.y), cc::InputHandler::Wheel); |
switch (scroll_status) { |