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

Unified Diff: ash/magnifier/magnification_controller.cc

Issue 11026062: Screen Magnifier: Change keyboard shortcut from [ALT + Scroll] to [CTRL + ALT + Scroll] (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698