Index: ash/magnifier/magnification_controller.cc |
diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc |
index 58166ead99dd13dee8f407b0d17cfee24279bf08..fd1ccf8006a7c69116c3faf1a13ccf720b67fb4d 100644 |
--- a/ash/magnifier/magnification_controller.cc |
+++ b/ash/magnifier/magnification_controller.cc |
@@ -436,7 +436,9 @@ bool MagnificationControllerImpl::PreHandleKeyEvent(aura::Window* target, |
bool MagnificationControllerImpl::PreHandleMouseEvent(aura::Window* target, |
ui::MouseEvent* event) { |
- if (event->type() == ui::ET_SCROLL && event->IsAltDown()) { |
+ if (event->type() == ui::ET_SCROLL && |
+ event->IsAltDown() & |
+ event->IsControlDown()) { |
ui::ScrollEvent* scroll_event = static_cast<ui::ScrollEvent*>(event); |
float scale = GetScale(); |
scale += scroll_event->y_offset() * kScrollScaleChangeFactor; |