Screen Magnifier: Change the zoom level with Alt + Scroll

BUG=135185

Review URL: https://chromiumcodereview.appspot.com/10827192

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150416 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 0 deletions

diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc
index 83f47e4..056ea7b 100644
--- a/ash/magnifier/magnification_controller.cc
+++ b/ash/magnifier/magnification_controller.cc
@@ -26,6 +26,7 @@ const float kMinMagnifiedScaleThreshold = 1.1f;
 const float kNonMagnifiedScale = 1.0f;
 
 const float kInitialMagnifiedScale = 2.0f;
+const float kScrollScaleChangeFactor = 0.05f;
 
 }  // namespace
 
@@ -421,6 +422,14 @@ bool MagnificationControllerImpl::PreHandleKeyEvent(aura::Window* target,
 
 bool MagnificationControllerImpl::PreHandleMouseEvent(aura::Window* target,
                                                       aura::MouseEvent* event) {
+  if (event->type() == ui::ET_SCROLL && event->IsAltDown()) {
+    aura::ScrollEvent* scroll_event = static_cast<aura::ScrollEvent*>(event);
+    float scale = GetScale();
+    scale += scroll_event->y_offset() * kScrollScaleChangeFactor;
+    SetScale(scale, true);
+    return true;
+  }
+
   if (IsMagnified() && event->type() == ui::ET_MOUSE_MOVED) {
     aura::RootWindow* current_root = target->GetRootWindow();
     gfx::Rect root_bounds = current_root->bounds();