diff options
Diffstat (limited to 'ash/accelerators/magnifier_key_scroller.cc')
| -rw-r--r-- | ash/accelerators/magnifier_key_scroller.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ash/accelerators/magnifier_key_scroller.cc b/ash/accelerators/magnifier_key_scroller.cc index 709336f..c734e84 100644 --- a/ash/accelerators/magnifier_key_scroller.cc +++ b/ash/accelerators/magnifier_key_scroller.cc @@ -17,9 +17,13 @@ bool magnifier_key_scroller_enabled = false; // static bool MagnifierKeyScroller::IsEnabled() { - return (magnifier_key_scroller_enabled || - CommandLine::ForCurrentProcess()->HasSwitch( - switches::kAshEnableMagnifierKeyScroller)) && + bool has_switch = false; +#if defined(OS_CHROMEOS) + has_switch = CommandLine::ForCurrentProcess()->HasSwitch( + switches::kAshEnableMagnifierKeyScroller); +#endif + + return (magnifier_key_scroller_enabled || has_switch) && ash::Shell::GetInstance()->magnification_controller()->IsEnabled(); } |