Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(775)

Unified Diff: content/renderer/input/input_handler_proxy.cc

Issue 165143003: Handle Ctrl+Mousewheel after renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Disable Ctrl+wheel checks on Mac Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/web_contents/web_contents_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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) {
« no previous file with comments | « content/browser/web_contents/web_contents_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698