diff options
| author | yoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-05 12:47:56 +0000 |
|---|---|---|
| committer | yoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-05 12:47:56 +0000 |
| commit | db43338a7e82ebf6dfcc9555d794a5990a426781 (patch) | |
| tree | 1dfb98bf68cb47deb28a8ae2fabe4f9d66272bcc /ash/magnifier | |
| parent | a94a6a4e688569e6820a642b93d04acf4584dbba (diff) | |
| download | chromium_src-db43338a7e82ebf6dfcc9555d794a5990a426781.zip chromium_src-db43338a7e82ebf6dfcc9555d794a5990a426781.tar.gz chromium_src-db43338a7e82ebf6dfcc9555d794a5990a426781.tar.bz2 | |
Screen Magnifier: Change keyboard shortcut from [ALT + Scroll] to [CTRL + ALT + Scroll]
BUG=153961
TEST=manual
TBR=sky@chromium.org
# TRBing for a simple change.
Review URL: https://chromiumcodereview.appspot.com/11026062
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160353 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/magnifier')
| -rw-r--r-- | ash/magnifier/magnification_controller.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc index 2d59440..1fa8244 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; |