| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/accelerators/magnifier_key_scroller.h" | 5 #include "ash/accelerators/magnifier_key_scroller.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "ash/accelerators/key_hold_detector.h" | 9 #include "ash/accelerators/key_hold_detector.h" |
| 10 #include "ash/common/ash_switches.h" | 10 #include "ash/common/ash_switches.h" |
| 11 #include "ash/magnifier/magnification_controller.h" | 11 #include "ash/magnifier/magnification_controller.h" |
| 12 #include "ash/shell.h" | 12 #include "ash/shell.h" |
| 13 #include "base/command_line.h" | 13 #include "base/command_line.h" |
| 14 #include "ui/events/event.h" | 14 #include "ui/events/event.h" |
| 15 | 15 |
| 16 namespace ash { | 16 namespace ash { |
| 17 namespace { | 17 namespace { |
| 18 bool magnifier_key_scroller_enabled = false; | 18 bool magnifier_key_scroller_enabled = false; |
| 19 } | 19 } |
| 20 | 20 |
| 21 // static | 21 // static |
| 22 bool MagnifierKeyScroller::IsEnabled() { | 22 bool MagnifierKeyScroller::IsEnabled() { |
| 23 bool has_switch = false; | 23 bool has_switch = base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 24 #if defined(OS_CHROMEOS) | |
| 25 has_switch = base::CommandLine::ForCurrentProcess()->HasSwitch( | |
| 26 switches::kAshEnableMagnifierKeyScroller); | 24 switches::kAshEnableMagnifierKeyScroller); |
| 27 #endif | |
| 28 | 25 |
| 29 return (magnifier_key_scroller_enabled || has_switch) && | 26 return (magnifier_key_scroller_enabled || has_switch) && |
| 30 ash::Shell::GetInstance()->magnification_controller()->IsEnabled(); | 27 ash::Shell::GetInstance()->magnification_controller()->IsEnabled(); |
| 31 } | 28 } |
| 32 | 29 |
| 33 // static | 30 // static |
| 34 void MagnifierKeyScroller::SetEnabled(bool enabled) { | 31 void MagnifierKeyScroller::SetEnabled(bool enabled) { |
| 35 magnifier_key_scroller_enabled = enabled; | 32 magnifier_key_scroller_enabled = enabled; |
| 36 } | 33 } |
| 37 | 34 |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 MagnificationController* controller = | 81 MagnificationController* controller = |
| 85 Shell::GetInstance()->magnification_controller(); | 82 Shell::GetInstance()->magnification_controller(); |
| 86 controller->SetScrollDirection(MagnificationController::SCROLL_NONE); | 83 controller->SetScrollDirection(MagnificationController::SCROLL_NONE); |
| 87 } | 84 } |
| 88 | 85 |
| 89 MagnifierKeyScroller::MagnifierKeyScroller() {} | 86 MagnifierKeyScroller::MagnifierKeyScroller() {} |
| 90 | 87 |
| 91 MagnifierKeyScroller::~MagnifierKeyScroller() {} | 88 MagnifierKeyScroller::~MagnifierKeyScroller() {} |
| 92 | 89 |
| 93 } // namespace ash | 90 } // namespace ash |
| OLD | NEW |